On Wed 12-07-17 06:54:50, Ernesto A. Fernández wrote:
> Shorten the name of the error variable to 'err' so the call to
> posix_acl_update_mode() fits within 80 characters.
>
> Signed-off-by: Ernesto A. Fernández <ernesto.mnd.fernandez@xxxxxxxxx>
This is no longer a problem. Patch ignored.
Honza
> ---
> fs/ext2/acl.c | 14 +++++++-------
> 1 file changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/fs/ext2/acl.c b/fs/ext2/acl.c
> index 4e04b7e..d2cca5c 100644
> --- a/fs/ext2/acl.c
> +++ b/fs/ext2/acl.c
> @@ -184,7 +184,7 @@ ext2_set_acl(struct inode *inode, struct posix_acl *acl, int type)
> int name_index;
> void *value = NULL;
> size_t size = 0;
> - int error;
> + int err;
> int update_mode = 0;
> umode_t mode = inode->i_mode;
>
> @@ -192,9 +192,9 @@ ext2_set_acl(struct inode *inode, struct posix_acl *acl, int type)
> case ACL_TYPE_ACCESS:
> name_index = EXT2_XATTR_INDEX_POSIX_ACL_ACCESS;
> if (acl) {
> - error = posix_acl_update_mode(inode, &mode, &acl);
> - if (error)
> - return error;
> + err = posix_acl_update_mode(inode, &mode, &acl);
> + if (err)
> + return err;
> update_mode = 1;
> }
> break;
> @@ -214,10 +214,10 @@ ext2_set_acl(struct inode *inode, struct posix_acl *acl, int type)
> return (int)PTR_ERR(value);
> }
>
> - error = ext2_xattr_set(inode, name_index, "", value, size, 0);
> + err = ext2_xattr_set(inode, name_index, "", value, size, 0);
>
> kfree(value);
> - if (!error) {
> + if (!err) {
> set_cached_acl(inode, type, acl);
> if (update_mode) {
> inode->i_mode = mode;
> @@ -225,7 +225,7 @@ ext2_set_acl(struct inode *inode, struct posix_acl *acl, int type)
> mark_inode_dirty(inode);
> }
> }
> - return error;
> + return err;
> }
>
> /*
> --
> 2.1.4
>
>
--
Jan Kara <jack@xxxxxxxx>
SUSE Labs, CR
--
To unsubscribe from this list: send the line "unsubscribe reiserfs-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
