|
@@ -1864,7 +1864,7 @@ static int ext4_add_entry(handle_t *handle, struct dentry *dentry,
|
|
struct inode *inode)
|
|
struct inode *inode)
|
|
{
|
|
{
|
|
struct inode *dir = dentry->d_parent->d_inode;
|
|
struct inode *dir = dentry->d_parent->d_inode;
|
|
- struct buffer_head *bh;
|
|
|
|
|
|
+ struct buffer_head *bh = NULL;
|
|
struct ext4_dir_entry_2 *de;
|
|
struct ext4_dir_entry_2 *de;
|
|
struct ext4_dir_entry_tail *t;
|
|
struct ext4_dir_entry_tail *t;
|
|
struct super_block *sb;
|
|
struct super_block *sb;
|
|
@@ -1888,14 +1888,14 @@ static int ext4_add_entry(handle_t *handle, struct dentry *dentry,
|
|
return retval;
|
|
return retval;
|
|
if (retval == 1) {
|
|
if (retval == 1) {
|
|
retval = 0;
|
|
retval = 0;
|
|
- return retval;
|
|
|
|
|
|
+ goto out;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
if (is_dx(dir)) {
|
|
if (is_dx(dir)) {
|
|
retval = ext4_dx_add_entry(handle, dentry, inode);
|
|
retval = ext4_dx_add_entry(handle, dentry, inode);
|
|
if (!retval || (retval != ERR_BAD_DX_DIR))
|
|
if (!retval || (retval != ERR_BAD_DX_DIR))
|
|
- return retval;
|
|
|
|
|
|
+ goto out;
|
|
ext4_clear_inode_flag(dir, EXT4_INODE_INDEX);
|
|
ext4_clear_inode_flag(dir, EXT4_INODE_INDEX);
|
|
dx_fallback++;
|
|
dx_fallback++;
|
|
ext4_mark_inode_dirty(handle, dir);
|
|
ext4_mark_inode_dirty(handle, dir);
|
|
@@ -1907,14 +1907,15 @@ static int ext4_add_entry(handle_t *handle, struct dentry *dentry,
|
|
return PTR_ERR(bh);
|
|
return PTR_ERR(bh);
|
|
|
|
|
|
retval = add_dirent_to_buf(handle, dentry, inode, NULL, bh);
|
|
retval = add_dirent_to_buf(handle, dentry, inode, NULL, bh);
|
|
- if (retval != -ENOSPC) {
|
|
|
|
- brelse(bh);
|
|
|
|
- return retval;
|
|
|
|
- }
|
|
|
|
|
|
+ if (retval != -ENOSPC)
|
|
|
|
+ goto out;
|
|
|
|
|
|
if (blocks == 1 && !dx_fallback &&
|
|
if (blocks == 1 && !dx_fallback &&
|
|
- EXT4_HAS_COMPAT_FEATURE(sb, EXT4_FEATURE_COMPAT_DIR_INDEX))
|
|
|
|
- return make_indexed_dir(handle, dentry, inode, bh);
|
|
|
|
|
|
+ EXT4_HAS_COMPAT_FEATURE(sb, EXT4_FEATURE_COMPAT_DIR_INDEX)) {
|
|
|
|
+ retval = make_indexed_dir(handle, dentry, inode, bh);
|
|
|
|
+ bh = NULL; /* make_indexed_dir releases bh */
|
|
|
|
+ goto out;
|
|
|
|
+ }
|
|
brelse(bh);
|
|
brelse(bh);
|
|
}
|
|
}
|
|
bh = ext4_append(handle, dir, &block);
|
|
bh = ext4_append(handle, dir, &block);
|
|
@@ -1930,6 +1931,7 @@ static int ext4_add_entry(handle_t *handle, struct dentry *dentry,
|
|
}
|
|
}
|
|
|
|
|
|
retval = add_dirent_to_buf(handle, dentry, inode, de, bh);
|
|
retval = add_dirent_to_buf(handle, dentry, inode, de, bh);
|
|
|
|
+out:
|
|
brelse(bh);
|
|
brelse(bh);
|
|
if (retval == 0)
|
|
if (retval == 0)
|
|
ext4_set_inode_state(inode, EXT4_STATE_NEWENTRY);
|
|
ext4_set_inode_state(inode, EXT4_STATE_NEWENTRY);
|