Patchwork [v2] ext3: fix message in ext3_remount for rw-remount case

login
register
mail settings
Submitter Toshiyuki Okajima
Date Aug. 2, 2011, 9:16 a.m.
Message ID <20110802181657.d758bd44.toshi.okajima@jp.fujitsu.com>
Download mbox | patch
Permalink /patch/107865/
State New
Headers show

Comments

Toshiyuki Okajima - Aug. 2, 2011, 9:16 a.m.
If there are some inodes in orphan list while a filesystem is being 
read-only mounted, we should recommend that pepole umount and then
mount it when they try to remount with read-write. But the current
message and comment recommend that they umount and then remount it.

ext3_remount:
	/*
	 * If we have an unprocessed orphan list hanging
	 * around from a previously readonly bdev mount,
	 * require a full umount/remount for now.
                          ^^^^^^^^^^^^^^
	 */
	if (es->s_last_orphan) {
		printk(KERN_WARNING "EXT3-fs: %s: couldn't "
			"remount RDWR because of unprocessed "
			"orphan inode list.  Please "
			"umount/remount instead.\n",
                         ^^^^^^^^^^^^^^
			sb->s_id);

Signed-off-by: Toshiyuki Okajima <toshi.okajima@jp.fujitsu.com>
---
 fs/ext3/super.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
Jan Kara - Aug. 2, 2011, 11:40 a.m.
On Tue 02-08-11 18:16:57, Toshiyuki Okajima wrote:
> If there are some inodes in orphan list while a filesystem is being 
> read-only mounted, we should recommend that pepole umount and then
> mount it when they try to remount with read-write. But the current
> message and comment recommend that they umount and then remount it.
> 
> ext3_remount:
> 	/*
> 	 * If we have an unprocessed orphan list hanging
> 	 * around from a previously readonly bdev mount,
> 	 * require a full umount/remount for now.
>                           ^^^^^^^^^^^^^^
> 	 */
> 	if (es->s_last_orphan) {
> 		printk(KERN_WARNING "EXT3-fs: %s: couldn't "
> 			"remount RDWR because of unprocessed "
> 			"orphan inode list.  Please "
> 			"umount/remount instead.\n",
>                          ^^^^^^^^^^^^^^
> 			sb->s_id);
> 
  Thanks. I've merged the patch. I only made the log shorther (no need to
repeat where the message is fixed in the changelog when it's obvious from
the diff).

								Honza

> Signed-off-by: Toshiyuki Okajima <toshi.okajima@jp.fujitsu.com>
> ---
>  fs/ext3/super.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/fs/ext3/super.c b/fs/ext3/super.c
> index 7beb69a..2043bcc 100644
> --- a/fs/ext3/super.c
> +++ b/fs/ext3/super.c
> @@ -2669,13 +2669,13 @@ static int ext3_remount (struct super_block * sb, int * flags, char * data)
>  			/*
>  			 * If we have an unprocessed orphan list hanging
>  			 * around from a previously readonly bdev mount,
> -			 * require a full umount/remount for now.
> +			 * require a full umount & mount for now.
>  			 */
>  			if (es->s_last_orphan) {
>  				ext3_msg(sb, KERN_WARNING, "warning: couldn't "
>  				       "remount RDWR because of unprocessed "
>  				       "orphan inode list.  Please "
> -				       "umount/remount instead.");
> +				       "umount & mount instead.");
>  				err = -EINVAL;
>  				goto restore_opts;
>  			}
> -- 
> 1.5.5.6

Patch

diff --git a/fs/ext3/super.c b/fs/ext3/super.c
index 7beb69a..2043bcc 100644
--- a/fs/ext3/super.c
+++ b/fs/ext3/super.c
@@ -2669,13 +2669,13 @@  static int ext3_remount (struct super_block * sb, int * flags, char * data)
 			/*
 			 * If we have an unprocessed orphan list hanging
 			 * around from a previously readonly bdev mount,
-			 * require a full umount/remount for now.
+			 * require a full umount & mount for now.
 			 */
 			if (es->s_last_orphan) {
 				ext3_msg(sb, KERN_WARNING, "warning: couldn't "
 				       "remount RDWR because of unprocessed "
 				       "orphan inode list.  Please "
-				       "umount/remount instead.");
+				       "umount & mount instead.");
 				err = -EINVAL;
 				goto restore_opts;
 			}