Merge branch 'linux-2.6' into powerpc-next

1 files changed, 5 insertions, 0 deletions

diff --git a/fs/ext3/xattr.c b/fs/ext3/xattr.c
index d4a4f0e9ff69..175414ac2210 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;