<div dir="ltr">Really nice to see all the sudden activity here in JFS again!<br></div><div class="gmail_extra"><br><br><div class="gmail_quote">On Mon, Dec 2, 2013 at 2:13 PM, Jan Kara <span dir="ltr"><<a href="mailto:jack@suse.cz" target="_blank">jack@suse.cz</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">On Sun 01-12-13 03:59:11, Christoph Hellwig wrote:<br>
> Signed-off-by: Christoph Hellwig <<a href="mailto:hch@lst.de">hch@lst.de</a>><br>
Looks good. You can add:<br>
Reviewed-by: Jan Kara <<a href="mailto:jack@suse.cz">jack@suse.cz</a>><br>
<br>
Honza<br>
<br>
> ---<br>
> fs/ext2/acl.c | 176 ++++-----------------------------------------<br>
> fs/ext2/acl.h | 8 +--<br>
> fs/ext2/file.c | 1 +<br>
> fs/ext2/inode.c | 2 +-<br>
> fs/ext2/namei.c | 2 +<br>
> fs/ext2/xattr.c | 8 +--<br>
> fs/ext2/xattr.h | 2 -<br>
> fs/ext3/acl.c | 213 ++++++++-----------------------------------------------<br>
> fs/ext3/acl.h | 9 +--<br>
> fs/ext3/file.c | 1 +<br>
> fs/ext3/inode.c | 2 +-<br>
> fs/ext3/namei.c | 2 +<br>
> fs/ext3/xattr.c | 8 +--<br>
> fs/ext3/xattr.h | 2 -<br>
> fs/ext4/acl.c | 213 ++++++++-----------------------------------------------<br>
> fs/ext4/acl.h | 9 +--<br>
> fs/ext4/file.c | 1 +<br>
> fs/ext4/inode.c | 2 +-<br>
> fs/ext4/namei.c | 2 +<br>
> fs/ext4/xattr.c | 8 +--<br>
> fs/ext4/xattr.h | 2 -<br>
> 21 files changed, 100 insertions(+), 573 deletions(-)<br>
><br>
> diff --git a/fs/ext2/acl.c b/fs/ext2/acl.c<br>
> index 6e842a7..f04a295 100644<br>
> --- a/fs/ext2/acl.c<br>
> +++ b/fs/ext2/acl.c<br>
> @@ -189,8 +189,8 @@ ext2_get_acl(struct inode *inode, int type)<br>
> /*<br>
> * inode->i_mutex: down<br>
> */<br>
> -static int<br>
> -ext2_set_acl(struct inode *inode, int type, struct posix_acl *acl)<br>
> +int<br>
> +ext2_set_acl(struct inode *inode, struct posix_acl *acl, int type)<br>
> {<br>
> int name_index;<br>
> void *value = NULL;<br>
> @@ -250,169 +250,21 @@ ext2_set_acl(struct inode *inode, int type, struct posix_acl *acl)<br>
> int<br>
> ext2_init_acl(struct inode *inode, struct inode *dir)<br>
> {<br>
> - struct posix_acl *acl = NULL;<br>
> - int error = 0;<br>
> -<br>
> - if (!S_ISLNK(inode->i_mode)) {<br>
> - if (test_opt(dir->i_sb, POSIX_ACL)) {<br>
> - acl = ext2_get_acl(dir, ACL_TYPE_DEFAULT);<br>
> - if (IS_ERR(acl))<br>
> - return PTR_ERR(acl);<br>
> - }<br>
> - if (!acl)<br>
> - inode->i_mode &= ~current_umask();<br>
> - }<br>
> - if (test_opt(inode->i_sb, POSIX_ACL) && acl) {<br>
> - if (S_ISDIR(inode->i_mode)) {<br>
> - error = ext2_set_acl(inode, ACL_TYPE_DEFAULT, acl);<br>
> - if (error)<br>
> - goto cleanup;<br>
> - }<br>
> - error = __posix_acl_create(&acl, GFP_KERNEL, &inode->i_mode);<br>
> - if (error < 0)<br>
> - return error;<br>
> - if (error > 0) {<br>
> - /* This is an extended ACL */<br>
> - error = ext2_set_acl(inode, ACL_TYPE_ACCESS, acl);<br>
> - }<br>
> - }<br>
> -cleanup:<br>
> - posix_acl_release(acl);<br>
> - return error;<br>
> -}<br>
> -<br>
> -/*<br>
> - * Does chmod for an inode that may have an Access Control List. The<br>
> - * inode->i_mode field must be updated to the desired value by the caller<br>
> - * before calling this function.<br>
> - * Returns 0 on success, or a negative error number.<br>
> - *<br>
> - * We change the ACL rather than storing some ACL entries in the file<br>
> - * mode permission bits (which would be more efficient), because that<br>
> - * would break once additional permissions (like ACL_APPEND, ACL_DELETE<br>
> - * for directories) are added. There are no more bits available in the<br>
> - * file mode.<br>
> - *<br>
> - * inode->i_mutex: down<br>
> - */<br>
> -int<br>
> -ext2_acl_chmod(struct inode *inode)<br>
> -{<br>
> - struct posix_acl *acl;<br>
> - int error;<br>
> + struct posix_acl *default_acl, *acl;<br>
> + int error;<br>
><br>
> - if (!test_opt(inode->i_sb, POSIX_ACL))<br>
> - return 0;<br>
> - if (S_ISLNK(inode->i_mode))<br>
> - return -EOPNOTSUPP;<br>
> - acl = ext2_get_acl(inode, ACL_TYPE_ACCESS);<br>
> - if (IS_ERR(acl) || !acl)<br>
> - return PTR_ERR(acl);<br>
> - error = __posix_acl_chmod(&acl, GFP_KERNEL, inode->i_mode);<br>
> + error = posix_acl_create(dir, &inode->i_mode, &default_acl, &acl);<br>
> if (error)<br>
> return error;<br>
> - error = ext2_set_acl(inode, ACL_TYPE_ACCESS, acl);<br>
> - posix_acl_release(acl);<br>
> - return error;<br>
> -}<br>
> -<br>
> -/*<br>
> - * Extended attribut handlers<br>
> - */<br>
> -static size_t<br>
> -ext2_xattr_list_acl_access(struct dentry *dentry, char *list, size_t list_size,<br>
> - const char *name, size_t name_len, int type)<br>
> -{<br>
> - const size_t size = sizeof(POSIX_ACL_XATTR_ACCESS);<br>
> -<br>
> - if (!test_opt(dentry->d_sb, POSIX_ACL))<br>
> - return 0;<br>
> - if (list && size <= list_size)<br>
> - memcpy(list, POSIX_ACL_XATTR_ACCESS, size);<br>
> - return size;<br>
> -}<br>
><br>
> -static size_t<br>
> -ext2_xattr_list_acl_default(struct dentry *dentry, char *list, size_t list_size,<br>
> - const char *name, size_t name_len, int type)<br>
> -{<br>
> - const size_t size = sizeof(POSIX_ACL_XATTR_DEFAULT);<br>
> -<br>
> - if (!test_opt(dentry->d_sb, POSIX_ACL))<br>
> - return 0;<br>
> - if (list && size <= list_size)<br>
> - memcpy(list, POSIX_ACL_XATTR_DEFAULT, size);<br>
> - return size;<br>
> -}<br>
> -<br>
> -static int<br>
> -ext2_xattr_get_acl(struct dentry *dentry, const char *name, void *buffer,<br>
> - size_t size, int type)<br>
> -{<br>
> - struct posix_acl *acl;<br>
> - int error;<br>
> -<br>
> - if (strcmp(name, "") != 0)<br>
> - return -EINVAL;<br>
> - if (!test_opt(dentry->d_sb, POSIX_ACL))<br>
> - return -EOPNOTSUPP;<br>
> -<br>
> - acl = ext2_get_acl(dentry->d_inode, type);<br>
> - if (IS_ERR(acl))<br>
> - return PTR_ERR(acl);<br>
> - if (acl == NULL)<br>
> - return -ENODATA;<br>
> - error = posix_acl_to_xattr(&init_user_ns, acl, buffer, size);<br>
> - posix_acl_release(acl);<br>
> -<br>
> - return error;<br>
> -}<br>
> -<br>
> -static int<br>
> -ext2_xattr_set_acl(struct dentry *dentry, const char *name, const void *value,<br>
> - size_t size, int flags, int type)<br>
> -{<br>
> - struct posix_acl *acl;<br>
> - int error;<br>
> -<br>
> - if (strcmp(name, "") != 0)<br>
> - return -EINVAL;<br>
> - if (!test_opt(dentry->d_sb, POSIX_ACL))<br>
> - return -EOPNOTSUPP;<br>
> - if (!inode_owner_or_capable(dentry->d_inode))<br>
> - return -EPERM;<br>
> -<br>
> - if (value) {<br>
> - acl = posix_acl_from_xattr(&init_user_ns, value, size);<br>
> - if (IS_ERR(acl))<br>
> - return PTR_ERR(acl);<br>
> - else if (acl) {<br>
> - error = posix_acl_valid(acl);<br>
> - if (error)<br>
> - goto release_and_out;<br>
> - }<br>
> - } else<br>
> - acl = NULL;<br>
> -<br>
> - error = ext2_set_acl(dentry->d_inode, type, acl);<br>
> -<br>
> -release_and_out:<br>
> - posix_acl_release(acl);<br>
> + if (default_acl) {<br>
> + error = ext2_set_acl(inode, default_acl, ACL_TYPE_DEFAULT);<br>
> + posix_acl_release(default_acl);<br>
> + }<br>
> + if (acl) {<br>
> + if (!error)<br>
> + error = ext2_set_acl(inode, acl, ACL_TYPE_ACCESS);<br>
> + posix_acl_release(acl);<br>
> + }<br>
> return error;<br>
> }<br>
> -<br>
> -const struct xattr_handler ext2_xattr_acl_access_handler = {<br>
> - .prefix = POSIX_ACL_XATTR_ACCESS,<br>
> - .flags = ACL_TYPE_ACCESS,<br>
> - .list = ext2_xattr_list_acl_access,<br>
> - .get = ext2_xattr_get_acl,<br>
> - .set = ext2_xattr_set_acl,<br>
> -};<br>
> -<br>
> -const struct xattr_handler ext2_xattr_acl_default_handler = {<br>
> - .prefix = POSIX_ACL_XATTR_DEFAULT,<br>
> - .flags = ACL_TYPE_DEFAULT,<br>
> - .list = ext2_xattr_list_acl_default,<br>
> - .get = ext2_xattr_get_acl,<br>
> - .set = ext2_xattr_set_acl,<br>
> -};<br>
> diff --git a/fs/ext2/acl.h b/fs/ext2/acl.h<br>
> index 503bfb0..44937f9 100644<br>
> --- a/fs/ext2/acl.h<br>
> +++ b/fs/ext2/acl.h<br>
> @@ -55,7 +55,7 @@ static inline int ext2_acl_count(size_t size)<br>
><br>
> /* acl.c */<br>
> extern struct posix_acl *ext2_get_acl(struct inode *inode, int type);<br>
> -extern int ext2_acl_chmod (struct inode *);<br>
> +extern int ext2_set_acl(struct inode *inode, struct posix_acl *acl, int type);<br>
> extern int ext2_init_acl (struct inode *, struct inode *);<br>
><br>
> #else<br>
> @@ -63,12 +63,6 @@ extern int ext2_init_acl (struct inode *, struct inode *);<br>
> #define ext2_get_acl NULL<br>
> #define ext2_set_acl NULL<br>
><br>
> -static inline int<br>
> -ext2_acl_chmod (struct inode *inode)<br>
> -{<br>
> - return 0;<br>
> -}<br>
> -<br>
> static inline int ext2_init_acl (struct inode *inode, struct inode *dir)<br>
> {<br>
> return 0;<br>
> diff --git a/fs/ext2/file.c b/fs/ext2/file.c<br>
> index a5b3a5d..44c36e5 100644<br>
> --- a/fs/ext2/file.c<br>
> +++ b/fs/ext2/file.c<br>
> @@ -103,5 +103,6 @@ const struct inode_operations ext2_file_inode_operations = {<br>
> #endif<br>
> .setattr = ext2_setattr,<br>
> .get_acl = ext2_get_acl,<br>
> + .set_acl = ext2_set_acl,<br>
> .fiemap = ext2_fiemap,<br>
> };<br>
> diff --git a/fs/ext2/inode.c b/fs/ext2/inode.c<br>
> index 8a33764..1be8866 100644<br>
> --- a/fs/ext2/inode.c<br>
> +++ b/fs/ext2/inode.c<br>
> @@ -1566,7 +1566,7 @@ int ext2_setattr(struct dentry *dentry, struct iattr *iattr)<br>
> }<br>
> setattr_copy(inode, iattr);<br>
> if (iattr->ia_valid & ATTR_MODE)<br>
> - error = ext2_acl_chmod(inode);<br>
> + error = posix_acl_chmod(inode);<br>
> mark_inode_dirty(inode);<br>
><br>
> return error;<br>
> diff --git a/fs/ext2/namei.c b/fs/ext2/namei.c<br>
> index 256dd5f..c268d0a 100644<br>
> --- a/fs/ext2/namei.c<br>
> +++ b/fs/ext2/namei.c<br>
> @@ -421,6 +421,7 @@ const struct inode_operations ext2_dir_inode_operations = {<br>
> #endif<br>
> .setattr = ext2_setattr,<br>
> .get_acl = ext2_get_acl,<br>
> + .set_acl = ext2_set_acl,<br>
> .tmpfile = ext2_tmpfile,<br>
> };<br>
><br>
> @@ -433,4 +434,5 @@ const struct inode_operations ext2_special_inode_operations = {<br>
> #endif<br>
> .setattr = ext2_setattr,<br>
> .get_acl = ext2_get_acl,<br>
> + .set_acl = ext2_set_acl,<br>
> };<br>
> diff --git a/fs/ext2/xattr.c b/fs/ext2/xattr.c<br>
> index 2d7557d..9142614 100644<br>
> --- a/fs/ext2/xattr.c<br>
> +++ b/fs/ext2/xattr.c<br>
> @@ -103,8 +103,8 @@ static struct mb_cache *ext2_xattr_cache;<br>
> static const struct xattr_handler *ext2_xattr_handler_map[] = {<br>
> [EXT2_XATTR_INDEX_USER] = &ext2_xattr_user_handler,<br>
> #ifdef CONFIG_EXT2_FS_POSIX_ACL<br>
> - [EXT2_XATTR_INDEX_POSIX_ACL_ACCESS] = &ext2_xattr_acl_access_handler,<br>
> - [EXT2_XATTR_INDEX_POSIX_ACL_DEFAULT] = &ext2_xattr_acl_default_handler,<br>
> + [EXT2_XATTR_INDEX_POSIX_ACL_ACCESS] = &posix_acl_access_xattr_handler,<br>
> + [EXT2_XATTR_INDEX_POSIX_ACL_DEFAULT] = &posix_acl_default_xattr_handler,<br>
> #endif<br>
> [EXT2_XATTR_INDEX_TRUSTED] = &ext2_xattr_trusted_handler,<br>
> #ifdef CONFIG_EXT2_FS_SECURITY<br>
> @@ -116,8 +116,8 @@ const struct xattr_handler *ext2_xattr_handlers[] = {<br>
> &ext2_xattr_user_handler,<br>
> &ext2_xattr_trusted_handler,<br>
> #ifdef CONFIG_EXT2_FS_POSIX_ACL<br>
> - &ext2_xattr_acl_access_handler,<br>
> - &ext2_xattr_acl_default_handler,<br>
> + &posix_acl_access_xattr_handler,<br>
> + &posix_acl_default_xattr_handler,<br>
> #endif<br>
> #ifdef CONFIG_EXT2_FS_SECURITY<br>
> &ext2_xattr_security_handler,<br>
> diff --git a/fs/ext2/xattr.h b/fs/ext2/xattr.h<br>
> index 5e41ccc..60edf29 100644<br>
> --- a/fs/ext2/xattr.h<br>
> +++ b/fs/ext2/xattr.h<br>
> @@ -57,8 +57,6 @@ struct ext2_xattr_entry {<br>
><br>
> extern const struct xattr_handler ext2_xattr_user_handler;<br>
> extern const struct xattr_handler ext2_xattr_trusted_handler;<br>
> -extern const struct xattr_handler ext2_xattr_acl_access_handler;<br>
> -extern const struct xattr_handler ext2_xattr_acl_default_handler;<br>
> extern const struct xattr_handler ext2_xattr_security_handler;<br>
><br>
> extern ssize_t ext2_listxattr(struct dentry *, char *, size_t);<br>
> diff --git a/fs/ext3/acl.c b/fs/ext3/acl.c<br>
> index 4f3d8fa..e9cb33f 100644<br>
> --- a/fs/ext3/acl.c<br>
> +++ b/fs/ext3/acl.c<br>
> @@ -190,7 +190,7 @@ ext3_get_acl(struct inode *inode, int type)<br>
> * inode->i_mutex: down unless called from ext3_new_inode<br>
> */<br>
> static int<br>
> -ext3_set_acl(handle_t *handle, struct inode *inode, int type,<br>
> +__ext3_set_acl(handle_t *handle, struct inode *inode, int type,<br>
> struct posix_acl *acl)<br>
> {<br>
> int name_index;<br>
> @@ -243,204 +243,49 @@ ext3_set_acl(handle_t *handle, struct inode *inode, int type,<br>
> return error;<br>
> }<br>
><br>
> -/*<br>
> - * Initialize the ACLs of a new inode. Called from ext3_new_inode.<br>
> - *<br>
> - * dir->i_mutex: down<br>
> - * inode->i_mutex: up (access to inode is still exclusive)<br>
> - */<br>
> -int<br>
> -ext3_init_acl(handle_t *handle, struct inode *inode, struct inode *dir)<br>
> -{<br>
> - struct posix_acl *acl = NULL;<br>
> - int error = 0;<br>
> -<br>
> - if (!S_ISLNK(inode->i_mode)) {<br>
> - if (test_opt(dir->i_sb, POSIX_ACL)) {<br>
> - acl = ext3_get_acl(dir, ACL_TYPE_DEFAULT);<br>
> - if (IS_ERR(acl))<br>
> - return PTR_ERR(acl);<br>
> - }<br>
> - if (!acl)<br>
> - inode->i_mode &= ~current_umask();<br>
> - }<br>
> - if (test_opt(inode->i_sb, POSIX_ACL) && acl) {<br>
> - if (S_ISDIR(inode->i_mode)) {<br>
> - error = ext3_set_acl(handle, inode,<br>
> - ACL_TYPE_DEFAULT, acl);<br>
> - if (error)<br>
> - goto cleanup;<br>
> - }<br>
> - error = __posix_acl_create(&acl, GFP_NOFS, &inode->i_mode);<br>
> - if (error < 0)<br>
> - return error;<br>
> -<br>
> - if (error > 0) {<br>
> - /* This is an extended ACL */<br>
> - error = ext3_set_acl(handle, inode, ACL_TYPE_ACCESS, acl);<br>
> - }<br>
> - }<br>
> -cleanup:<br>
> - posix_acl_release(acl);<br>
> - return error;<br>
> -}<br>
> -<br>
> -/*<br>
> - * Does chmod for an inode that may have an Access Control List. The<br>
> - * inode->i_mode field must be updated to the desired value by the caller<br>
> - * before calling this function.<br>
> - * Returns 0 on success, or a negative error number.<br>
> - *<br>
> - * We change the ACL rather than storing some ACL entries in the file<br>
> - * mode permission bits (which would be more efficient), because that<br>
> - * would break once additional permissions (like ACL_APPEND, ACL_DELETE<br>
> - * for directories) are added. There are no more bits available in the<br>
> - * file mode.<br>
> - *<br>
> - * inode->i_mutex: down<br>
> - */<br>
> int<br>
> -ext3_acl_chmod(struct inode *inode)<br>
> +ext3_set_acl(struct inode *inode, struct posix_acl *acl, int type)<br>
> {<br>
> - struct posix_acl *acl;<br>
> handle_t *handle;<br>
> - int retries = 0;<br>
> - int error;<br>
> + int error, retries = 0;<br>
><br>
> - if (S_ISLNK(inode->i_mode))<br>
> - return -EOPNOTSUPP;<br>
> - if (!test_opt(inode->i_sb, POSIX_ACL))<br>
> - return 0;<br>
> - acl = ext3_get_acl(inode, ACL_TYPE_ACCESS);<br>
> - if (IS_ERR(acl) || !acl)<br>
> - return PTR_ERR(acl);<br>
> - error = __posix_acl_chmod(&acl, GFP_KERNEL, inode->i_mode);<br>
> - if (error)<br>
> - return error;<br>
> retry:<br>
> - handle = ext3_journal_start(inode,<br>
> - EXT3_DATA_TRANS_BLOCKS(inode->i_sb));<br>
> - if (IS_ERR(handle)) {<br>
> - error = PTR_ERR(handle);<br>
> - ext3_std_error(inode->i_sb, error);<br>
> - goto out;<br>
> - }<br>
> - error = ext3_set_acl(handle, inode, ACL_TYPE_ACCESS, acl);<br>
> + handle = ext3_journal_start(inode, EXT3_DATA_TRANS_BLOCKS(inode->i_sb));<br>
> + if (IS_ERR(handle))<br>
> + return PTR_ERR(handle);<br>
> + error = __ext3_set_acl(handle, inode, type, acl);<br>
> ext3_journal_stop(handle);<br>
> - if (error == -ENOSPC &&<br>
> - ext3_should_retry_alloc(inode->i_sb, &retries))<br>
> + if (error == -ENOSPC && ext3_should_retry_alloc(inode->i_sb, &retries))<br>
> goto retry;<br>
> -out:<br>
> - posix_acl_release(acl);<br>
> return error;<br>
> }<br>
><br>
> /*<br>
> - * Extended attribute handlers<br>
> + * Initialize the ACLs of a new inode. Called from ext3_new_inode.<br>
> + *<br>
> + * dir->i_mutex: down<br>
> + * inode->i_mutex: up (access to inode is still exclusive)<br>
> */<br>
> -static size_t<br>
> -ext3_xattr_list_acl_access(struct dentry *dentry, char *list, size_t list_len,<br>
> - const char *name, size_t name_len, int type)<br>
> -{<br>
> - const size_t size = sizeof(POSIX_ACL_XATTR_ACCESS);<br>
> -<br>
> - if (!test_opt(dentry->d_sb, POSIX_ACL))<br>
> - return 0;<br>
> - if (list && size <= list_len)<br>
> - memcpy(list, POSIX_ACL_XATTR_ACCESS, size);<br>
> - return size;<br>
> -}<br>
> -<br>
> -static size_t<br>
> -ext3_xattr_list_acl_default(struct dentry *dentry, char *list, size_t list_len,<br>
> - const char *name, size_t name_len, int type)<br>
> -{<br>
> - const size_t size = sizeof(POSIX_ACL_XATTR_DEFAULT);<br>
> -<br>
> - if (!test_opt(dentry->d_sb, POSIX_ACL))<br>
> - return 0;<br>
> - if (list && size <= list_len)<br>
> - memcpy(list, POSIX_ACL_XATTR_DEFAULT, size);<br>
> - return size;<br>
> -}<br>
> -<br>
> -static int<br>
> -ext3_xattr_get_acl(struct dentry *dentry, const char *name, void *buffer,<br>
> - size_t size, int type)<br>
> +int<br>
> +ext3_init_acl(handle_t *handle, struct inode *inode, struct inode *dir)<br>
> {<br>
> - struct posix_acl *acl;<br>
> + struct posix_acl *default_acl, *acl;<br>
> int error;<br>
><br>
> - if (strcmp(name, "") != 0)<br>
> - return -EINVAL;<br>
> - if (!test_opt(dentry->d_sb, POSIX_ACL))<br>
> - return -EOPNOTSUPP;<br>
> -<br>
> - acl = ext3_get_acl(dentry->d_inode, type);<br>
> - if (IS_ERR(acl))<br>
> - return PTR_ERR(acl);<br>
> - if (acl == NULL)<br>
> - return -ENODATA;<br>
> - error = posix_acl_to_xattr(&init_user_ns, acl, buffer, size);<br>
> - posix_acl_release(acl);<br>
> -<br>
> - return error;<br>
> -}<br>
> -<br>
> -static int<br>
> -ext3_xattr_set_acl(struct dentry *dentry, const char *name, const void *value,<br>
> - size_t size, int flags, int type)<br>
> -{<br>
> - struct inode *inode = dentry->d_inode;<br>
> - handle_t *handle;<br>
> - struct posix_acl *acl;<br>
> - int error, retries = 0;<br>
> -<br>
> - if (strcmp(name, "") != 0)<br>
> - return -EINVAL;<br>
> - if (!test_opt(inode->i_sb, POSIX_ACL))<br>
> - return -EOPNOTSUPP;<br>
> - if (!inode_owner_or_capable(inode))<br>
> - return -EPERM;<br>
> -<br>
> - if (value) {<br>
> - acl = posix_acl_from_xattr(&init_user_ns, value, size);<br>
> - if (IS_ERR(acl))<br>
> - return PTR_ERR(acl);<br>
> - else if (acl) {<br>
> - error = posix_acl_valid(acl);<br>
> - if (error)<br>
> - goto release_and_out;<br>
> - }<br>
> - } else<br>
> - acl = NULL;<br>
> -<br>
> -retry:<br>
> - handle = ext3_journal_start(inode, EXT3_DATA_TRANS_BLOCKS(inode->i_sb));<br>
> - if (IS_ERR(handle))<br>
> - return PTR_ERR(handle);<br>
> - error = ext3_set_acl(handle, inode, type, acl);<br>
> - ext3_journal_stop(handle);<br>
> - if (error == -ENOSPC && ext3_should_retry_alloc(inode->i_sb, &retries))<br>
> - goto retry;<br>
> + error = posix_acl_create(dir, &inode->i_mode, &default_acl, &acl);<br>
> + if (error)<br>
> + return error;<br>
><br>
> -release_and_out:<br>
> - posix_acl_release(acl);<br>
> + if (default_acl) {<br>
> + error = __ext3_set_acl(handle, inode, ACL_TYPE_DEFAULT,<br>
> + default_acl);<br>
> + posix_acl_release(default_acl);<br>
> + }<br>
> + if (acl) {<br>
> + if (!error)<br>
> + error = __ext3_set_acl(handle, inode, ACL_TYPE_ACCESS,<br>
> + acl);<br>
> + posix_acl_release(acl);<br>
> + }<br>
> return error;<br>
> }<br>
> -<br>
> -const struct xattr_handler ext3_xattr_acl_access_handler = {<br>
> - .prefix = POSIX_ACL_XATTR_ACCESS,<br>
> - .flags = ACL_TYPE_ACCESS,<br>
> - .list = ext3_xattr_list_acl_access,<br>
> - .get = ext3_xattr_get_acl,<br>
> - .set = ext3_xattr_set_acl,<br>
> -};<br>
> -<br>
> -const struct xattr_handler ext3_xattr_acl_default_handler = {<br>
> - .prefix = POSIX_ACL_XATTR_DEFAULT,<br>
> - .flags = ACL_TYPE_DEFAULT,<br>
> - .list = ext3_xattr_list_acl_default,<br>
> - .get = ext3_xattr_get_acl,<br>
> - .set = ext3_xattr_set_acl,<br>
> -};<br>
> diff --git a/fs/ext3/acl.h b/fs/ext3/acl.h<br>
> index dbc921e..ea1c69e 100644<br>
> --- a/fs/ext3/acl.h<br>
> +++ b/fs/ext3/acl.h<br>
> @@ -55,18 +55,13 @@ static inline int ext3_acl_count(size_t size)<br>
><br>
> /* acl.c */<br>
> extern struct posix_acl *ext3_get_acl(struct inode *inode, int type);<br>
> -extern int ext3_acl_chmod (struct inode *);<br>
> +extern int ext3_set_acl(struct inode *inode, struct posix_acl *acl, int type);<br>
> extern int ext3_init_acl (handle_t *, struct inode *, struct inode *);<br>
><br>
> #else /* CONFIG_EXT3_FS_POSIX_ACL */<br>
> #include <linux/sched.h><br>
> #define ext3_get_acl NULL<br>
> -<br>
> -static inline int<br>
> -ext3_acl_chmod(struct inode *inode)<br>
> -{<br>
> - return 0;<br>
> -}<br>
> +#define ext3_set_acl NULL<br>
><br>
> static inline int<br>
> ext3_init_acl(handle_t *handle, struct inode *inode, struct inode *dir)<br>
> diff --git a/fs/ext3/file.c b/fs/ext3/file.c<br>
> index 25cb413..aad0531 100644<br>
> --- a/fs/ext3/file.c<br>
> +++ b/fs/ext3/file.c<br>
> @@ -75,6 +75,7 @@ const struct inode_operations ext3_file_inode_operations = {<br>
> .removexattr = generic_removexattr,<br>
> #endif<br>
> .get_acl = ext3_get_acl,<br>
> + .set_acl = ext3_set_acl,<br>
> .fiemap = ext3_fiemap,<br>
> };<br>
><br>
> diff --git a/fs/ext3/inode.c b/fs/ext3/inode.c<br>
> index 2bd8548..150b6c1 100644<br>
> --- a/fs/ext3/inode.c<br>
> +++ b/fs/ext3/inode.c<br>
> @@ -3365,7 +3365,7 @@ int ext3_setattr(struct dentry *dentry, struct iattr *attr)<br>
> mark_inode_dirty(inode);<br>
><br>
> if (ia_valid & ATTR_MODE)<br>
> - rc = ext3_acl_chmod(inode);<br>
> + rc = posix_acl_chmod(inode);<br>
><br>
> err_out:<br>
> ext3_std_error(inode->i_sb, error);<br>
> diff --git a/fs/ext3/namei.c b/fs/ext3/namei.c<br>
> index f8cde46..f197736 100644<br>
> --- a/fs/ext3/namei.c<br>
> +++ b/fs/ext3/namei.c<br>
> @@ -2569,6 +2569,7 @@ const struct inode_operations ext3_dir_inode_operations = {<br>
> .removexattr = generic_removexattr,<br>
> #endif<br>
> .get_acl = ext3_get_acl,<br>
> + .set_acl = ext3_set_acl,<br>
> };<br>
><br>
> const struct inode_operations ext3_special_inode_operations = {<br>
> @@ -2580,4 +2581,5 @@ const struct inode_operations ext3_special_inode_operations = {<br>
> .removexattr = generic_removexattr,<br>
> #endif<br>
> .get_acl = ext3_get_acl,<br>
> + .set_acl = ext3_set_acl,<br>
> };<br>
> diff --git a/fs/ext3/xattr.c b/fs/ext3/xattr.c<br>
> index b1fc963..c6874be 100644<br>
> --- a/fs/ext3/xattr.c<br>
> +++ b/fs/ext3/xattr.c<br>
> @@ -102,8 +102,8 @@ static struct mb_cache *ext3_xattr_cache;<br>
> static const struct xattr_handler *ext3_xattr_handler_map[] = {<br>
> [EXT3_XATTR_INDEX_USER] = &ext3_xattr_user_handler,<br>
> #ifdef CONFIG_EXT3_FS_POSIX_ACL<br>
> - [EXT3_XATTR_INDEX_POSIX_ACL_ACCESS] = &ext3_xattr_acl_access_handler,<br>
> - [EXT3_XATTR_INDEX_POSIX_ACL_DEFAULT] = &ext3_xattr_acl_default_handler,<br>
> + [EXT3_XATTR_INDEX_POSIX_ACL_ACCESS] = &posix_acl_access_xattr_handler,<br>
> + [EXT3_XATTR_INDEX_POSIX_ACL_DEFAULT] = &posix_acl_default_xattr_handler,<br>
> #endif<br>
> [EXT3_XATTR_INDEX_TRUSTED] = &ext3_xattr_trusted_handler,<br>
> #ifdef CONFIG_EXT3_FS_SECURITY<br>
> @@ -115,8 +115,8 @@ const struct xattr_handler *ext3_xattr_handlers[] = {<br>
> &ext3_xattr_user_handler,<br>
> &ext3_xattr_trusted_handler,<br>
> #ifdef CONFIG_EXT3_FS_POSIX_ACL<br>
> - &ext3_xattr_acl_access_handler,<br>
> - &ext3_xattr_acl_default_handler,<br>
> + &posix_acl_access_xattr_handler,<br>
> + &posix_acl_default_xattr_handler,<br>
> #endif<br>
> #ifdef CONFIG_EXT3_FS_SECURITY<br>
> &ext3_xattr_security_handler,<br>
> diff --git a/fs/ext3/xattr.h b/fs/ext3/xattr.h<br>
> index 2be4f69..32e93eb 100644<br>
> --- a/fs/ext3/xattr.h<br>
> +++ b/fs/ext3/xattr.h<br>
> @@ -60,8 +60,6 @@ struct ext3_xattr_entry {<br>
><br>
> extern const struct xattr_handler ext3_xattr_user_handler;<br>
> extern const struct xattr_handler ext3_xattr_trusted_handler;<br>
> -extern const struct xattr_handler ext3_xattr_acl_access_handler;<br>
> -extern const struct xattr_handler ext3_xattr_acl_default_handler;<br>
> extern const struct xattr_handler ext3_xattr_security_handler;<br>
><br>
> extern ssize_t ext3_listxattr(struct dentry *, char *, size_t);<br>
> diff --git a/fs/ext4/acl.c b/fs/ext4/acl.c<br>
> index f827f3b..acaba0f 100644<br>
> --- a/fs/ext4/acl.c<br>
> +++ b/fs/ext4/acl.c<br>
> @@ -196,7 +196,7 @@ ext4_get_acl(struct inode *inode, int type)<br>
> * inode->i_mutex: down unless called from ext4_new_inode<br>
> */<br>
> static int<br>
> -ext4_set_acl(handle_t *handle, struct inode *inode, int type,<br>
> +__ext4_set_acl(handle_t *handle, struct inode *inode, int type,<br>
> struct posix_acl *acl)<br>
> {<br>
> int name_index;<br>
> @@ -248,208 +248,51 @@ ext4_set_acl(handle_t *handle, struct inode *inode, int type,<br>
> return error;<br>
> }<br>
><br>
> -/*<br>
> - * Initialize the ACLs of a new inode. Called from ext4_new_inode.<br>
> - *<br>
> - * dir->i_mutex: down<br>
> - * inode->i_mutex: up (access to inode is still exclusive)<br>
> - */<br>
> -int<br>
> -ext4_init_acl(handle_t *handle, struct inode *inode, struct inode *dir)<br>
> -{<br>
> - struct posix_acl *acl = NULL;<br>
> - int error = 0;<br>
> -<br>
> - if (!S_ISLNK(inode->i_mode)) {<br>
> - if (test_opt(dir->i_sb, POSIX_ACL)) {<br>
> - acl = ext4_get_acl(dir, ACL_TYPE_DEFAULT);<br>
> - if (IS_ERR(acl))<br>
> - return PTR_ERR(acl);<br>
> - }<br>
> - if (!acl)<br>
> - inode->i_mode &= ~current_umask();<br>
> - }<br>
> - if (test_opt(inode->i_sb, POSIX_ACL) && acl) {<br>
> - if (S_ISDIR(inode->i_mode)) {<br>
> - error = ext4_set_acl(handle, inode,<br>
> - ACL_TYPE_DEFAULT, acl);<br>
> - if (error)<br>
> - goto cleanup;<br>
> - }<br>
> - error = __posix_acl_create(&acl, GFP_NOFS, &inode->i_mode);<br>
> - if (error < 0)<br>
> - return error;<br>
> -<br>
> - if (error > 0) {<br>
> - /* This is an extended ACL */<br>
> - error = ext4_set_acl(handle, inode, ACL_TYPE_ACCESS, acl);<br>
> - }<br>
> - }<br>
> -cleanup:<br>
> - posix_acl_release(acl);<br>
> - return error;<br>
> -}<br>
> -<br>
> -/*<br>
> - * Does chmod for an inode that may have an Access Control List. The<br>
> - * inode->i_mode field must be updated to the desired value by the caller<br>
> - * before calling this function.<br>
> - * Returns 0 on success, or a negative error number.<br>
> - *<br>
> - * We change the ACL rather than storing some ACL entries in the file<br>
> - * mode permission bits (which would be more efficient), because that<br>
> - * would break once additional permissions (like ACL_APPEND, ACL_DELETE<br>
> - * for directories) are added. There are no more bits available in the<br>
> - * file mode.<br>
> - *<br>
> - * inode->i_mutex: down<br>
> - */<br>
> int<br>
> -ext4_acl_chmod(struct inode *inode)<br>
> +ext4_set_acl(struct inode *inode, struct posix_acl *acl, int type)<br>
> {<br>
> - struct posix_acl *acl;<br>
> handle_t *handle;<br>
> - int retries = 0;<br>
> - int error;<br>
> -<br>
> + int error, retries = 0;<br>
><br>
> - if (S_ISLNK(inode->i_mode))<br>
> - return -EOPNOTSUPP;<br>
> - if (!test_opt(inode->i_sb, POSIX_ACL))<br>
> - return 0;<br>
> - acl = ext4_get_acl(inode, ACL_TYPE_ACCESS);<br>
> - if (IS_ERR(acl) || !acl)<br>
> - return PTR_ERR(acl);<br>
> - error = __posix_acl_chmod(&acl, GFP_KERNEL, inode->i_mode);<br>
> - if (error)<br>
> - return error;<br>
> retry:<br>
> handle = ext4_journal_start(inode, EXT4_HT_XATTR,<br>
> ext4_jbd2_credits_xattr(inode));<br>
> - if (IS_ERR(handle)) {<br>
> - error = PTR_ERR(handle);<br>
> - ext4_std_error(inode->i_sb, error);<br>
> - goto out;<br>
> - }<br>
> - error = ext4_set_acl(handle, inode, ACL_TYPE_ACCESS, acl);<br>
> + if (IS_ERR(handle))<br>
> + return PTR_ERR(handle);<br>
> +<br>
> + error = __ext4_set_acl(handle, inode, type, acl);<br>
> ext4_journal_stop(handle);<br>
> - if (error == -ENOSPC &&<br>
> - ext4_should_retry_alloc(inode->i_sb, &retries))<br>
> + if (error == -ENOSPC && ext4_should_retry_alloc(inode->i_sb, &retries))<br>
> goto retry;<br>
> -out:<br>
> - posix_acl_release(acl);<br>
> return error;<br>
> }<br>
><br>
> /*<br>
> - * Extended attribute handlers<br>
> + * Initialize the ACLs of a new inode. Called from ext4_new_inode.<br>
> + *<br>
> + * dir->i_mutex: down<br>
> + * inode->i_mutex: up (access to inode is still exclusive)<br>
> */<br>
> -static size_t<br>
> -ext4_xattr_list_acl_access(struct dentry *dentry, char *list, size_t list_len,<br>
> - const char *name, size_t name_len, int type)<br>
> -{<br>
> - const size_t size = sizeof(POSIX_ACL_XATTR_ACCESS);<br>
> -<br>
> - if (!test_opt(dentry->d_sb, POSIX_ACL))<br>
> - return 0;<br>
> - if (list && size <= list_len)<br>
> - memcpy(list, POSIX_ACL_XATTR_ACCESS, size);<br>
> - return size;<br>
> -}<br>
> -<br>
> -static size_t<br>
> -ext4_xattr_list_acl_default(struct dentry *dentry, char *list, size_t list_len,<br>
> - const char *name, size_t name_len, int type)<br>
> -{<br>
> - const size_t size = sizeof(POSIX_ACL_XATTR_DEFAULT);<br>
> -<br>
> - if (!test_opt(dentry->d_sb, POSIX_ACL))<br>
> - return 0;<br>
> - if (list && size <= list_len)<br>
> - memcpy(list, POSIX_ACL_XATTR_DEFAULT, size);<br>
> - return size;<br>
> -}<br>
> -<br>
> -static int<br>
> -ext4_xattr_get_acl(struct dentry *dentry, const char *name, void *buffer,<br>
> - size_t size, int type)<br>
> +int<br>
> +ext4_init_acl(handle_t *handle, struct inode *inode, struct inode *dir)<br>
> {<br>
> - struct posix_acl *acl;<br>
> + struct posix_acl *default_acl, *acl;<br>
> int error;<br>
><br>
> - if (strcmp(name, "") != 0)<br>
> - return -EINVAL;<br>
> - if (!test_opt(dentry->d_sb, POSIX_ACL))<br>
> - return -EOPNOTSUPP;<br>
> -<br>
> - acl = ext4_get_acl(dentry->d_inode, type);<br>
> - if (IS_ERR(acl))<br>
> - return PTR_ERR(acl);<br>
> - if (acl == NULL)<br>
> - return -ENODATA;<br>
> - error = posix_acl_to_xattr(&init_user_ns, acl, buffer, size);<br>
> - posix_acl_release(acl);<br>
> -<br>
> - return error;<br>
> -}<br>
> -<br>
> -static int<br>
> -ext4_xattr_set_acl(struct dentry *dentry, const char *name, const void *value,<br>
> - size_t size, int flags, int type)<br>
> -{<br>
> - struct inode *inode = dentry->d_inode;<br>
> - handle_t *handle;<br>
> - struct posix_acl *acl;<br>
> - int error, retries = 0;<br>
> -<br>
> - if (strcmp(name, "") != 0)<br>
> - return -EINVAL;<br>
> - if (!test_opt(inode->i_sb, POSIX_ACL))<br>
> - return -EOPNOTSUPP;<br>
> - if (!inode_owner_or_capable(inode))<br>
> - return -EPERM;<br>
> -<br>
> - if (value) {<br>
> - acl = posix_acl_from_xattr(&init_user_ns, value, size);<br>
> - if (IS_ERR(acl))<br>
> - return PTR_ERR(acl);<br>
> - else if (acl) {<br>
> - error = posix_acl_valid(acl);<br>
> - if (error)<br>
> - goto release_and_out;<br>
> - }<br>
> - } else<br>
> - acl = NULL;<br>
> + error = posix_acl_create(dir, &inode->i_mode, &default_acl, &acl);<br>
> + if (error)<br>
> + return error;<br>
><br>
> -retry:<br>
> - handle = ext4_journal_start(inode, EXT4_HT_XATTR,<br>
> - ext4_jbd2_credits_xattr(inode));<br>
> - if (IS_ERR(handle)) {<br>
> - error = PTR_ERR(handle);<br>
> - goto release_and_out;<br>
> + if (default_acl) {<br>
> + error = __ext4_set_acl(handle, inode, ACL_TYPE_DEFAULT,<br>
> + default_acl);<br>
> + posix_acl_release(default_acl);<br>
> + }<br>
> + if (acl) {<br>
> + if (!error)<br>
> + error = __ext4_set_acl(handle, inode, ACL_TYPE_ACCESS,<br>
> + acl);<br>
> + posix_acl_release(acl);<br>
> }<br>
> - error = ext4_set_acl(handle, inode, type, acl);<br>
> - ext4_journal_stop(handle);<br>
> - if (error == -ENOSPC && ext4_should_retry_alloc(inode->i_sb, &retries))<br>
> - goto retry;<br>
> -<br>
> -release_and_out:<br>
> - posix_acl_release(acl);<br>
> return error;<br>
> }<br>
> -<br>
> -const struct xattr_handler ext4_xattr_acl_access_handler = {<br>
> - .prefix = POSIX_ACL_XATTR_ACCESS,<br>
> - .flags = ACL_TYPE_ACCESS,<br>
> - .list = ext4_xattr_list_acl_access,<br>
> - .get = ext4_xattr_get_acl,<br>
> - .set = ext4_xattr_set_acl,<br>
> -};<br>
> -<br>
> -const struct xattr_handler ext4_xattr_acl_default_handler = {<br>
> - .prefix = POSIX_ACL_XATTR_DEFAULT,<br>
> - .flags = ACL_TYPE_DEFAULT,<br>
> - .list = ext4_xattr_list_acl_default,<br>
> - .get = ext4_xattr_get_acl,<br>
> - .set = ext4_xattr_set_acl,<br>
> -};<br>
> diff --git a/fs/ext4/acl.h b/fs/ext4/acl.h<br>
> index 18cb39e..da2c795 100644<br>
> --- a/fs/ext4/acl.h<br>
> +++ b/fs/ext4/acl.h<br>
> @@ -55,18 +55,13 @@ static inline int ext4_acl_count(size_t size)<br>
><br>
> /* acl.c */<br>
> struct posix_acl *ext4_get_acl(struct inode *inode, int type);<br>
> -extern int ext4_acl_chmod(struct inode *);<br>
> +int ext4_set_acl(struct inode *inode, struct posix_acl *acl, int type);<br>
> extern int ext4_init_acl(handle_t *, struct inode *, struct inode *);<br>
><br>
> #else /* CONFIG_EXT4_FS_POSIX_ACL */<br>
> #include <linux/sched.h><br>
> #define ext4_get_acl NULL<br>
> -<br>
> -static inline int<br>
> -ext4_acl_chmod(struct inode *inode)<br>
> -{<br>
> - return 0;<br>
> -}<br>
> +#define ext4_set_acl NULL<br>
><br>
> static inline int<br>
> ext4_init_acl(handle_t *handle, struct inode *inode, struct inode *dir)<br>
> diff --git a/fs/ext4/file.c b/fs/ext4/file.c<br>
> index 3da2194..43e64f6 100644<br>
> --- a/fs/ext4/file.c<br>
> +++ b/fs/ext4/file.c<br>
> @@ -617,6 +617,7 @@ const struct inode_operations ext4_file_inode_operations = {<br>
> .listxattr = ext4_listxattr,<br>
> .removexattr = generic_removexattr,<br>
> .get_acl = ext4_get_acl,<br>
> + .set_acl = ext4_set_acl,<br>
> .fiemap = ext4_fiemap,<br>
> };<br>
><br>
> diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c<br>
> index 0757634..6f69f96 100644<br>
> --- a/fs/ext4/inode.c<br>
> +++ b/fs/ext4/inode.c<br>
> @@ -4675,7 +4675,7 @@ int ext4_setattr(struct dentry *dentry, struct iattr *attr)<br>
> ext4_orphan_del(NULL, inode);<br>
><br>
> if (!rc && (ia_valid & ATTR_MODE))<br>
> - rc = ext4_acl_chmod(inode);<br>
> + rc = posix_acl_chmod(inode);<br>
><br>
> err_out:<br>
> ext4_std_error(inode->i_sb, error);<br>
> diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c<br>
> index 5a0408d..e77c1ba 100644<br>
> --- a/fs/ext4/namei.c<br>
> +++ b/fs/ext4/namei.c<br>
> @@ -3225,6 +3225,7 @@ const struct inode_operations ext4_dir_inode_operations = {<br>
> .listxattr = ext4_listxattr,<br>
> .removexattr = generic_removexattr,<br>
> .get_acl = ext4_get_acl,<br>
> + .set_acl = ext4_set_acl,<br>
> .fiemap = ext4_fiemap,<br>
> };<br>
><br>
> @@ -3235,4 +3236,5 @@ const struct inode_operations ext4_special_inode_operations = {<br>
> .listxattr = ext4_listxattr,<br>
> .removexattr = generic_removexattr,<br>
> .get_acl = ext4_get_acl,<br>
> + .set_acl = ext4_set_acl,<br>
> };<br>
> diff --git a/fs/ext4/xattr.c b/fs/ext4/xattr.c<br>
> index 1423c48..e175e94 100644<br>
> --- a/fs/ext4/xattr.c<br>
> +++ b/fs/ext4/xattr.c<br>
> @@ -95,8 +95,8 @@ static struct mb_cache *ext4_xattr_cache;<br>
> static const struct xattr_handler *ext4_xattr_handler_map[] = {<br>
> [EXT4_XATTR_INDEX_USER] = &ext4_xattr_user_handler,<br>
> #ifdef CONFIG_EXT4_FS_POSIX_ACL<br>
> - [EXT4_XATTR_INDEX_POSIX_ACL_ACCESS] = &ext4_xattr_acl_access_handler,<br>
> - [EXT4_XATTR_INDEX_POSIX_ACL_DEFAULT] = &ext4_xattr_acl_default_handler,<br>
> + [EXT4_XATTR_INDEX_POSIX_ACL_ACCESS] = &posix_acl_access_xattr_handler,<br>
> + [EXT4_XATTR_INDEX_POSIX_ACL_DEFAULT] = &posix_acl_default_xattr_handler,<br>
> #endif<br>
> [EXT4_XATTR_INDEX_TRUSTED] = &ext4_xattr_trusted_handler,<br>
> #ifdef CONFIG_EXT4_FS_SECURITY<br>
> @@ -108,8 +108,8 @@ const struct xattr_handler *ext4_xattr_handlers[] = {<br>
> &ext4_xattr_user_handler,<br>
> &ext4_xattr_trusted_handler,<br>
> #ifdef CONFIG_EXT4_FS_POSIX_ACL<br>
> - &ext4_xattr_acl_access_handler,<br>
> - &ext4_xattr_acl_default_handler,<br>
> + &posix_acl_access_xattr_handler,<br>
> + &posix_acl_default_xattr_handler,<br>
> #endif<br>
> #ifdef CONFIG_EXT4_FS_SECURITY<br>
> &ext4_xattr_security_handler,<br>
> diff --git a/fs/ext4/xattr.h b/fs/ext4/xattr.h<br>
> index c767dbd..819d639 100644<br>
> --- a/fs/ext4/xattr.h<br>
> +++ b/fs/ext4/xattr.h<br>
> @@ -96,8 +96,6 @@ struct ext4_xattr_ibody_find {<br>
><br>
> extern const struct xattr_handler ext4_xattr_user_handler;<br>
> extern const struct xattr_handler ext4_xattr_trusted_handler;<br>
> -extern const struct xattr_handler ext4_xattr_acl_access_handler;<br>
> -extern const struct xattr_handler ext4_xattr_acl_default_handler;<br>
> extern const struct xattr_handler ext4_xattr_security_handler;<br>
><br>
> extern ssize_t ext4_listxattr(struct dentry *, char *, size_t);<br>
> --<br>
> 1.7.10.4<br>
><br>
><br>
> --<br>
> To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in<br>
> the body of a message to <a href="mailto:majordomo@vger.kernel.org">majordomo@vger.kernel.org</a><br>
> More majordomo info at <a href="http://vger.kernel.org/majordomo-info.html" target="_blank">http://vger.kernel.org/majordomo-info.html</a><br>
--<br>
Jan Kara <<a href="mailto:jack@suse.cz">jack@suse.cz</a>><br>
SUSE Labs, CR<br>
<br>
------------------------------------------------------------------------------<br>
Rapidly troubleshoot problems before they affect your business. Most IT<br>
organizations don't have a clear picture of how application performance<br>
affects their revenue. With AppDynamics, you get 100% visibility into your<br>
Java,.NET, & PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro!<br>
<a href="http://pubads.g.doubleclick.net/gampad/clk?id=84349351&iu=/4140/ostg.clktrk" target="_blank">http://pubads.g.doubleclick.net/gampad/clk?id=84349351&iu=/4140/ostg.clktrk</a><br>
_______________________________________________<br>
Jfs-discussion mailing list<br>
<a href="mailto:Jfs-discussion@lists.sourceforge.net">Jfs-discussion@lists.sourceforge.net</a><br>
<a href="https://lists.sourceforge.net/lists/listinfo/jfs-discussion" target="_blank">https://lists.sourceforge.net/lists/listinfo/jfs-discussion</a><br>
</blockquote></div><br></div>