1 files changed, 15 insertions, 12 deletions

diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c
index e7e1d79a7d75..4ec57be5baf5 100644
--- a/fs/ext4/namei.c
+++ b/fs/ext4/namei.c
@@ -36,7 +36,6 @@
 #include <linux/quotaops.h>
 #include <linux/buffer_head.h>
 #include <linux/bio.h>
-#include <linux/smp_lock.h>
 
 #include "namei.h"
 #include "xattr.h"
@@ -967,6 +966,7 @@ static struct buffer_head * ext4_dx_find_entry(struct dentry *dentry,
                                   (block<<EXT4_BLOCK_SIZE_BITS(sb))
                                           +((char *)de - bh->b_data))) {
                                 brelse (bh);
+                                *err = ERR_BAD_DX_DIR;
                                 goto errout;
                         }
                         *res_dir = de;
@@ -1132,9 +1132,9 @@ static struct ext4_dir_entry_2 *do_split(handle_t *handle, struct inode *dir,
         char *data1 = (*bh)->b_data, *data2;
         unsigned split;
         struct ext4_dir_entry_2 *de = NULL, *de2;
-        int     err;
+        int     err = 0;
 
-        bh2 = ext4_append (handle, dir, &newblock, error);
+        bh2 = ext4_append (handle, dir, &newblock, &err);
         if (!(bh2)) {
                 brelse(*bh);
                 *bh = NULL;
@@ -1143,14 +1143,9 @@ static struct ext4_dir_entry_2 *do_split(handle_t *handle, struct inode *dir,
 
         BUFFER_TRACE(*bh, "get_write_access");
         err = ext4_journal_get_write_access(handle, *bh);
-        if (err) {
-        journal_error:
-                brelse(*bh);
-                brelse(bh2);
-                *bh = NULL;
-                ext4_std_error(dir->i_sb, err);
-                goto errout;
-        }
+        if (err)
+                goto journal_error;
+
         BUFFER_TRACE(frame->bh, "get_write_access");
         err = ext4_journal_get_write_access(handle, frame->bh);
         if (err)
@@ -1193,8 +1188,16 @@ static struct ext4_dir_entry_2 *do_split(handle_t *handle, struct inode *dir,
                 goto journal_error;
         brelse (bh2);
         dxtrace(dx_show_index ("frame", frame->entries));
-errout:
         return de;
+
+journal_error:
+        brelse(*bh);
+        brelse(bh2);
+        *bh = NULL;
+        ext4_std_error(dir->i_sb, err);
+errout:
+        *error = err;
+        return NULL;
 }
 #endif