From: Arnd Bergmann <arnd@arndb.de>
To: linux-kernel@vger.kernel.org
Cc: Arnd Bergmann <arnd@arndb.de>,
Phillip Lougher <phillip@lougher.demon.co.uk>
Subject: [PATCH 11/12] BKL: Remove BKL from squashfs
Date: Thu, 16 Sep 2010 19:46:24 +0200 [thread overview]
Message-ID: <1284659185-8942-12-git-send-email-arnd@arndb.de> (raw)
In-Reply-To: <1284659185-8942-1-git-send-email-arnd@arndb.de>
The BKL is only used in put_super and fill_super, which are both protected
by the superblocks s_umount rw_semaphore. Therefore it is safe to remove
the BKL entirely.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Phillip Lougher <phillip@lougher.demon.co.uk>
---
fs/squashfs/super.c | 11 -----------
1 files changed, 0 insertions(+), 11 deletions(-)
diff --git a/fs/squashfs/super.c b/fs/squashfs/super.c
index ab1a401..07a4f11 100644
--- a/fs/squashfs/super.c
+++ b/fs/squashfs/super.c
@@ -30,7 +30,6 @@
#include <linux/fs.h>
#include <linux/vfs.h>
#include <linux/slab.h>
-#include <linux/smp_lock.h>
#include <linux/mutex.h>
#include <linux/pagemap.h>
#include <linux/init.h>
@@ -87,14 +86,11 @@ static int squashfs_fill_super(struct super_block *sb, void *data, int silent)
u64 lookup_table_start, xattr_id_table_start;
int err;
- lock_kernel();
-
TRACE("Entered squashfs_fill_superblock\n");
sb->s_fs_info = kzalloc(sizeof(*msblk), GFP_KERNEL);
if (sb->s_fs_info == NULL) {
ERROR("Failed to allocate squashfs_sb_info\n");
- unlock_kernel();
return -ENOMEM;
}
msblk = sb->s_fs_info;
@@ -304,7 +300,6 @@ allocate_root:
TRACE("Leaving squashfs_fill_super\n");
kfree(sblk);
- unlock_kernel();
return 0;
failed_mount:
@@ -319,13 +314,11 @@ failed_mount:
kfree(sb->s_fs_info);
sb->s_fs_info = NULL;
kfree(sblk);
- unlock_kernel();
return err;
failure:
kfree(sb->s_fs_info);
sb->s_fs_info = NULL;
- unlock_kernel();
return -ENOMEM;
}
@@ -360,8 +353,6 @@ static int squashfs_remount(struct super_block *sb, int *flags, char *data)
static void squashfs_put_super(struct super_block *sb)
{
- lock_kernel();
-
if (sb->s_fs_info) {
struct squashfs_sb_info *sbi = sb->s_fs_info;
squashfs_cache_delete(sbi->block_cache);
@@ -376,8 +367,6 @@ static void squashfs_put_super(struct super_block *sb)
kfree(sb->s_fs_info);
sb->s_fs_info = NULL;
}
-
- unlock_kernel();
}
--
1.7.1
next prev parent reply other threads:[~2010-09-16 17:47 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-16 17:46 [PATCH 00/12] more BKL removal after get_sb pushdown Arnd Bergmann
2010-09-16 17:46 ` [PATCH 01/12] BKL: Remove BKL from usbfs Arnd Bergmann
2010-09-16 18:47 ` Greg KH
2010-09-16 17:46 ` [PATCH 02/12] BKL: Remove BKL from fat Arnd Bergmann
2010-09-16 17:46 ` [PATCH 03/12] BKL: Remove BKL from isofs Arnd Bergmann
2010-09-16 17:46 ` [PATCH 04/12] BKL: Remove BKL from autofs4 Arnd Bergmann
2010-09-16 17:49 ` H. Peter Anvin
2010-09-16 17:55 ` Arnd Bergmann
2010-09-16 19:20 ` H. Peter Anvin
2010-09-17 1:31 ` Ian Kent
2010-09-17 1:33 ` Ian Kent
2010-09-17 7:17 ` Arnd Bergmann
2010-09-17 17:01 ` Greg KH
2010-09-16 17:46 ` [PATCH 05/12] BKL: Remove BKL from ReiserFS Arnd Bergmann
2010-09-16 17:46 ` [PATCH 06/12] BKL: Remove BKL from capifs Arnd Bergmann
2010-09-17 23:35 ` David Miller
2010-09-18 7:55 ` Arnd Bergmann
2010-09-16 17:46 ` [PATCH 07/12] BKL: Remove BKL from USB gadgetfs Arnd Bergmann
2010-09-16 17:46 ` [PATCH 08/12] BKL: Remove BKL from afs Arnd Bergmann
2010-09-16 17:46 ` [PATCH 09/12] BKL: Remove BKL from ecryptfs Arnd Bergmann
2010-09-16 17:46 ` [PATCH 10/12] BKL: Remove BKL from jffs2 Arnd Bergmann
2010-09-16 17:46 ` Arnd Bergmann [this message]
2010-09-16 17:46 ` [PATCH 12/12] BKL: Remove BKL from OCFS2 Arnd Bergmann
2010-09-16 22:26 ` Mark Fasheh
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1284659185-8942-12-git-send-email-arnd@arndb.de \
--to=arnd@arndb.de \
--cc=linux-kernel@vger.kernel.org \
--cc=phillip@lougher.demon.co.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®