Date: Tue, 31 Mar 2009 19:18:22 GMT From: Edward Tomasz Napierala <trasz@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 160069 for review Message-ID: <200903311918.n2VJIMFO052832@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=160069 Change 160069 by trasz@trasz_victim7 on 2009/03/31 19:18:15 Rename few more things. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/acl_compat.c#8 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/acl_compat.c#8 (text+ko) ==== @@ -69,12 +69,12 @@ #include "acl_compat.h" -struct artwo { - uint32_t sun; - int bsd; +struct zfs2bsd { + uint32_t zb_zfs; + int zb_bsd; }; -struct artwo perms[] = {{ACE_READ_DATA, ACL_READ_DATA}, +struct zfs2bsd perms[] = {{ACE_READ_DATA, ACL_READ_DATA}, {ACE_WRITE_DATA, ACL_WRITE_DATA}, {ACE_EXECUTE, ACL_EXECUTE}, {ACE_APPEND_DATA, ACL_APPEND_DATA}, @@ -90,7 +90,7 @@ {ACE_SYNCHRONIZE, ACL_SYNCHRONIZE}, {0, 0}}; -struct artwo flags[] = {{ACE_FILE_INHERIT_ACE, ACL_ENTRY_FILE_INHERIT}, +struct zfs2bsd flags[] = {{ACE_FILE_INHERIT_ACE, ACL_ENTRY_FILE_INHERIT}, {ACE_DIRECTORY_INHERIT_ACE, ACL_ENTRY_DIRECTORY_INHERIT}, {ACE_NO_PROPAGATE_INHERIT_ACE, ACL_ENTRY_LIMIT_INHERIT}, {ACE_INHERIT_ONLY_ACE, ACL_ENTRY_ONLY_INHERIT}, @@ -99,31 +99,31 @@ {0, 0}}; static int -_bsd_from_sun(uint32_t sun, const struct artwo *table) +_bsd_from_zfs(uint32_t zfs, const struct zfs2bsd *table) { - const struct artwo *tmp; + const struct zfs2bsd *tmp; int bsd = 0; - for (tmp = table; tmp->sun != 0; tmp++) { - if (sun & tmp->sun) - bsd |= tmp->bsd; + for (tmp = table; tmp->zb_zfs != 0; tmp++) { + if (zfs & tmp->zb_zfs) + bsd |= tmp->zb_bsd; } return (bsd); } static uint32_t -_sun_from_bsd(int bsd, const struct artwo *table) +_zfs_from_bsd(int bsd, const struct zfs2bsd *table) { - const struct artwo *tmp; - uint32_t sun = 0; + const struct zfs2bsd *tmp; + uint32_t zfs = 0; - for (tmp = table; tmp->bsd != 0; tmp++) { - if (bsd & tmp->bsd) - sun |= tmp->sun; + for (tmp = table; tmp->zb_bsd != 0; tmp++) { + if (bsd & tmp->zb_bsd) + zfs |= tmp->zb_zfs; } - return (sun); + return (zfs); } int @@ -158,8 +158,8 @@ else entry->ae_id = ACL_UNDEFINED_ID; - entry->ae_perm = _bsd_from_sun(ace->a_access_mask, perms); - entry->ae_flags = _bsd_from_sun(ace->a_flags, flags); + entry->ae_perm = _bsd_from_zfs(ace->a_access_mask, perms); + entry->ae_flags = _bsd_from_zfs(ace->a_flags, flags); switch (ace->a_type) { case ACE_ACCESS_ALLOWED_ACE_TYPE: @@ -210,8 +210,8 @@ else /* ACL_USER */ ace->a_flags = 0; - ace->a_access_mask = _sun_from_bsd(entry->ae_perm, perms); - ace->a_flags |= _sun_from_bsd(entry->ae_flags, flags); + ace->a_access_mask = _zfs_from_bsd(entry->ae_perm, perms); + ace->a_flags |= _zfs_from_bsd(entry->ae_flags, flags); switch (entry->ae_extended) { case ACL_EXTENDED_ALLOW:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200903311918.n2VJIMFO052832>