Re: [PATCH 2/2] btrfS: collapse btrfs_handle_error() into __btrfs_handle_fs_error()

[David Sterba]

On Thu, Jan 04, 2018 at 02:11:21PM +0200, Nikolay Borisov wrote:
> 
> 
> On  4.01.2018 12:01, Anand Jain wrote:
> > There is no other consumer for btrfs_handle_error() other than
> > __btrfs_handle_fs_error(), further this function quite small.
> > Merge it into its parent.
> > 
> > Signed-off-by: Anand Jain 
> 
> Reviewed-by: Nikolay Borisov 

Both patches added to for-next, thanks.
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 2/2] btrfS: collapse btrfs_handle_error() into __btrfs_handle_fs_error()

[Nikolay Borisov]

On  4.01.2018 12:01, Anand Jain wrote:
> There is no other consumer for btrfs_handle_error() other than
> __btrfs_handle_fs_error(), further this function quite small.
> Merge it into its parent.
> 
> Signed-off-by: Anand Jain 

Reviewed-by: Nikolay Borisov 

> ---
>  fs/btrfs/super.c | 43 +++
>  1 file changed, 19 insertions(+), 24 deletions(-)
> 
> diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
> index 60766f8ca434..0216a5dd0f4b 100644
> --- a/fs/btrfs/super.c
> +++ b/fs/btrfs/super.c
> @@ -105,28 +105,6 @@ const char *btrfs_decode_error(int errno)
>   return errstr;
>  }
>  
> -/* btrfs handle error by forcing the filesystem readonly */
> -static void btrfs_handle_error(struct btrfs_fs_info *fs_info)
> -{
> - struct super_block *sb = fs_info->sb;
> -
> - if (sb_rdonly(sb))
> - return;
> -
> - sb->s_flags |= SB_RDONLY;
> - btrfs_info(fs_info, "forced readonly");
> - /*
> -  * Note that a running device replace operation is not
> -  * canceled here although there is no way to update
> -  * the progress. It would add the risk of a deadlock,
> -  * therefore the canceling is omitted. The only penalty
> -  * is that some I/O remains active until the procedure
> -  * completes. The next time when the filesystem is
> -  * mounted writeable again, the device replace
> -  * operation continues.
> -  */
> -}
> -
>  /*
>   * __btrfs_handle_fs_error decodes expected errors from the caller and
>   * invokes the approciate error response.
> @@ -173,8 +151,25 @@ void __btrfs_handle_fs_error(struct btrfs_fs_info 
> *fs_info, const char *function
>   set_bit(BTRFS_FS_STATE_ERROR, _info->fs_state);
>  
>   /* Don't go through full error handling during mount */
> - if (sb->s_flags & SB_BORN)
> - btrfs_handle_error(fs_info);
> + if (!(sb->s_flags & SB_BORN))
> + return;
> +
> + if (sb_rdonly(sb))
> + return;
> +
> + /* btrfs handle error by forcing the filesystem readonly */
> + sb->s_flags |= SB_RDONLY;
> + btrfs_info(fs_info, "forced readonly");
> + /*
> +  * Note that a running device replace operation is not
> +  * canceled here although there is no way to update
> +  * the progress. It would add the risk of a deadlock,
> +  * therefore the canceling is omitted. The only penalty
> +  * is that some I/O remains active until the procedure
> +  * completes. The next time when the filesystem is
> +  * mounted writeable again, the device replace
> +  * operation continues.
> +  */
>  }
>  
>  #ifdef CONFIG_PRINTK
> 
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH 2/2] btrfS: collapse btrfs_handle_error() into __btrfs_handle_fs_error()

[Anand Jain]

There is no other consumer for btrfs_handle_error() other than
__btrfs_handle_fs_error(), further this function quite small.
Merge it into its parent.

Signed-off-by: Anand Jain 
---
 fs/btrfs/super.c | 43 +++
 1 file changed, 19 insertions(+), 24 deletions(-)

diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
index 60766f8ca434..0216a5dd0f4b 100644
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -105,28 +105,6 @@ const char *btrfs_decode_error(int errno)
return errstr;
 }
 
-/* btrfs handle error by forcing the filesystem readonly */
-static void btrfs_handle_error(struct btrfs_fs_info *fs_info)
-{
-   struct super_block *sb = fs_info->sb;
-
-   if (sb_rdonly(sb))
-   return;
-
-   sb->s_flags |= SB_RDONLY;
-   btrfs_info(fs_info, "forced readonly");
-   /*
-* Note that a running device replace operation is not
-* canceled here although there is no way to update
-* the progress. It would add the risk of a deadlock,
-* therefore the canceling is omitted. The only penalty
-* is that some I/O remains active until the procedure
-* completes. The next time when the filesystem is
-* mounted writeable again, the device replace
-* operation continues.
-*/
-}
-
 /*
  * __btrfs_handle_fs_error decodes expected errors from the caller and
  * invokes the approciate error response.
@@ -173,8 +151,25 @@ void __btrfs_handle_fs_error(struct btrfs_fs_info 
*fs_info, const char *function
set_bit(BTRFS_FS_STATE_ERROR, _info->fs_state);
 
/* Don't go through full error handling during mount */
-   if (sb->s_flags & SB_BORN)
-   btrfs_handle_error(fs_info);
+   if (!(sb->s_flags & SB_BORN))
+   return;
+
+   if (sb_rdonly(sb))
+   return;
+
+   /* btrfs handle error by forcing the filesystem readonly */
+   sb->s_flags |= SB_RDONLY;
+   btrfs_info(fs_info, "forced readonly");
+   /*
+* Note that a running device replace operation is not
+* canceled here although there is no way to update
+* the progress. It would add the risk of a deadlock,
+* therefore the canceling is omitted. The only penalty
+* is that some I/O remains active until the procedure
+* completes. The next time when the filesystem is
+* mounted writeable again, the device replace
+* operation continues.
+*/
 }
 
 #ifdef CONFIG_PRINTK
-- 
2.15.0

--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html