Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[linux-2.6-block.git] / fs / ocfs2 / xattr.c

diff --git a/fs/ocfs2/xattr.c b/fs/ocfs2/xattr.c
index 4bbeb90863b76aab5d3a4f84c3110bcbc3e19ba5..d03bfbf3d27d503b3b10bc912f30da9d494c1edb 100644 (file)
--- a/fs/ocfs2/xattr.c
+++ b/fs/ocfs2/xattr.c
@@ -1238,6 +1238,10 @@ static int ocfs2_xattr_block_get(struct inode *inode,
                                                                i,
                                                                &block_off,
                                                                &name_offset);
+                       if (ret) {
+                               mlog_errno(ret);
+                               goto cleanup;
+                       }
                        xs->base = bucket_block(xs->bucket, block_off);
                }
                if (ocfs2_xattr_is_local(xs->here)) {
@@ -5665,6 +5669,10 @@ static int ocfs2_delete_xattr_in_bucket(struct inode *inode,
 
                ret = ocfs2_get_xattr_tree_value_root(inode->i_sb, bucket,
                                                      i, &xv, NULL);
+               if (ret) {
+                       mlog_errno(ret);
+                       break;
+               }
 
                ret = ocfs2_lock_xattr_remove_allocators(inode, xv,
                                                         args->ref_ci,