Skip to contentSkip to conversation

ocfs2: Access the xattr bucket only before modifying it.

PATCH New Tao Ma 2 participants 2 messages Jan 8, 2009 – Jan 9, 2009 OCFS2

lore
Share & tools
lore

Tao Ma

author
#0 lore raw

PATCH 1/1 ocfs2: Access the xattr bucket only before modifying it.

Hi Mark,
This is the fix for 2.6.29(introduced by uniting the bucket journal
access). Since I found no fixes-for-2.6.29 in your ocfs2.git, it is based on your original upstream-linus.

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.

---
 fs/ocfs2/xattr.c |   17 ++++++++---------
 1 files changed, 8 insertions(+), 9 deletions(-)
fs/ocfs2/xattr.c +8 -9
index e1d638a..915039f 100644
@@ -4729,13 +4729,6 @@ static int ocfs2_xattr_bucket_value_truncate(struct inode *inode,
 	vb.vb_xv = (struct ocfs2_xattr_value_root *)
 		(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
 	 * 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);
 	if (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);
 
-out_dirty:
 	ocfs2_xattr_bucket_journal_dirty(ctxt->handle, bucket);
 
 out:
Signature · 1 line
1.5.5
#1 lore raw

PATCH 1/1 ocfs2: Access the xattr bucket only before modifying it.

Quoted 4 lines · Tao Ma

Hi Mark,
This is the fix for 2.6.29(introduced by uniting the bucket journal
access). Since I found no fixes-for-2.6.29 in your ocfs2.git, it is based on your original upstream-linus.

Sounds good - it's in ocfs2.git now :)

	--Mark

--
Mark Fasheh