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

Commit 205cb37b authored by Frederic Weisbecker's avatar Frederic Weisbecker
Browse files

kill-the-bkl/reiserfs: definitely drop the bkl from reiserfs_ioctl() 



The reiserfs ioctl path doesn't need the big kernel lock anymore , now
that the filesystem synchronizes through its own lock.

We can then turn reiserfs_ioctl() into an unlocked_ioctl callback.

Signed-off-by: default avatarFrederic Weisbecker <fweisbec@gmail.com>
Cc: Jeff Mahoney <jeffm@suse.com>
Cc: Chris Mason <chris.mason@oracle.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Alexander Beregalov <a.beregalov@gmail.com>
Cc: Laurent Riffard <laurent.riffard@free.fr>
Cc: Thomas Gleixner <tglx@linutronix.de>
parent ac78a078

fs/reiserfs/dir.c

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ const struct file_operations reiserfs_dir_operations = { 
	.read = generic_read_dir,

	.readdir = reiserfs_readdir,

	.fsync = reiserfs_dir_fsync,

	.ioctl = reiserfs_ioctl,

	.unlocked_ioctl = reiserfs_ioctl,

#ifdef CONFIG_COMPAT

	.compat_ioctl = reiserfs_compat_ioctl,

#endif

fs/reiserfs/file.c

+1 −1
Original line number Diff line number Diff line
@@ -284,7 +284,7 @@ static ssize_t reiserfs_file_write(struct file *file, /* the file we are going t 
const struct file_operations reiserfs_file_operations = {

	.read = do_sync_read,

	.write = reiserfs_file_write,

	.ioctl = reiserfs_ioctl,

	.unlocked_ioctl = reiserfs_ioctl,

#ifdef CONFIG_COMPAT

	.compat_ioctl = reiserfs_compat_ioctl,

#endif

fs/reiserfs/ioctl.c

+3 −8
Original line number Diff line number Diff line
@@ -20,9 +20,9 @@ 
 *  2) REISERFS_IOC_[GS]ETFLAGS, REISERFS_IOC_[GS]ETVERSION

 *  3) That's all for a while ...

 */

int reiserfs_ioctl(struct inode *inode, struct file *filp, unsigned int cmd,

		   unsigned long arg)

long reiserfs_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)

{

	struct inode *inode = filp->f_path.dentry->d_inode;

	unsigned int flags;

	int err = 0;
@@ -132,9 +132,6 @@ setversion_out: 
long reiserfs_compat_ioctl(struct file *file, unsigned int cmd,

				unsigned long arg)

{

	struct inode *inode = file->f_path.dentry->d_inode;

	int ret;



	/* These are just misnamed, they actually get/put from/to user an int */

	switch (cmd) {

	case REISERFS_IOC32_UNPACK:
@@ -156,9 +153,7 @@ long reiserfs_compat_ioctl(struct file *file, unsigned int cmd, 
		return -ENOIOCTLCMD;

	}



	ret = reiserfs_ioctl(inode, file, cmd, (unsigned long) compat_ptr(arg));



	return ret;

	return reiserfs_ioctl(file, cmd, (unsigned long) compat_ptr(arg));

}

#endif

include/linux/reiserfs_fs.h

+1 −2
Original line number Diff line number Diff line
@@ -2314,8 +2314,7 @@ __u32 r5_hash(const signed char *msg, int len); 
#define SPARE_SPACE 500



/* prototypes from ioctl.c */

int reiserfs_ioctl(struct inode *inode, struct file *filp,

		   unsigned int cmd, unsigned long arg);

long reiserfs_ioctl(struct file *filp, unsigned int cmd, unsigned long arg);

long reiserfs_compat_ioctl(struct file *filp,

		   unsigned int cmd, unsigned long arg);

int reiserfs_unpack(struct inode *inode, struct file *filp);