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

Refine HAVE_ZPL checks after b117 update.

This commit is contained in:
Brian Behlendorf 2009-07-10 10:39:44 -07:00
parent 0c390c6de4
commit ec3045dcf2
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
module/zfs/zfs_ioctl.c
View File

@ -3349,10 +3349,10 @@ ace_t full_access[] = {
/* /*
* Remove all ACL files in shares dir * Remove all ACL files in shares dir
*/ */
#ifdef HAVE_ZPL
static int static int
zfs_smb_acl_purge(znode_t *dzp) zfs_smb_acl_purge(znode_t *dzp)
{ {
#ifdef HAVE_ZPL
zap_cursor_t zc; zap_cursor_t zc;
zap_attribute_t zap; zap_attribute_t zap;
zfsvfs_t *zfsvfs = dzp->z_zfsvfs; zfsvfs_t *zfsvfs = dzp->z_zfsvfs;
@ -3367,10 +3367,8 @@ zfs_smb_acl_purge(znode_t *dzp)
} }
zap_cursor_fini(&zc); zap_cursor_fini(&zc);
return (error); return (error);
#else
return (ENOTSUP);
#endif /* HAVE ZPL */
} }
#endif /* HAVE ZPL */
static int static int
zfs_ioc_smb_acl(zfs_cmd_t *zc) zfs_ioc_smb_acl(zfs_cmd_t *zc)

2
module/zfs/zfs_vfsops.c
View File

@ -1999,6 +1999,7 @@ zfs_busy(void)
#endif /* HAVE_ZPL */ #endif /* HAVE_ZPL */
} }
#ifdef HAVE_ZPL
int int
zfs_set_version(zfsvfs_t *zfsvfs, uint64_t newvers) zfs_set_version(zfsvfs_t *zfsvfs, uint64_t newvers)
{ {
@ -2041,6 +2042,7 @@ zfs_set_version(zfsvfs_t *zfsvfs, uint64_t newvers)
return (0); return (0);
} }
#endif /* HAVE_ZPL */
/* /*
* Read a property stored within the master node. * Read a property stored within the master node.