fs/ext4: add missing ext4_resize_end

PATCH Applied Djalal Harouni 3 participants 4 messages Dec 22, 2011 – Jan 5, 2012

Subsystems (2)

Stable branch ext4 file system

lore

Share & tools

lore

Djalal Harouni

author

2011-12-22 14:58 UTC #0 lore raw

PATCH 1/1 fs/ext4: add missing ext4_resize_end

Online resize ioctls 'EXT4_IOC_GROUP_EXTEND' and 'EXT4_IOC_GROUP_ADD' call ext4_resize_begin() to check permissions and to set the EXT4_RESIZING bit lock, they do their work and they must finish with ext4_resize_end() which calls clear_bit_unlock() to unlock and to avoid -EBUSY errors for the next resize operations.

This patch adds the missing ext4_resize_end() calls on error paths.

Patch tested.

Cc [email protected]

Signed-off-by Djalal Harouni <[email protected]>

---
 fs/ext4/ioctl.c |   28 ++++++++++++++++++----------
 1 files changed, 18 insertions(+), 10 deletions(-)

fs/ext4/ioctl.c +18 ~~-10~~

index a567968..ab25f57 100644
@@ -182,19 +182,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) {

@@ -204,9 +207,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;
 	}

Signature · 1 line

1.7.1

Yongqiang Yang

2011-12-23 01:14 UTC #1 lore raw

Thanks.

The patch looks good. I have to update the new resize patch too.

Yongqiang.

Quoted 105 lines · Djalal Harouni

This patch adds the missing ext4_resize_end() calls on error paths.

Patch tested.

Cc [email protected]

Signed-off-by Djalal Harouni <[email protected]>

---
ï¿½fs/ext4/ioctl.c | ï¿½ 28 ++++++++++++++++++---------- ï¿½1 files changed, 18 insertions(+), 10 deletions(-)

fs/ext4/ioctl.c +18 ~~-11~~

index a567968..ab25f57 100644
@@ -182,19 +182,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) {

@@ -204,9 +207,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;
 ï¿½ ï¿½ ï¿½ ï¿½}
 
--

1.7.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
More majordomo info at ï¿½http://vger.kernel.org/majordomo-info.html Please read the FAQ at ï¿½http://www.tux.org/lkml/

Signature · 2 lines

Best Wishes
Yongqiang Yang

Djalal Harouni

author

2012-01-03 10:44 UTC #2 lore raw

Quoted 14 lines · Yongqiang Yang

Thanks.
The patch looks good. I have to update the new resize patch too.
Yongqiang.
Quoted 7 lines · Djalal Harouni
Online resize ioctls 'EXT4_IOC_GROUP_EXTEND' and 'EXT4_IOC_GROUP_ADD' call ext4_resize_begin() to check permissions and to set the EXT4_RESIZING bit lock, they do their work and they must finish with ext4_resize_end() which calls clear_bit_unlock() to unlock and to avoid -EBUSY errors for the next resize operations.
This patch adds the missing ext4_resize_end() calls on error paths.

Any news on this one ?

If we call EXT4_IOC_GROUP_EXTEND ioctl and get_user() fails with -EFAULT then any new call will return -EBUSY, unless we unmount/mount the fs.

In rare situations this can lead to a corrupt filesystem, I've experienced this, but I'm not sure what I did. fsck fix it.

Thanks.

Signature · 2 lines

tixxdz
http://opendz.org

Ted Ts'o

maintainer Applied

2012-01-05 02:23 UTC #3 lore raw

In reply to Djalal Harouni

Quoted 6 lines · Djalal Harouni

Online resize ioctls 'EXT4_IOC_GROUP_EXTEND' and 'EXT4_IOC_GROUP_ADD' call ext4_resize_begin() to check permissions and to set the EXT4_RESIZING bit lock, they do their work and they must finish with ext4_resize_end() which calls clear_bit_unlock() to unlock and to avoid -EBUSY errors for the next resize operations.

Quoted 6 lines

This patch adds the missing ext4_resize_end() calls on error paths.
Patch tested.
Cc [email protected]
Signed-off-by Djalal Harouni <[email protected]>

Applied, thanks.

- Ted