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

Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch

This commit is contained in:
Brian Behlendorf 2010-05-14 11:55:56 -07:00
parent 51ad7dc87d 93b00c558f
commit aded580f0b
2 changed files with 300 additions and 215 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -123,6 +123,9 @@ typedef struct zinject_record {
#define ZINJECT_FLUSH_ARC 0x2 #define ZINJECT_FLUSH_ARC 0x2
#define ZINJECT_UNLOAD_SPA 0x4 #define ZINJECT_UNLOAD_SPA 0x4
#define ZEVENT_NONBLOCK 0x1
#define ZEVENT_SIZE 1024
typedef struct zfs_share { typedef struct zfs_share {
uint64_t z_exportdata; uint64_t z_exportdata;
uint64_t z_sharedata; uint64_t z_sharedata;
@ -187,6 +190,9 @@ typedef struct zfs_creat {
extern dev_info_t *zfs_dip; extern dev_info_t *zfs_dip;
extern int get_nvlist(uint64_t nvl, uint64_t size, int iflag, nvlist_t **nvp);
extern int put_nvlist(zfs_cmd_t *zc, nvlist_t *nvl);
extern int zfs_secpolicy_snapshot_perms(const char *name, cred_t *cr); extern int zfs_secpolicy_snapshot_perms(const char *name, cred_t *cr);
extern int zfs_secpolicy_rename_perms(const char *from, extern int zfs_secpolicy_rename_perms(const char *from,
const char *to, cred_t *cr); const char *to, cred_t *cr);

509
module/zfs/zfs_ioctl.c
View File

File diff suppressed because it is too large Load Diff