ath9k: DFS radar use correct width enum

[firefly-linux-kernel-4.4.55.git] / fs / ext4 / namei.c

diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c
index 35f55a0dbc4b0bb044571a647a8d1982e9533c4b..5a0408d7b1147094c3e82b6d11750b33396b7732 100644 (file)
--- a/fs/ext4/namei.c
+++ b/fs/ext4/namei.c
@@ -2319,7 +2319,7 @@ retry:
                d_tmpfile(dentry, inode);
                err = ext4_orphan_add(handle, inode);
                if (err)
-                       goto err_drop_inode;
+                       goto err_unlock_inode;
                mark_inode_dirty(inode);
                unlock_new_inode(inode);
        }
@@ -2328,10 +2328,9 @@ retry:
        if (err == -ENOSPC && ext4_should_retry_alloc(dir->i_sb, &retries))
                goto retry;
        return err;
-err_drop_inode:
+err_unlock_inode:
        ext4_journal_stop(handle);
        unlock_new_inode(inode);
-       iput(inode);
        return err;
 }
 
@@ -3005,15 +3004,19 @@ static struct buffer_head *ext4_get_first_dir_block(handle_t *handle,
 /*
  * Anybody can rename anything with this: the permission checks are left to the
  * higher-level routines.
+ *
+ * n.b.  old_{dentry,inode) refers to the source dentry/inode
+ * while new_{dentry,inode) refers to the destination dentry/inode
+ * This comes from rename(const char *oldpath, const char *newpath)
  */
 static int ext4_rename(struct inode *old_dir, struct dentry *old_dentry,
                       struct inode *new_dir, struct dentry *new_dentry)
 {
-       handle_t *handle;
+       handle_t *handle = NULL;
        struct inode *old_inode, *new_inode;
        struct buffer_head *old_bh, *new_bh, *dir_bh;
        struct ext4_dir_entry_2 *old_de, *new_de;
-       int retval, force_da_alloc = 0;
+       int retval;
        int inlined = 0, new_inlined = 0;
        struct ext4_dir_entry_2 *parent_de;
 
@@ -3026,14 +3029,6 @@ static int ext4_rename(struct inode *old_dir, struct dentry *old_dentry,
         * in separate transaction */
        if (new_dentry->d_inode)
                dquot_initialize(new_dentry->d_inode);
-       handle = ext4_journal_start(old_dir, EXT4_HT_DIR,
-               (2 * EXT4_DATA_TRANS_BLOCKS(old_dir->i_sb) +
-                EXT4_INDEX_EXTRA_TRANS_BLOCKS + 2));
-       if (IS_ERR(handle))
-               return PTR_ERR(handle);
-
-       if (IS_DIRSYNC(old_dir) || IS_DIRSYNC(new_dir))
-               ext4_handle_sync(handle);
 
        old_bh = ext4_find_entry(old_dir, &old_dentry->d_name, &old_de, NULL);
        /*
@@ -3056,6 +3051,18 @@ static int ext4_rename(struct inode *old_dir, struct dentry *old_dentry,
                        new_bh = NULL;
                }
        }
+       if (new_inode && !test_opt(new_dir->i_sb, NO_AUTO_DA_ALLOC))
+               ext4_alloc_da_blocks(old_inode);
+
+       handle = ext4_journal_start(old_dir, EXT4_HT_DIR,
+               (2 * EXT4_DATA_TRANS_BLOCKS(old_dir->i_sb) +
+                EXT4_INDEX_EXTRA_TRANS_BLOCKS + 2));
+       if (IS_ERR(handle))
+               return PTR_ERR(handle);
+
+       if (IS_DIRSYNC(old_dir) || IS_DIRSYNC(new_dir))
+               ext4_handle_sync(handle);
+
        if (S_ISDIR(old_inode->i_mode)) {
                if (new_inode) {
                        retval = -ENOTEMPTY;
@@ -3186,8 +3193,6 @@ static int ext4_rename(struct inode *old_dir, struct dentry *old_dentry,
                ext4_mark_inode_dirty(handle, new_inode);
                if (!new_inode->i_nlink)
                        ext4_orphan_add(handle, new_inode);
-               if (!test_opt(new_dir->i_sb, NO_AUTO_DA_ALLOC))
-                       force_da_alloc = 1;
        }
        retval = 0;
 
@@ -3195,9 +3200,8 @@ end_rename:
        brelse(dir_bh);
        brelse(old_bh);
        brelse(new_bh);
-       ext4_journal_stop(handle);
-       if (retval == 0 && force_da_alloc)
-               ext4_alloc_da_blocks(old_inode);
+       if (handle)
+               ext4_journal_stop(handle);
        return retval;
 }