ocfs2: fix panic on kfree(xattr->name)

[karo-tx-linux.git] / fs / ocfs2 / namei.c

diff --git a/fs/ocfs2/namei.c b/fs/ocfs2/namei.c
index e61e4c9a077c26dec34477923e4a6863102f3af1..4a797f22239d9a4e717c205a5a48a1db8300695a 100644 (file)
--- a/fs/ocfs2/namei.c
+++ b/fs/ocfs2/namei.c
@@ -450,7 +450,6 @@ leave:
 
        brelse(new_fe_bh);
        brelse(parent_fe_bh);
-       kfree(si.name);
        kfree(si.value);
 
        ocfs2_free_dir_lookup_result(&lookup);
@@ -580,9 +579,6 @@ static int __ocfs2_mknod_locked(struct inode *dir,
        oi->i_sync_tid = handle->h_transaction->t_tid;
        oi->i_datasync_tid = handle->h_transaction->t_tid;
 
-       status = 0; /* error in ocfs2_create_new_inode_locks is not
-                    * critical */
-
 leave:
        if (status < 0) {
                if (*new_fe_bh) {
@@ -1859,7 +1855,6 @@ bail:
 
        brelse(new_fe_bh);
        brelse(parent_fe_bh);
-       kfree(si.name);
        kfree(si.value);
        ocfs2_free_dir_lookup_result(&lookup);
        if (inode_ac)