[PATCH] ubifs: avoid kernel error if ubifs superblock read fails

[PATCH] ubifs: avoid kernel error if ubifs superblock read fails

[Steffen Sledz]

* .get_sb is called on mounts with automatic fs detection too, so this
  function should not print an error if it cannot read the superblock
  (new behaviour conforms the other fs types)

Signed-off-by: Steffen Sledz <sledz@dresearch.de>
---
 fs/ubifs/super.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c
index cd5900b..e62bb75 100644
--- a/fs/ubifs/super.c
+++ b/fs/ubifs/super.c
@@ -2049,8 +2049,6 @@ static int ubifs_get_sb(struct file_system_type *fs_type, int flags,
 	 */
 	ubi = open_ubi(name, UBI_READONLY);
 	if (IS_ERR(ubi)) {
-		ubifs_err("cannot open \"%s\", error %d",
-			  name, (int)PTR_ERR(ubi));
 		return PTR_ERR(ubi);
 	}
 	ubi_get_volume_info(ubi, &vi);
-- 
1.7.1

Re: [PATCH] ubifs: avoid kernel error if ubifs superblock read fails

[Artem Bityutskiy]

On Fri, 2010-09-24 at 11:54 +0200, Steffen Sledz wrote:
> * .get_sb is called on mounts with automatic fs detection too, so this
>   function should not print an error if it cannot read the superblock
>   (new behaviour conforms the other fs types)
> 
> Signed-off-by: Steffen Sledz <sledz@dresearch.de>
> ---
>  fs/ubifs/super.c |    2 --
>  1 files changed, 0 insertions(+), 2 deletions(-)
> 
> diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c
> index cd5900b..e62bb75 100644
> --- a/fs/ubifs/super.c
> +++ b/fs/ubifs/super.c
> @@ -2049,8 +2049,6 @@ static int ubifs_get_sb(struct file_system_type *fs_type, int flags,
>  	 */
>  	ubi = open_ubi(name, UBI_READONLY);
>  	if (IS_ERR(ubi)) {
> -		ubifs_err("cannot open \"%s\", error %d",
> -			  name, (int)PTR_ERR(ubi));
>  		return PTR_ERR(ubi);
>  	}
>  	ubi_get_volume_info(ubi, &vi);

Hi, could you please instead turn this message into dbg_err() - in this
case we'll have the message only when debugging is enabled.

Also, please CC:

Artem Bityutskiy <dedekind1@gmail.com>
linux-mtd@lists.infradead.org

Thanks!

-- 
Best Regards,
Artem Bityutskiy (Артём Битюцкий)

[PATCH v2] ubifs: avoid kernel error if ubifs superblock read fails

[Steffen Sledz]

* .get_sb is called on mounts with automatic fs detection too, so this
  function should print an error if it cannot read the superblock in
  debug mode only
  (new behaviour conforms the other fs types)

Signed-off-by: Steffen Sledz <sledz@dresearch.de>
---
 fs/ubifs/super.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c
index 4e5bf3f..bb6ed5d 100644
--- a/fs/ubifs/super.c
+++ b/fs/ubifs/super.c
@@ -2054,8 +2054,8 @@ static int ubifs_get_sb(struct file_system_type *fs_type, int flags,
 	 */
 	ubi = open_ubi(name, UBI_READONLY);
 	if (IS_ERR(ubi)) {
-		ubifs_err("cannot open \"%s\", error %d",
-			  name, (int)PTR_ERR(ubi));
+		dbg_err("cannot open \"%s\", error %d",
+			name, (int)PTR_ERR(ubi));
 		return PTR_ERR(ubi);
 	}
 	ubi_get_volume_info(ubi, &vi);
-- 
1.7.1

Re: [PATCH v2] ubifs: avoid kernel error if ubifs superblock read fails

[Artem Bityutskiy]

On Mon, 2010-09-27 at 14:20 +0200, Steffen Sledz wrote:
> * .get_sb is called on mounts with automatic fs detection too, so this
>   function should print an error if it cannot read the superblock in
>   debug mode only
>   (new behaviour conforms the other fs types)
> 
> Signed-off-by: Steffen Sledz <sledz@dresearch.de>

Pushed to ubifs-2.6.git, thanks!

-- 
Best Regards,
Artem Bityutskiy (Артём Битюцкий)