[PATCH 06/27] BKL: Remove BKL from ext3 fill_super()

View: New views
2 Messages — Rating Filter:   Alert me  

Parent Message unknown [PATCH 06/27] BKL: Remove BKL from ext3 fill_super()

by Jan Blunck-3 :: Rate this Message:

Reply to Author | View Threaded | Show Only this Message

The BKL is protecting nothing than two memory allocations here.

Signed-off-by: Jan Blunck <jblunck@...>
---
 fs/ext3/super.c |   13 +------------
 1 files changed, 1 insertions(+), 12 deletions(-)

diff --git a/fs/ext3/super.c b/fs/ext3/super.c
index 38261a5..4b635b7 100644
--- a/fs/ext3/super.c
+++ b/fs/ext3/super.c
@@ -1568,19 +1568,14 @@ static int ext3_fill_super (struct super_block *sb, void *data, int silent)
  __le32 features;
  int err;
 
- lock_kernel();
-
  sbi = kzalloc(sizeof(*sbi), GFP_KERNEL);
- if (!sbi) {
- unlock_kernel();
+ if (!sbi)
  return -ENOMEM;
- }
 
  sbi->s_blockgroup_lock =
  kzalloc(sizeof(struct blockgroup_lock), GFP_KERNEL);
  if (!sbi->s_blockgroup_lock) {
  kfree(sbi);
- unlock_kernel();
  return -ENOMEM;
  }
  sb->s_fs_info = sbi;
@@ -1589,8 +1584,6 @@ static int ext3_fill_super (struct super_block *sb, void *data, int silent)
  sbi->s_resgid = EXT3_DEF_RESGID;
  sbi->s_sb_block = sb_block;
 
- unlock_kernel();
-
  blocksize = sb_min_blocksize(sb, EXT3_MIN_BLOCK_SIZE);
  if (!blocksize) {
  printk(KERN_ERR "EXT3-fs: unable to set blocksize\n");
@@ -1996,8 +1989,6 @@ static int ext3_fill_super (struct super_block *sb, void *data, int silent)
  test_opt(sb,DATA_FLAGS) == EXT3_MOUNT_ORDERED_DATA ? "ordered":
  "writeback");
 
- lock_kernel();
- unlock_kernel();
  return 0;
 
 cantfind_ext3:
@@ -2027,8 +2018,6 @@ out_fail:
  sb->s_fs_info = NULL;
  kfree(sbi->s_blockgroup_lock);
  kfree(sbi);
- lock_kernel();
- unlock_kernel();
  return ret;
 }
 
--
1.6.4.2

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

Re: [PATCH 06/27] BKL: Remove BKL from ext3 fill_super()

by Jan Kara :: Rate this Message:

Reply to Author | View Threaded | Show Only this Message

On Mon 02-11-09 11:04:46, Jan Blunck wrote:
> The BKL is protecting nothing than two memory allocations here.
  The patch looks good.
Acked-by: Jan Kara <jack@...>
  Should I merge it or will you do it with other patches?

                                                                        Honza

>
> Signed-off-by: Jan Blunck <jblunck@...>
> ---
>  fs/ext3/super.c |   13 +------------
>  1 files changed, 1 insertions(+), 12 deletions(-)
>
> diff --git a/fs/ext3/super.c b/fs/ext3/super.c
> index 38261a5..4b635b7 100644
> --- a/fs/ext3/super.c
> +++ b/fs/ext3/super.c
> @@ -1568,19 +1568,14 @@ static int ext3_fill_super (struct super_block *sb, void *data, int silent)
>   __le32 features;
>   int err;
>  
> - lock_kernel();
> -
>   sbi = kzalloc(sizeof(*sbi), GFP_KERNEL);
> - if (!sbi) {
> - unlock_kernel();
> + if (!sbi)
>   return -ENOMEM;
> - }
>  
>   sbi->s_blockgroup_lock =
>   kzalloc(sizeof(struct blockgroup_lock), GFP_KERNEL);
>   if (!sbi->s_blockgroup_lock) {
>   kfree(sbi);
> - unlock_kernel();
>   return -ENOMEM;
>   }
>   sb->s_fs_info = sbi;
> @@ -1589,8 +1584,6 @@ static int ext3_fill_super (struct super_block *sb, void *data, int silent)
>   sbi->s_resgid = EXT3_DEF_RESGID;
>   sbi->s_sb_block = sb_block;
>  
> - unlock_kernel();
> -
>   blocksize = sb_min_blocksize(sb, EXT3_MIN_BLOCK_SIZE);
>   if (!blocksize) {
>   printk(KERN_ERR "EXT3-fs: unable to set blocksize\n");
> @@ -1996,8 +1989,6 @@ static int ext3_fill_super (struct super_block *sb, void *data, int silent)
>   test_opt(sb,DATA_FLAGS) == EXT3_MOUNT_ORDERED_DATA ? "ordered":
>   "writeback");
>  
> - lock_kernel();
> - unlock_kernel();
>   return 0;
>  
>  cantfind_ext3:
> @@ -2027,8 +2018,6 @@ out_fail:
>   sb->s_fs_info = NULL;
>   kfree(sbi->s_blockgroup_lock);
>   kfree(sbi);
> - lock_kernel();
> - unlock_kernel();
>   return ret;
>  }
>  
> --
> 1.6.4.2
>
--
Jan Kara <jack@...>
SUSE Labs, CR
--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@...
More majordomo info at  http://vger.kernel.org/majordomo-info.html