| Message ID | bd40adc5-67c7-0f47-ed6f-da2540202de0@paragon-software.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | fs/ntfs3: Refactoring of xattr.c | expand |
On Fri, Sep 24, 2021 at 07:14:53PM +0300, Konstantin Komarov wrote: > We don't need to maintain ntfs_posix_acl_release. > > Signed-off-by: Konstantin Komarov <almaz.alexandrovich@paragon-software.com> Reviewed-by: Kari Argillander <kari.argillander@gmail.com> > --- > fs/ntfs3/xattr.c | 10 ++-------- > 1 file changed, 2 insertions(+), 8 deletions(-) > > diff --git a/fs/ntfs3/xattr.c b/fs/ntfs3/xattr.c > index 83bbee277e12..253a07d9aa7b 100644 > --- a/fs/ntfs3/xattr.c > +++ b/fs/ntfs3/xattr.c > @@ -475,12 +475,6 @@ static noinline int ntfs_set_ea(struct inode *inode, const char *name, > } > > #ifdef CONFIG_NTFS3_FS_POSIX_ACL > -static inline void ntfs_posix_acl_release(struct posix_acl *acl) > -{ > - if (acl && refcount_dec_and_test(&acl->a_refcount)) > - kfree(acl); > -} > - > static struct posix_acl *ntfs_get_acl_ex(struct user_namespace *mnt_userns, > struct inode *inode, int type, > int locked) > @@ -641,7 +635,7 @@ static int ntfs_xattr_get_acl(struct user_namespace *mnt_userns, > return -ENODATA; > > err = posix_acl_to_xattr(mnt_userns, acl, buffer, size); > - ntfs_posix_acl_release(acl); > + posix_acl_release(acl); > > return err; > } > @@ -678,7 +672,7 @@ static int ntfs_xattr_set_acl(struct user_namespace *mnt_userns, > err = ntfs_set_acl(mnt_userns, inode, acl, type); > > release_and_out: > - ntfs_posix_acl_release(acl); > + posix_acl_release(acl); > return err; > } > > -- > 2.33.0 > >
diff --git a/fs/ntfs3/xattr.c b/fs/ntfs3/xattr.c index 83bbee277e12..253a07d9aa7b 100644 --- a/fs/ntfs3/xattr.c +++ b/fs/ntfs3/xattr.c @@ -475,12 +475,6 @@ static noinline int ntfs_set_ea(struct inode *inode, const char *name, } #ifdef CONFIG_NTFS3_FS_POSIX_ACL -static inline void ntfs_posix_acl_release(struct posix_acl *acl) -{ - if (acl && refcount_dec_and_test(&acl->a_refcount)) - kfree(acl); -} - static struct posix_acl *ntfs_get_acl_ex(struct user_namespace *mnt_userns, struct inode *inode, int type, int locked) @@ -641,7 +635,7 @@ static int ntfs_xattr_get_acl(struct user_namespace *mnt_userns, return -ENODATA; err = posix_acl_to_xattr(mnt_userns, acl, buffer, size); - ntfs_posix_acl_release(acl); + posix_acl_release(acl); return err; } @@ -678,7 +672,7 @@ static int ntfs_xattr_set_acl(struct user_namespace *mnt_userns, err = ntfs_set_acl(mnt_userns, inode, acl, type); release_and_out: - ntfs_posix_acl_release(acl); + posix_acl_release(acl); return err; }
We don't need to maintain ntfs_posix_acl_release. Signed-off-by: Konstantin Komarov <almaz.alexandrovich@paragon-software.com> --- fs/ntfs3/xattr.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-)