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

torvalds · May 4, 2022 · 9cf4f61 · 9cf4f61
2 parents a44a027 + bc37e4f
commit 9cf4f61
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/fs/xfs/xfs_acl.h b/fs/xfs/xfs_acl.h
@@ -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);
 void xfs_forget_acl(struct inode *inode, const char *name);
 #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)
 {
 }

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

diff --git a/fs/xfs/xfs_iops.c b/fs/xfs/xfs_iops.c
@@ -209,7 +209,6 @@ xfs_generic_create(
  if (unlikely(error))
  goto out_cleanup_inode;
 
-#ifdef CONFIG_XFS_POSIX_ACL
  if (default_acl) {
  error = __xfs_set_acl(inode, default_acl, ACL_TYPE_DEFAULT);
  if (error)
@@ -220,7 +219,6 @@ xfs_generic_create(
  if (error)
  goto out_cleanup_inode;
  }
-#endif
 
  xfs_setup_iops(ip);
 

diff --git a/fs/xfs/xfs_trans_dquot.c b/fs/xfs/xfs_trans_dquot.c
@@ -603,7 +603,6 @@ xfs_dqresv_check(
  return QUOTA_NL_ISOFTLONGWARN;
  }
 
- res->warnings++;
  return QUOTA_NL_ISOFTWARN;
  }