|
@@ -184,19 +184,22 @@ setversion_out:
|
|
|
if (err)
|
|
|
return err;
|
|
|
|
|
|
- if (get_user(n_blocks_count, (__u32 __user *)arg))
|
|
|
- return -EFAULT;
|
|
|
+ if (get_user(n_blocks_count, (__u32 __user *)arg)) {
|
|
|
+ err = -EFAULT;
|
|
|
+ goto group_extend_out;
|
|
|
+ }
|
|
|
|
|
|
if (EXT4_HAS_RO_COMPAT_FEATURE(sb,
|
|
|
EXT4_FEATURE_RO_COMPAT_BIGALLOC)) {
|
|
|
ext4_msg(sb, KERN_ERR,
|
|
|
"Online resizing not supported with bigalloc");
|
|
|
- return -EOPNOTSUPP;
|
|
|
+ err = -EOPNOTSUPP;
|
|
|
+ goto group_extend_out;
|
|
|
}
|
|
|
|
|
|
err = mnt_want_write(filp->f_path.mnt);
|
|
|
if (err)
|
|
|
- return err;
|
|
|
+ goto group_extend_out;
|
|
|
|
|
|
err = ext4_group_extend(sb, EXT4_SB(sb)->s_es, n_blocks_count);
|
|
|
if (EXT4_SB(sb)->s_journal) {
|
|
@@ -206,9 +209,10 @@ setversion_out:
|
|
|
}
|
|
|
if (err == 0)
|
|
|
err = err2;
|
|
|
+
|
|
|
mnt_drop_write(filp->f_path.mnt);
|
|
|
+group_extend_out:
|
|
|
ext4_resize_end(sb);
|
|
|
-
|
|
|
return err;
|
|
|
}
|
|
|
|
|
@@ -267,19 +271,22 @@ mext_out:
|
|
|
return err;
|
|
|
|
|
|
if (copy_from_user(&input, (struct ext4_new_group_input __user *)arg,
|
|
|
- sizeof(input)))
|
|
|
- return -EFAULT;
|
|
|
+ sizeof(input))) {
|
|
|
+ err = -EFAULT;
|
|
|
+ goto group_add_out;
|
|
|
+ }
|
|
|
|
|
|
if (EXT4_HAS_RO_COMPAT_FEATURE(sb,
|
|
|
EXT4_FEATURE_RO_COMPAT_BIGALLOC)) {
|
|
|
ext4_msg(sb, KERN_ERR,
|
|
|
"Online resizing not supported with bigalloc");
|
|
|
- return -EOPNOTSUPP;
|
|
|
+ err = -EOPNOTSUPP;
|
|
|
+ goto group_add_out;
|
|
|
}
|
|
|
|
|
|
err = mnt_want_write(filp->f_path.mnt);
|
|
|
if (err)
|
|
|
- return err;
|
|
|
+ goto group_add_out;
|
|
|
|
|
|
err = ext4_group_add(sb, &input);
|
|
|
if (EXT4_SB(sb)->s_journal) {
|
|
@@ -289,9 +296,10 @@ mext_out:
|
|
|
}
|
|
|
if (err == 0)
|
|
|
err = err2;
|
|
|
+
|
|
|
mnt_drop_write(filp->f_path.mnt);
|
|
|
+group_add_out:
|
|
|
ext4_resize_end(sb);
|
|
|
-
|
|
|
return err;
|
|
|
}
|
|
|
|