X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=fs%2Fext3%2Fxattr.c;h=175414ac22109ef19bf0cf5841d131000cb7e6d2;hb=eb6d42ea17329745d7d712d3aa3bb84ec1da9c85;hp=d4a4f0e9ff699ae49165ea93ff4b53c162b6a60a;hpb=886c35fbcf6fb2eee15687efc2d64d99b6ad9a4a;p=linux-2.6

diff --git a/fs/ext3/xattr.c b/fs/ext3/xattr.c
index d4a4f0e9ff..175414ac22 100644
--- a/fs/ext3/xattr.c
+++ b/fs/ext3/xattr.c
@@ -1000,6 +1000,11 @@ ext3_xattr_set_handle(handle_t *handle, struct inode *inode, int name_index,
 			i.value = NULL;
 			error = ext3_xattr_block_set(handle, inode, &i, &bs);
 		} else if (error == -ENOSPC) {
+			if (EXT3_I(inode)->i_file_acl && !bs.s.base) {
+				error = ext3_xattr_block_find(inode, &i, &bs);
+				if (error)
+					goto cleanup;
+			}
 			error = ext3_xattr_block_set(handle, inode, &i, &bs);
 			if (error)
 				goto cleanup;