| Message ID | 22b8b701-e0c0-9b3f-dd58-0e8ab7c54754@paragon-software.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | fs/ntfs3: Refactor locking in inode_operations | expand |
On Thu, Sep 23, 2021 at 06:44:55PM +0300, Konstantin Komarov wrote: > Right now ntfs3 uses posix_acl_equiv_mode instead of > posix_acl_update_mode like all other fs. > > Reviewed-by: Kari Argillander <kari.argillander@gmail.com> > Signed-off-by: Konstantin Komarov <almaz.alexandrovich@paragon-software.com> > --- > fs/ntfs3/xattr.c | 15 ++++----------- > 1 file changed, 4 insertions(+), 11 deletions(-) > > diff --git a/fs/ntfs3/xattr.c b/fs/ntfs3/xattr.c > index 70f2f9eb6b1e..59ec5e61a239 100644 > --- a/fs/ntfs3/xattr.c > +++ b/fs/ntfs3/xattr.c > @@ -559,22 +559,15 @@ static noinline int ntfs_set_acl_ex(struct user_namespace *mnt_userns, > if (acl) { > umode_t mode = inode->i_mode; > > - err = posix_acl_equiv_mode(acl, &mode); > - if (err < 0) > - return err; > + err = posix_acl_update_mode(mnt_userns, inode, &mode, > + &acl); > + if (err) > + goto out; Small nit. Maybe just straight return err; Put you can choose if you feel changing it. > > if (inode->i_mode != mode) { > inode->i_mode = mode; > mark_inode_dirty(inode); > } > - > - if (!err) { > - /* > - * ACL can be exactly represented in the > - * traditional file mode permission bits. > - */ > - acl = NULL; > - } > } > name = XATTR_NAME_POSIX_ACL_ACCESS; > name_len = sizeof(XATTR_NAME_POSIX_ACL_ACCESS) - 1; > -- > 2.33.0 > > >
diff --git a/fs/ntfs3/xattr.c b/fs/ntfs3/xattr.c index 70f2f9eb6b1e..59ec5e61a239 100644 --- a/fs/ntfs3/xattr.c +++ b/fs/ntfs3/xattr.c @@ -559,22 +559,15 @@ static noinline int ntfs_set_acl_ex(struct user_namespace *mnt_userns, if (acl) { umode_t mode = inode->i_mode; - err = posix_acl_equiv_mode(acl, &mode); - if (err < 0) - return err; + err = posix_acl_update_mode(mnt_userns, inode, &mode, + &acl); + if (err) + goto out; if (inode->i_mode != mode) { inode->i_mode = mode; mark_inode_dirty(inode); } - - if (!err) { - /* - * ACL can be exactly represented in the - * traditional file mode permission bits. - */ - acl = NULL; - } } name = XATTR_NAME_POSIX_ACL_ACCESS; name_len = sizeof(XATTR_NAME_POSIX_ACL_ACCESS) - 1;