Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e01c025f authored by Dave Chinner's avatar Dave Chinner
Browse files

Merge branch 'xfs-misc-fixes-for-4.2' into for-next

parents 22419ac9 339e4f66

Documentation/filesystems/xfs.txt

+6 −6
Original line number Diff line number Diff line
@@ -236,10 +236,10 @@ Removed Mount Options 


  Name				Removed

  ----				-------

  delaylog/nodelaylog		v3.20

  ihashsize			v3.20

  irixsgid			v3.20

  osyncisdsync/osyncisosync	v3.20

  delaylog/nodelaylog		v4.0

  ihashsize			v4.0

  irixsgid			v4.0

  osyncisdsync/osyncisosync	v4.0





sysctls
@@ -346,5 +346,5 @@ Removed Sysctls 


  Name				Removed

  ----				-------

  fs.xfs.xfsbufd_centisec	v3.20

  fs.xfs.age_buffer_centisecs	v3.20
 
  fs.xfs.xfsbufd_centisec	v4.0

  fs.xfs.age_buffer_centisecs	v4.0

fs/xfs/libxfs/xfs_bmap.c

+9 −1
Original line number Diff line number Diff line
@@ -4424,7 +4424,15 @@ xfs_bmapi_convert_unwritten( 
	error = xfs_bmap_add_extent_unwritten_real(bma->tp, bma->ip, &bma->idx,

			&bma->cur, mval, bma->firstblock, bma->flist,

			&tmp_logflags);

	bma->logflags |= tmp_logflags;

	/*

	 * Log the inode core unconditionally in the unwritten extent conversion

	 * path because the conversion might not have done so (e.g., if the

	 * extent count hasn't changed). We need to make sure the inode is dirty

	 * in the transaction for the sake of fsync(), even if nothing has

	 * changed, because fsync() will not force the log for this transaction

	 * unless it sees the inode pinned.

	 */

	bma->logflags |= tmp_logflags | XFS_ILOG_CORE;

	if (error)

		return error;

fs/xfs/libxfs/xfs_format.h

+2 −2
Original line number Diff line number Diff line
@@ -1453,8 +1453,8 @@ struct xfs_acl { 
		sizeof(struct xfs_acl_entry) * XFS_ACL_MAX_ENTRIES((mp)))



/* On-disk XFS extended attribute names */

#define SGI_ACL_FILE		(unsigned char *)"SGI_ACL_FILE"

#define SGI_ACL_DEFAULT		(unsigned char *)"SGI_ACL_DEFAULT"

#define SGI_ACL_FILE		"SGI_ACL_FILE"

#define SGI_ACL_DEFAULT		"SGI_ACL_DEFAULT"

#define SGI_ACL_FILE_SIZE	(sizeof(SGI_ACL_FILE)-1)

#define SGI_ACL_DEFAULT_SIZE	(sizeof(SGI_ACL_DEFAULT)-1)

fs/xfs/xfs_quota.h

+0 −1
Original line number Diff line number Diff line
@@ -55,7 +55,6 @@ struct xfs_trans; 
typedef struct xfs_dqtrx {

	struct xfs_dquot *qt_dquot;	  /* the dquot this refers to */

	ulong		qt_blk_res;	  /* blks reserved on a dquot */

	ulong		qt_blk_res_used;  /* blks used from the reservation */

	ulong		qt_ino_res;	  /* inode reserved on a dquot */

	ulong		qt_ino_res_used;  /* inodes used from the reservation */

	long		qt_bcount_delta;  /* dquot blk count changes */

fs/xfs/xfs_trans_dquot.c

+19 −13
Original line number Diff line number Diff line
@@ -92,6 +92,7 @@ xfs_trans_dup_dqinfo( 
	xfs_dqtrx_t	*oq, *nq;

	int		i, j;

	xfs_dqtrx_t	*oqa, *nqa;

	ulong		blk_res_used;



	if (!otp->t_dqinfo)

		return;
@@ -109,11 +110,16 @@ xfs_trans_dup_dqinfo( 
		oqa = otp->t_dqinfo->dqs[j];

		nqa = ntp->t_dqinfo->dqs[j];

		for (i = 0; i < XFS_QM_TRANS_MAXDQS; i++) {

			blk_res_used = 0;



			if (oqa[i].qt_dquot == NULL)

				break;

			oq = &oqa[i];

			nq = &nqa[i];



			if (oq->qt_blk_res && oq->qt_bcount_delta > 0)

				blk_res_used = oq->qt_bcount_delta;



			nq->qt_dquot = oq->qt_dquot;

			nq->qt_bcount_delta = nq->qt_icount_delta = 0;

			nq->qt_rtbcount_delta = 0;
@@ -121,8 +127,8 @@ xfs_trans_dup_dqinfo( 
			/*

			 * Transfer whatever is left of the reservations.

			 */

			nq->qt_blk_res = oq->qt_blk_res - oq->qt_blk_res_used;

			oq->qt_blk_res = oq->qt_blk_res_used;

			nq->qt_blk_res = oq->qt_blk_res - blk_res_used;

			oq->qt_blk_res = blk_res_used;



			nq->qt_rtblk_res = oq->qt_rtblk_res -

				oq->qt_rtblk_res_used;
@@ -239,10 +245,6 @@ xfs_trans_mod_dquot( 
		 * disk blocks used.

		 */

	      case XFS_TRANS_DQ_BCOUNT:

		if (qtrx->qt_blk_res && delta > 0) {

			qtrx->qt_blk_res_used += (ulong)delta;

			ASSERT(qtrx->qt_blk_res >= qtrx->qt_blk_res_used);

		}

		qtrx->qt_bcount_delta += delta;

		break;
@@ -423,15 +425,19 @@ xfs_trans_apply_dquot_deltas( 
			 * reservation that a transaction structure knows of.

			 */

			if (qtrx->qt_blk_res != 0) {

				if (qtrx->qt_blk_res != qtrx->qt_blk_res_used) {

					if (qtrx->qt_blk_res >

					    qtrx->qt_blk_res_used)

				ulong blk_res_used = 0;



				if (qtrx->qt_bcount_delta > 0)

					blk_res_used = qtrx->qt_bcount_delta;



				if (qtrx->qt_blk_res != blk_res_used) {

					if (qtrx->qt_blk_res > blk_res_used)

						dqp->q_res_bcount -= (xfs_qcnt_t)

							(qtrx->qt_blk_res -

							 qtrx->qt_blk_res_used);

							 blk_res_used);

					else

						dqp->q_res_bcount -= (xfs_qcnt_t)

							(qtrx->qt_blk_res_used -

							(blk_res_used -

							 qtrx->qt_blk_res);

				}

			} else {