Merge branch 'xfs-4.7-trans-type-cleanup' into for-next (d6bd9615) · Commits · e / devices / android_kernel_oneplus_sm7250

fs/xfs/libxfs/xfs_attr.c

+13 −45

Original line number	Diff line number	Diff line
		@@ -242,37 +242,21 @@ xfs_attr_set(
		return error;
		}

		/*
		* Start our first transaction of the day.
		*
		* All future transactions during this code must be "chained" off
		* this one via the trans_dup() call. All transactions will contain
		* the inode, and the inode will always be marked with trans_ihold().
		* Since the inode will be locked in all transactions, we must log
		* the inode in every transaction to let it float upward through
		* the log.
		*/
		args.trans = xfs_trans_alloc(mp, XFS_TRANS_ATTR_SET);
		tres.tr_logres = M_RES(mp)->tr_attrsetm.tr_logres +
		M_RES(mp)->tr_attrsetrt.tr_logres * args.total;
		tres.tr_logcount = XFS_ATTRSET_LOG_COUNT;
		tres.tr_logflags = XFS_TRANS_PERM_LOG_RES;

		/*
		* Root fork attributes can use reserved data blocks for this
		* operation if necessary
		*/

		if (rsvd)
		args.trans->t_flags \|= XFS_TRANS_RESERVE;

		tres.tr_logres = M_RES(mp)->tr_attrsetm.tr_logres +
		M_RES(mp)->tr_attrsetrt.tr_logres * args.total;
		tres.tr_logcount = XFS_ATTRSET_LOG_COUNT;
		tres.tr_logflags = XFS_TRANS_PERM_LOG_RES;
		error = xfs_trans_reserve(args.trans, &tres, args.total, 0);
		if (error) {
		xfs_trans_cancel(args.trans);
		error = xfs_trans_alloc(mp, &tres, args.total, 0,
		rsvd ? XFS_TRANS_RESERVE : 0, &args.trans);
		if (error)
		return error;
		}
		xfs_ilock(dp, XFS_ILOCK_EXCL);

		xfs_ilock(dp, XFS_ILOCK_EXCL);
		error = xfs_trans_reserve_quota_nblks(args.trans, dp, args.total, 0,
		rsvd ? XFS_QMOPT_RES_REGBLKS \| XFS_QMOPT_FORCE_RES :
		XFS_QMOPT_RES_REGBLKS);
		@@ -428,32 +412,16 @@ xfs_attr_remove(
		if (error)
		return error;

		/*
		* Start our first transaction of the day.
		*
		* All future transactions during this code must be "chained" off
		* this one via the trans_dup() call. All transactions will contain
		* the inode, and the inode will always be marked with trans_ihold().
		* Since the inode will be locked in all transactions, we must log
		* the inode in every transaction to let it float upward through
		* the log.
		*/
		args.trans = xfs_trans_alloc(mp, XFS_TRANS_ATTR_RM);

		/*
		* Root fork attributes can use reserved data blocks for this
		* operation if necessary
		*/

		if (flags & ATTR_ROOT)
		args.trans->t_flags \|= XFS_TRANS_RESERVE;

		error = xfs_trans_reserve(args.trans, &M_RES(mp)->tr_attrrm,
		XFS_ATTRRM_SPACE_RES(mp), 0);
		if (error) {
		xfs_trans_cancel(args.trans);
		error = xfs_trans_alloc(mp, &M_RES(mp)->tr_attrrm,
		XFS_ATTRRM_SPACE_RES(mp), 0,
		(flags & ATTR_ROOT) ? XFS_TRANS_RESERVE : 0,
		&args.trans);
		if (error)
		return error;
		}

		xfs_ilock(dp, XFS_ILOCK_EXCL);
		/*

fs/xfs/libxfs/xfs_bmap.c

+9 −13

Original line number	Diff line number	Diff line
		@@ -1121,15 +1121,14 @@ xfs_bmap_add_attrfork(

		mp = ip->i_mount;
		ASSERT(!XFS_NOT_DQATTACHED(mp, ip));
		tp = xfs_trans_alloc(mp, XFS_TRANS_ADDAFORK);

		blks = XFS_ADDAFORK_SPACE_RES(mp);
		if (rsvd)
		tp->t_flags \|= XFS_TRANS_RESERVE;
		error = xfs_trans_reserve(tp, &M_RES(mp)->tr_addafork, blks, 0);
		if (error) {
		xfs_trans_cancel(tp);

		error = xfs_trans_alloc(mp, &M_RES(mp)->tr_addafork, blks, 0,
		rsvd ? XFS_TRANS_RESERVE : 0, &tp);
		if (error)
		return error;
		}

		xfs_ilock(ip, XFS_ILOCK_EXCL);
		error = xfs_trans_reserve_quota_nblks(tp, ip, blks, 0, rsvd ?
		XFS_QMOPT_RES_REGBLKS \| XFS_QMOPT_FORCE_RES :
		@@ -6026,13 +6025,10 @@ xfs_bmap_split_extent(
		xfs_fsblock_t firstfsb;
		int error;

		tp = xfs_trans_alloc(mp, XFS_TRANS_DIOSTRAT);
		error = xfs_trans_reserve(tp, &M_RES(mp)->tr_write,
		XFS_DIOSTRAT_SPACE_RES(mp, 0), 0);
		if (error) {
		xfs_trans_cancel(tp);
		error = xfs_trans_alloc(mp, &M_RES(mp)->tr_write,
		XFS_DIOSTRAT_SPACE_RES(mp, 0), 0, 0, &tp);
		if (error)
		return error;
		}

		xfs_ilock(ip, XFS_ILOCK_EXCL);
		xfs_trans_ijoin(tp, ip, XFS_ILOCK_EXCL);

fs/xfs/libxfs/xfs_log_format.h

+5 −0

Original line number	Diff line number	Diff line
		@@ -211,6 +211,11 @@ typedef struct xfs_trans_header {

		#define XFS_TRANS_HEADER_MAGIC 0x5452414e /* TRAN */

		/*
		* The only type valid for th_type in CIL-enabled file system logs:
		*/
		#define XFS_TRANS_CHECKPOINT 40

		/*
		* Log item types.
		*/

fs/xfs/libxfs/xfs_sb.c

+3 −5

Original line number	Diff line number	Diff line
		@@ -838,12 +838,10 @@ xfs_sync_sb(
		struct xfs_trans *tp;
		int error;

		tp = _xfs_trans_alloc(mp, XFS_TRANS_SB_CHANGE, KM_SLEEP);
		error = xfs_trans_reserve(tp, &M_RES(mp)->tr_sb, 0, 0);
		if (error) {
		xfs_trans_cancel(tp);
		error = xfs_trans_alloc(mp, &M_RES(mp)->tr_sb, 0, 0,
		XFS_TRANS_NO_WRITECOUNT, &tp);
		if (error)
		return error;
		}

		xfs_log_sb(tp);
		if (wait)

fs/xfs/libxfs/xfs_shared.h

+3 −99

Original line number	Diff line number	Diff line
		@@ -55,103 +55,6 @@ extern const struct xfs_buf_ops xfs_sb_quiet_buf_ops;
		extern const struct xfs_buf_ops xfs_symlink_buf_ops;
		extern const struct xfs_buf_ops xfs_rtbuf_ops;

		/*
		* Transaction types. Used to distinguish types of buffers. These never reach
		* the log.
		*/
		#define XFS_TRANS_SETATTR_NOT_SIZE 1
		#define XFS_TRANS_SETATTR_SIZE 2
		#define XFS_TRANS_INACTIVE 3
		#define XFS_TRANS_CREATE 4
		#define XFS_TRANS_CREATE_TRUNC 5
		#define XFS_TRANS_TRUNCATE_FILE 6
		#define XFS_TRANS_REMOVE 7
		#define XFS_TRANS_LINK 8
		#define XFS_TRANS_RENAME 9
		#define XFS_TRANS_MKDIR 10
		#define XFS_TRANS_RMDIR 11
		#define XFS_TRANS_SYMLINK 12
		#define XFS_TRANS_SET_DMATTRS 13
		#define XFS_TRANS_GROWFS 14
		#define XFS_TRANS_STRAT_WRITE 15
		#define XFS_TRANS_DIOSTRAT 16
		/* 17 was XFS_TRANS_WRITE_SYNC */
		#define XFS_TRANS_WRITEID 18
		#define XFS_TRANS_ADDAFORK 19
		#define XFS_TRANS_ATTRINVAL 20
		#define XFS_TRANS_ATRUNCATE 21
		#define XFS_TRANS_ATTR_SET 22
		#define XFS_TRANS_ATTR_RM 23
		#define XFS_TRANS_ATTR_FLAG 24
		#define XFS_TRANS_CLEAR_AGI_BUCKET 25
		#define XFS_TRANS_SB_CHANGE 26
		/*
		* Dummy entries since we use the transaction type to index into the
		* trans_type[] in xlog_recover_print_trans_head()
		*/
		#define XFS_TRANS_DUMMY1 27
		#define XFS_TRANS_DUMMY2 28
		#define XFS_TRANS_QM_QUOTAOFF 29
		#define XFS_TRANS_QM_DQALLOC 30
		#define XFS_TRANS_QM_SETQLIM 31
		#define XFS_TRANS_QM_DQCLUSTER 32
		#define XFS_TRANS_QM_QINOCREATE 33
		#define XFS_TRANS_QM_QUOTAOFF_END 34
		#define XFS_TRANS_FSYNC_TS 35
		#define XFS_TRANS_GROWFSRT_ALLOC 36
		#define XFS_TRANS_GROWFSRT_ZERO 37
		#define XFS_TRANS_GROWFSRT_FREE 38
		#define XFS_TRANS_SWAPEXT 39
		#define XFS_TRANS_CHECKPOINT 40
		#define XFS_TRANS_ICREATE 41
		#define XFS_TRANS_CREATE_TMPFILE 42
		#define XFS_TRANS_TYPE_MAX 43
		/* new transaction types need to be reflected in xfs_logprint(8) */

		#define XFS_TRANS_TYPES \
		{ XFS_TRANS_SETATTR_NOT_SIZE, "SETATTR_NOT_SIZE" }, \
		{ XFS_TRANS_SETATTR_SIZE, "SETATTR_SIZE" }, \
		{ XFS_TRANS_INACTIVE, "INACTIVE" }, \
		{ XFS_TRANS_CREATE, "CREATE" }, \
		{ XFS_TRANS_CREATE_TRUNC, "CREATE_TRUNC" }, \
		{ XFS_TRANS_TRUNCATE_FILE, "TRUNCATE_FILE" }, \
		{ XFS_TRANS_REMOVE, "REMOVE" }, \
		{ XFS_TRANS_LINK, "LINK" }, \
		{ XFS_TRANS_RENAME, "RENAME" }, \
		{ XFS_TRANS_MKDIR, "MKDIR" }, \
		{ XFS_TRANS_RMDIR, "RMDIR" }, \
		{ XFS_TRANS_SYMLINK, "SYMLINK" }, \
		{ XFS_TRANS_SET_DMATTRS, "SET_DMATTRS" }, \
		{ XFS_TRANS_GROWFS, "GROWFS" }, \
		{ XFS_TRANS_STRAT_WRITE, "STRAT_WRITE" }, \
		{ XFS_TRANS_DIOSTRAT, "DIOSTRAT" }, \
		{ XFS_TRANS_WRITEID, "WRITEID" }, \
		{ XFS_TRANS_ADDAFORK, "ADDAFORK" }, \
		{ XFS_TRANS_ATTRINVAL, "ATTRINVAL" }, \
		{ XFS_TRANS_ATRUNCATE, "ATRUNCATE" }, \
		{ XFS_TRANS_ATTR_SET, "ATTR_SET" }, \
		{ XFS_TRANS_ATTR_RM, "ATTR_RM" }, \
		{ XFS_TRANS_ATTR_FLAG, "ATTR_FLAG" }, \
		{ XFS_TRANS_CLEAR_AGI_BUCKET, "CLEAR_AGI_BUCKET" }, \
		{ XFS_TRANS_SB_CHANGE, "SBCHANGE" }, \
		{ XFS_TRANS_DUMMY1, "DUMMY1" }, \
		{ XFS_TRANS_DUMMY2, "DUMMY2" }, \
		{ XFS_TRANS_QM_QUOTAOFF, "QM_QUOTAOFF" }, \
		{ XFS_TRANS_QM_DQALLOC, "QM_DQALLOC" }, \
		{ XFS_TRANS_QM_SETQLIM, "QM_SETQLIM" }, \
		{ XFS_TRANS_QM_DQCLUSTER, "QM_DQCLUSTER" }, \
		{ XFS_TRANS_QM_QINOCREATE, "QM_QINOCREATE" }, \
		{ XFS_TRANS_QM_QUOTAOFF_END, "QM_QOFF_END" }, \
		{ XFS_TRANS_FSYNC_TS, "FSYNC_TS" }, \
		{ XFS_TRANS_GROWFSRT_ALLOC, "GROWFSRT_ALLOC" }, \
		{ XFS_TRANS_GROWFSRT_ZERO, "GROWFSRT_ZERO" }, \
		{ XFS_TRANS_GROWFSRT_FREE, "GROWFSRT_FREE" }, \
		{ XFS_TRANS_SWAPEXT, "SWAPEXT" }, \
		{ XFS_TRANS_CHECKPOINT, "CHECKPOINT" }, \
		{ XFS_TRANS_ICREATE, "ICREATE" }, \
		{ XFS_TRANS_CREATE_TMPFILE, "CREATE_TMPFILE" }, \
		{ XLOG_UNMOUNT_REC_TYPE, "UNMOUNT" }

		/*
		* This structure is used to track log items associated with
		* a transaction. It points to the log item and keeps some
		@@ -181,8 +84,9 @@ int xfs_log_calc_minimum_size(struct xfs_mount *);
		#define XFS_TRANS_SYNC 0x08 /* make commit synchronous */
		#define XFS_TRANS_DQ_DIRTY 0x10 /* at least one dquot in trx dirty */
		#define XFS_TRANS_RESERVE 0x20 /* OK to use reserved data blocks */
		#define XFS_TRANS_FREEZE_PROT 0x40 /* Transaction has elevated writer
		count in superblock */
		#define XFS_TRANS_NO_WRITECOUNT 0x40 /* do not elevate SB writecount */
		#define XFS_TRANS_NOFS 0x80 /* pass KM_NOFS to kmem_alloc */

		/*
		* Field values for xfs_trans_mod_sb.
		*/