Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 

Conflicts:
	module/zcommon/include/sys/fs/zfs.h
	module/zfs/include/sys/zfs_ioctl.h
This commit is contained in:
Brian Behlendorf 2010-05-28 22:16:13 -07:00
parent e27eb1d89e a6c16054e5
commit fe4485488c
2 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
module/zcommon/include/sys/fs/zfs.h
View File

@ -693,6 +693,7 @@ typedef struct ddt_histogram {
#define ZVOL_MINOR_BITS 4
#define ZVOL_MINOR_MASK ((1U << ZVOL_MINOR_BITS) - 1)
#define ZVOL_MINORS (1 << 4)
#define ZVOL_PROP_NAME "name"
#define ZVOL_DEFAULT_BLOCKSIZE 8192

1
module/zfs/include/sys/zfs_ioctl.h
View File

@ -298,7 +298,6 @@ extern int zfs_secpolicy_snapshot_perms(const char *name, cred_t *cr);
extern int zfs_secpolicy_rename_perms(const char *from,
const char *to, cred_t *cr);
extern int zfs_secpolicy_destroy_perms(const char *name, cred_t *cr);
extern int zfs_busy(void);
extern int zfs_unmount_snap(const char *, void *);
#endif /* _KERNEL */