Commit 554e7f9e authored by Tao Ma's avatar Tao Ma Committed by Mark Fasheh
Browse files

ocfs2: Access the xattr bucket only before modifying it. 



In ocfs2_xattr_value_truncate, we may call b-tree codes which will
extend the journal transaction. It has a potential problem that it
may let the already-accessed-but-not-dirtied buffers gone. So we'd
better access the bucket after we call ocfs2_xattr_value_truncate.
And as for the root buffer for the xattr value, b-tree code will
acess and dirty it, so we don't need to worry about it.

Signed-off-by: default avatarTao Ma <tao.ma@oracle.com>
Signed-off-by: default avatarMark Fasheh <mfasheh@suse.com>
parent 0e033342

fs/ocfs2/xattr.c

+8 −9
Original line number Original line Diff line number Diff line
@@ -4729,13 +4729,6 @@ static int ocfs2_xattr_bucket_value_truncate(struct inode *inode, 
	vb.vb_xv = (struct ocfs2_xattr_value_root *)

	vb.vb_xv = (struct ocfs2_xattr_value_root *)

		(vb.vb_bh->b_data + offset % blocksize);

		(vb.vb_bh->b_data + offset % blocksize);





	ret = ocfs2_xattr_bucket_journal_access(ctxt->handle, bucket,

						OCFS2_JOURNAL_ACCESS_WRITE);

	if (ret) {

		mlog_errno(ret);

		goto out;

	}



	/*

	/*

	 * From here on out we have to dirty the bucket.  The generic

	 * From here on out we have to dirty the bucket.  The generic

	 * value calls only modify one of the bucket's bhs, but we need

	 * value calls only modify one of the bucket's bhs, but we need
@@ -4748,12 +4741,18 @@ static int ocfs2_xattr_bucket_value_truncate(struct inode *inode, 
	ret = ocfs2_xattr_value_truncate(inode, &vb, len, ctxt);

	ret = ocfs2_xattr_value_truncate(inode, &vb, len, ctxt);

	if (ret) {

	if (ret) {

		mlog_errno(ret);

		mlog_errno(ret);

		goto out_dirty;

		goto out;

	}



	ret = ocfs2_xattr_bucket_journal_access(ctxt->handle, bucket,

						OCFS2_JOURNAL_ACCESS_WRITE);

	if (ret) {

		mlog_errno(ret);

		goto out;

	}

	}





	xe->xe_value_size = cpu_to_le64(len);

	xe->xe_value_size = cpu_to_le64(len);





out_dirty:

	ocfs2_xattr_bucket_journal_dirty(ctxt->handle, bucket);

	ocfs2_xattr_bucket_journal_dirty(ctxt->handle, bucket);





out:

out:

CRA Git | Maintained and supported by SUSTech CRA and CCSE