diff options
| author | Chunwei Chen <david.chen@osnexus.com> | 2016-06-18 00:36:01 +0000 |
|---|---|---|
| committer | Brian Behlendorf <behlendorf1@llnl.gov> | 2016-06-21 16:58:37 +0000 |
| commit | 100a91aa3e9773f2a2a373c5cb066b52c780716c (patch) | |
| tree | ff7039d9e5fc5eda2f481f4bd60fcd0ad6cc2d39 /module/zfs/zfs_fuid.c | |
| parent | ab9f4b0b824ab4cc64a4fa382c037f4154de12d6 (diff) | |
| download | src-100a91aa3e9773f2a2a373c5cb066b52c780716c.tar.gz src-100a91aa3e9773f2a2a373c5cb066b52c780716c.zip | |
Diffstat (limited to 'module/zfs/zfs_fuid.c')
| -rw-r--r-- | module/zfs/zfs_fuid.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/module/zfs/zfs_fuid.c b/module/zfs/zfs_fuid.c index d4916bf5830a..6ca61b87242f 100644 --- a/module/zfs/zfs_fuid.c +++ b/module/zfs/zfs_fuid.c @@ -488,6 +488,7 @@ zfs_fuid_node_add(zfs_fuid_info_t **fuidpp, const char *domain, uint32_t rid, } } +#ifdef HAVE_KSID /* * Create a file system FUID, based on information in the users cred * @@ -500,7 +501,6 @@ uint64_t zfs_fuid_create_cred(zfs_sb_t *zsb, zfs_fuid_type_t type, cred_t *cr, zfs_fuid_info_t **fuidp) { -#ifdef HAVE_KSID uint64_t idx; ksid_t *ksid; uint32_t rid; @@ -540,12 +540,8 @@ zfs_fuid_create_cred(zfs_sb_t *zsb, zfs_fuid_type_t type, zfs_fuid_node_add(fuidp, kdomain, rid, idx, id, type); return (FUID_ENCODE(idx, rid)); -#else - VERIFY(type == ZFS_OWNER || type == ZFS_GROUP); - - return ((uint64_t)((type == ZFS_OWNER) ? crgetuid(cr) : crgetgid(cr))); -#endif /* HAVE_KSID */ } +#endif /* HAVE_KSID */ /* * Create a file system FUID for an ACL ace |