Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1a028dd2 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

BKL: Remove BKL from jffs2 



The BKL is only used in put_super, fill_super and remount_fs that are all
three protected by the superblocks s_umount rw_semaphore. Therefore it is
safe to remove the BKL entirely.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Cc: David Woodhouse <dwmw2@infradead.org>
parent 18dfe89d

fs/jffs2/fs.c

+0 −4
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ 
#include <linux/vmalloc.h>

#include <linux/vfs.h>

#include <linux/crc32.h>

#include <linux/smp_lock.h>

#include "nodelist.h"



static int jffs2_flash_setup(struct jffs2_sb_info *c);
@@ -391,7 +390,6 @@ int jffs2_remount_fs (struct super_block *sb, int *flags, char *data) 
	   This also catches the case where it was stopped and this

	   is just a remount to restart it.

	   Flush the writebuffer, if neccecary, else we loose it */

	lock_kernel();

	if (!(sb->s_flags & MS_RDONLY)) {

		jffs2_stop_garbage_collect_thread(c);

		mutex_lock(&c->alloc_sem);
@@ -403,8 +401,6 @@ int jffs2_remount_fs (struct super_block *sb, int *flags, char *data) 
		jffs2_start_garbage_collect_thread(c);



	*flags |= MS_NOATIME;



	unlock_kernel();

	return 0;

}

fs/jffs2/super.c

+1 −11
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ 
#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/slab.h>

#include <linux/smp_lock.h>

#include <linux/init.h>

#include <linux/list.h>

#include <linux/fs.h>
@@ -148,17 +147,13 @@ static int jffs2_fill_super(struct super_block *sb, void *data, int silent) 
	struct jffs2_sb_info *c;

	int ret;



	lock_kernel();



	D1(printk(KERN_DEBUG "jffs2_get_sb_mtd():"

		  " New superblock for device %d (\"%s\")\n",

		  sb->s_mtd->index, sb->s_mtd->name));



	c = kzalloc(sizeof(*c), GFP_KERNEL);

	if (!c) {

		unlock_kernel();

	if (!c)

		return -ENOMEM;

	}



	c->mtd = sb->s_mtd;

	c->os_priv = sb;
@@ -181,7 +176,6 @@ static int jffs2_fill_super(struct super_block *sb, void *data, int silent) 
	sb->s_flags |= MS_POSIXACL;

#endif

	ret = jffs2_do_fill_super(sb, data, silent);

	unlock_kernel();

	return ret;

}
@@ -199,8 +193,6 @@ static void jffs2_put_super (struct super_block *sb) 


	D2(printk(KERN_DEBUG "jffs2: jffs2_put_super()\n"));



	lock_kernel();



	if (sb->s_dirt)

		jffs2_write_super(sb);
@@ -222,8 +214,6 @@ static void jffs2_put_super (struct super_block *sb) 
	if (c->mtd->sync)

		c->mtd->sync(c->mtd);



	unlock_kernel();



	D1(printk(KERN_DEBUG "jffs2_put_super returning\n"));

}