Merge git://oss.sgi.com:8090/oss/git/xfs-rc-fixes (d4f0f122) · Commits · e / devices / android_kernel_fairphone_FP3

fs/xfs/linux-2.6/xfs_aops.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -540,7 +540,7 @@ xfs_probe_cluster(

		/* First sum forwards in this page */
		do {
		if (mapped != buffer_mapped(bh))
		if (!buffer_uptodate(bh) \|\| (mapped != buffer_mapped(bh)))
		return total;
		total += bh->b_size;
		} while ((bh = bh->b_this_page) != head);

fs/xfs/quota/xfs_qm.c

+5 −6

Original line number	Diff line number	Diff line
		@@ -68,6 +68,9 @@ kmem_zone_t *qm_dqzone;
		kmem_zone_t *qm_dqtrxzone;
		STATIC kmem_shaker_t xfs_qm_shaker;

		STATIC cred_t xfs_zerocr;
		STATIC xfs_inode_t xfs_zeroino;

		STATIC void xfs_qm_list_init(xfs_dqlist_t , char , int);
		STATIC void xfs_qm_list_destroy(xfs_dqlist_t *);

		@@ -1393,8 +1396,6 @@ xfs_qm_qino_alloc(
		xfs_trans_t *tp;
		int error;
		unsigned long s;
		cred_t zerocr;
		xfs_inode_t zeroino;
		int committed;

		tp = xfs_trans_alloc(mp, XFS_TRANS_QM_QINOCREATE);
		@@ -1406,11 +1407,9 @@ xfs_qm_qino_alloc(
		xfs_trans_cancel(tp, 0);
		return error;
		}
		memset(&zerocr, 0, sizeof(zerocr));
		memset(&zeroino, 0, sizeof(zeroino));

		if ((error = xfs_dir_ialloc(&tp, &zeroino, S_IFREG, 1, 0,
		&zerocr, 0, 1, ip, &committed))) {
		if ((error = xfs_dir_ialloc(&tp, &xfs_zeroino, S_IFREG, 1, 0,
		&xfs_zerocr, 0, 1, ip, &committed))) {
		xfs_trans_cancel(tp, XFS_TRANS_RELEASE_LOG_RES \|
		XFS_TRANS_ABORT);
		return error;

fs/xfs/xfs_rtalloc.c

+14 −15

Original line number	Diff line number	Diff line
		@@ -130,7 +130,8 @@ xfs_growfs_rt_alloc(
		/*
		* Lock the inode.
		*/
		if ((error = xfs_trans_iget(mp, tp, ino, 0, XFS_ILOCK_EXCL, &ip)))
		if ((error = xfs_trans_iget(mp, tp, ino, 0,
		XFS_ILOCK_EXCL, &ip)))
		goto error_exit;
		XFS_BMAP_INIT(&flist, &firstblock);
		/*
		@@ -170,8 +171,8 @@ xfs_growfs_rt_alloc(
		/*
		* Lock the bitmap inode.
		*/
		if ((error = xfs_trans_iget(mp, tp, ino, 0, XFS_ILOCK_EXCL,
		&ip)))
		if ((error = xfs_trans_iget(mp, tp, ino, 0,
		XFS_ILOCK_EXCL, &ip)))
		goto error_exit;
		/*
		* Get a buffer for the block.
		@@ -2023,7 +2024,7 @@ xfs_growfs_rt(
		/*
		* Lock out other callers by grabbing the bitmap inode lock.
		*/
		if ((error = xfs_trans_iget(mp, tp, 0, mp->m_sb.sb_rbmino,
		if ((error = xfs_trans_iget(mp, tp, mp->m_sb.sb_rbmino, 0,
		XFS_ILOCK_EXCL, &ip)))
		goto error_exit;
		ASSERT(ip == mp->m_rbmip);
		@@ -2037,8 +2038,8 @@ xfs_growfs_rt(
		/*
		* Get the summary inode into the transaction.
		*/
		if ((error = xfs_trans_iget(mp, tp, mp->m_sb.sb_rsumino,
		0, XFS_ILOCK_EXCL, &ip)))
		if ((error = xfs_trans_iget(mp, tp, mp->m_sb.sb_rsumino, 0,
		XFS_ILOCK_EXCL, &ip)))
		goto error_exit;
		ASSERT(ip == mp->m_rsumip);
		/*
		@@ -2158,10 +2159,9 @@ xfs_rtallocate_extent(
		/*
		* Lock out other callers by grabbing the bitmap inode lock.
		*/
		error = xfs_trans_iget(mp, tp, mp->m_sb.sb_rbmino, 0, XFS_ILOCK_EXCL, &ip);
		if (error) {
		if ((error = xfs_trans_iget(mp, tp, mp->m_sb.sb_rbmino, 0,
		XFS_ILOCK_EXCL, &ip)))
		return error;
		}
		sumbp = NULL;
		/*
		* Allocate by size, or near another block, or exactly at some block.
		@@ -2221,10 +2221,9 @@ xfs_rtfree_extent(
		/*
		* Synchronize by locking the bitmap inode.
		*/
		error = xfs_trans_iget(mp, tp, mp->m_sb.sb_rbmino, 0, XFS_ILOCK_EXCL, &ip);
		if (error) {
		if ((error = xfs_trans_iget(mp, tp, mp->m_sb.sb_rbmino, 0,
		XFS_ILOCK_EXCL, &ip)))
		return error;
		}
		#if defined(__KERNEL__) && defined(DEBUG)
		/*
		* Check to see that this whole range is currently allocated.
		@@ -2365,8 +2364,8 @@ xfs_rtpick_extent(
		__uint64_t seq; /* sequence number of file creation */
		__uint64_t seqp; / pointer to seqno in inode */

		error = xfs_trans_iget(mp, tp, mp->m_sb.sb_rbmino, 0, XFS_ILOCK_EXCL, &ip);
		if (error)
		if ((error = xfs_trans_iget(mp, tp, mp->m_sb.sb_rbmino, 0,
		XFS_ILOCK_EXCL, &ip)))
		return error;
		ASSERT(ip == mp->m_rbmip);
		seqp = (__uint64_t *)&ip->i_d.di_atime;