Commit 9cf4f616 authored by Dave Chinner's avatar Dave Chinner
Browse files

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

parents a44a027a bc37e4fb

fs/xfs/xfs_acl.h

+5 −3
Original line number Diff line number Diff line
@@ -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)

{

}

fs/xfs/xfs_filestream.c

+4 −3
Original line number Diff line number Diff line
@@ -128,11 +128,12 @@ xfs_filestream_pick_ag( 
		if (!pag->pagf_init) {

			err = xfs_alloc_pagf_init(mp, NULL, ag, trylock);

			if (err) {

				if (err != -EAGAIN) {

					xfs_perag_put(pag);

				if (err != -EAGAIN)

					return err;

				}

				/* Couldn't lock the AGF, skip this AG. */

				continue;

				goto next_ag;

			}

		}

fs/xfs/xfs_iops.c

+0 −2
Original line number Diff line number Diff line
@@ -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);

fs/xfs/xfs_trans_dquot.c

+0 −1
Original line number Diff line number Diff line
@@ -603,7 +603,6 @@ xfs_dqresv_check( 
			return QUOTA_NL_ISOFTLONGWARN;

		}



		res->warnings++;

		return QUOTA_NL_ISOFTWARN;

	}