---

yaml --- r: 125815 b: refs/heads/master c: 97aff52 h: refs/heads/master i: 125813: 70b8b62 125811: ad7c666 125807: a41bf68 v: v3
git-mirror · Jan 5, 2009 · 98ac324 · 98ac324
1 parent 652ebe8
commit 98ac324
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 53ef99cad9878f02f27bb30bc304fc42af8bdd6e
+refs/heads/master: 97aff52ae13d3c11a074bbbfc80ad0b59cb8cdeb
diff --git a/trunk/fs/ocfs2/xattr.c b/trunk/fs/ocfs2/xattr.c
@@ -2270,6 +2270,7 @@ static int ocfs2_calc_xattr_set_need(struct inode *inode,
 								 value_size);
 			xv = (struct ocfs2_xattr_value_root *)
 			     (base + name_offset + name_len);
+			value_size = OCFS2_XATTR_ROOT_SIZE;
 		} else
 			xv = &def_xv.xv;
 
@@ -2283,7 +2284,8 @@ static int ocfs2_calc_xattr_set_need(struct inode *inode,
 							     &xv->xr_list,
 							     new_clusters -
 							     old_clusters);
-			goto out;
+			if (value_size >= OCFS2_XATTR_ROOT_SIZE)
+				goto out;
 		}
 	} else {
 		/*