leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'guilt/xfs-5.19-misc-2' into xfs-5.19-for-next

Browse Source
This commit is contained in:
Dave Chinner
2022-05-04 12:36:54 +10:00
parent a44a027a8b bc37e4fb5c
commit 9cf4f6160c
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
fs/xfs/xfs_acl.h
View File

@@ -16,11 +16,13 @@ extern int xfs_set_acl(struct user_namespace *mnt_userns, struct inode *inode,
extern int __xfs_set_acl(struct inode *inode, struct posix_acl *acl, int type); extern int __xfs_set_acl(struct inode *inode, struct posix_acl *acl, int type);
void xfs_forget_acl(struct inode *inode, const char *name); void xfs_forget_acl(struct inode *inode, const char *name);
#else #else
static inline struct posix_acl *xfs_get_acl(struct inode *inode, int type, bool rcu) #define xfs_get_acl NULL
#define xfs_set_acl NULL
static inline int __xfs_set_acl(struct inode *inode, struct posix_acl *acl,
int type)
{ {
return NULL; return 0;
} }
# define xfs_set_acl NULL
static inline void xfs_forget_acl(struct inode *inode, const char *name) static inline void xfs_forget_acl(struct inode *inode, const char *name)
{ {
} }

5
fs/xfs/xfs_filestream.c
View File

@@ -128,11 +128,12 @@ xfs_filestream_pick_ag(
if (!pag->pagf_init) { if (!pag->pagf_init) {
err = xfs_alloc_pagf_init(mp, NULL, ag, trylock); err = xfs_alloc_pagf_init(mp, NULL, ag, trylock);
if (err) { if (err) {
if (err != -EAGAIN) {
xfs_perag_put(pag); xfs_perag_put(pag);
if (err != -EAGAIN)
return err; return err;
}
/* Couldn't lock the AGF, skip this AG. */ /* Couldn't lock the AGF, skip this AG. */
continue; goto next_ag;
} }
} }

2
fs/xfs/xfs_iops.c
View File

@@ -209,7 +209,6 @@ xfs_generic_create(
if (unlikely(error)) if (unlikely(error))
goto out_cleanup_inode; goto out_cleanup_inode;
#ifdef CONFIG_XFS_POSIX_ACL
if (default_acl) { if (default_acl) {
error = __xfs_set_acl(inode, default_acl, ACL_TYPE_DEFAULT); error = __xfs_set_acl(inode, default_acl, ACL_TYPE_DEFAULT);
if (error) if (error)
@@ -220,7 +219,6 @@ xfs_generic_create(
if (error) if (error)
goto out_cleanup_inode; goto out_cleanup_inode;
} }
#endif
xfs_setup_iops(ip); xfs_setup_iops(ip);

1
fs/xfs/xfs_trans_dquot.c
View File

@@ -603,7 +603,6 @@ xfs_dqresv_check(
return QUOTA_NL_ISOFTLONGWARN; return QUOTA_NL_ISOFTLONGWARN;
} }
res->warnings++;
return QUOTA_NL_ISOFTWARN; return QUOTA_NL_ISOFTWARN;
} }