public inbox for linux-btrfs@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH 12/27] BKL: Remove BKL from btrfs
       [not found] <1257156307-24175-1-git-send-email-jblunck@suse.de>
@ 2009-11-02 10:04 ` Jan Blunck
  2009-11-02 12:13   ` Chris Mason
  0 siblings, 1 reply; 2+ messages in thread
From: Jan Blunck @ 2009-11-02 10:04 UTC (permalink / raw)
  To: linux-fsdevel
  Cc: Matthew Wilcox, linux-kernel, Jan Blunck, Chris Mason,
	Christoph Hellwig, Yan Zheng, Al Viro, Sage Weil, linux-btrfs

BKL is only used in get_sb. It is safe to remove it.

Signed-off-by: Jan Blunck <jblunck@suse.de>
---
 fs/btrfs/super.c |    8 +-------
 1 files changed, 1 insertions(+), 7 deletions(-)

diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
index e5cd2cf..752a546 100644
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -480,17 +480,13 @@ static int btrfs_get_sb(struct file_system_type *fs_type, int flags,
 	fmode_t mode = FMODE_READ;
 	int error = 0;
 
-	lock_kernel();
-
 	if (!(flags & MS_RDONLY))
 		mode |= FMODE_WRITE;
 
 	error = btrfs_parse_early_options(data, mode, fs_type,
 					  &subvol_name, &fs_devices);
-	if (error) {
-		unlock_kernel();
+	if (error)
 		return error;
-	}
 
 	error = btrfs_scan_one_device(dev_name, mode, fs_type, &fs_devices);
 	if (error)
@@ -559,7 +555,6 @@ static int btrfs_get_sb(struct file_system_type *fs_type, int flags,
 	mnt->mnt_root = root;
 
 	kfree(subvol_name);
-	unlock_kernel();
 	return 0;
 
 error_s:
@@ -568,7 +563,6 @@ error_close_devices:
 	btrfs_close_devices(fs_devices);
 error_free_subvol_name:
 	kfree(subvol_name);
-	unlock_kernel();
 	return error;
 }
 
-- 
1.6.4.2


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH 12/27] BKL: Remove BKL from btrfs
  2009-11-02 10:04 ` [PATCH 12/27] BKL: Remove BKL from btrfs Jan Blunck
@ 2009-11-02 12:13   ` Chris Mason
  0 siblings, 0 replies; 2+ messages in thread
From: Chris Mason @ 2009-11-02 12:13 UTC (permalink / raw)
  To: Jan Blunck
  Cc: linux-fsdevel, Matthew Wilcox, linux-kernel, Christoph Hellwig,
	Yan Zheng, Al Viro, Sage Weil, linux-btrfs

On Mon, Nov 02, 2009 at 11:04:52AM +0100, Jan Blunck wrote:
> BKL is only used in get_sb. It is safe to remove it.
> 
> Signed-off-by: Jan Blunck <jblunck@suse.de>

Acked-by: Chris Mason <chris.mason@oracle.com>

Thanks!

-chris

> ---
>  fs/btrfs/super.c |    8 +-------
>  1 files changed, 1 insertions(+), 7 deletions(-)
> 
> diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
> index e5cd2cf..752a546 100644
> --- a/fs/btrfs/super.c
> +++ b/fs/btrfs/super.c
> @@ -480,17 +480,13 @@ static int btrfs_get_sb(struct file_system_type *fs_type, int flags,
>  	fmode_t mode = FMODE_READ;
>  	int error = 0;
>  
> -	lock_kernel();
> -
>  	if (!(flags & MS_RDONLY))
>  		mode |= FMODE_WRITE;
>  
>  	error = btrfs_parse_early_options(data, mode, fs_type,
>  					  &subvol_name, &fs_devices);
> -	if (error) {
> -		unlock_kernel();
> +	if (error)
>  		return error;
> -	}
>  
>  	error = btrfs_scan_one_device(dev_name, mode, fs_type, &fs_devices);
>  	if (error)
> @@ -559,7 +555,6 @@ static int btrfs_get_sb(struct file_system_type *fs_type, int flags,
>  	mnt->mnt_root = root;
>  
>  	kfree(subvol_name);
> -	unlock_kernel();
>  	return 0;
>  
>  error_s:
> @@ -568,7 +563,6 @@ error_close_devices:
>  	btrfs_close_devices(fs_devices);
>  error_free_subvol_name:
>  	kfree(subvol_name);
> -	unlock_kernel();
>  	return error;
>  }
>  
> -- 
> 1.6.4.2
> 

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2009-11-02 12:13 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
     [not found] <1257156307-24175-1-git-send-email-jblunck@suse.de>
2009-11-02 10:04 ` [PATCH 12/27] BKL: Remove BKL from btrfs Jan Blunck
2009-11-02 12:13   ` Chris Mason

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox