Commit 7cc4bcc6 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Frederic Weisbecker
Browse files

hfsplus: Push down BKL into ioctl function 



HFS is one of the remaining users of the ->ioctl function, convert it
blindly to unlocked_ioctl by pushing down the BKL.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarFrederic Weisbecker <fweisbec@gmail.com>
parent e40152ee

fs/hfsplus/dir.c

+1 −1
Original line number Diff line number Diff line
@@ -494,7 +494,7 @@ const struct inode_operations hfsplus_dir_inode_operations = { 
const struct file_operations hfsplus_dir_operations = {

	.read		= generic_read_dir,

	.readdir	= hfsplus_readdir,

	.ioctl          = hfsplus_ioctl,

	.unlocked_ioctl = hfsplus_ioctl,

	.llseek		= generic_file_llseek,

	.release	= hfsplus_dir_release,

};

fs/hfsplus/hfsplus_fs.h

+1 −2
Original line number Diff line number Diff line
@@ -337,8 +337,7 @@ struct inode *hfsplus_new_inode(struct super_block *, int); 
void hfsplus_delete_inode(struct inode *);



/* ioctl.c */

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

		  unsigned long arg);

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

int hfsplus_setxattr(struct dentry *dentry, const char *name,

		     const void *value, size_t size, int flags);

ssize_t hfsplus_getxattr(struct dentry *dentry, const char *name,

fs/hfsplus/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -285,7 +285,7 @@ static const struct file_operations hfsplus_file_operations = { 
	.fsync		= file_fsync,

	.open		= hfsplus_file_open,

	.release	= hfsplus_file_release,

	.ioctl          = hfsplus_ioctl,

	.unlocked_ioctl = hfsplus_ioctl,

};



struct inode *hfsplus_new_inode(struct super_block *sb, int mode)

fs/hfsplus/ioctl.c

+9 −3
Original line number Diff line number Diff line
@@ -17,14 +17,16 @@ 
#include <linux/mount.h>

#include <linux/sched.h>

#include <linux/xattr.h>

#include <linux/smp_lock.h>

#include <asm/uaccess.h>

#include "hfsplus_fs.h"



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

		  unsigned long arg)

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

{

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

	unsigned int flags;



	lock_kernel();

	switch (cmd) {

	case HFSPLUS_IOC_EXT2_GETFLAGS:

		flags = 0;
@@ -38,8 +40,10 @@ int hfsplus_ioctl(struct inode *inode, struct file *filp, unsigned int cmd, 
	case HFSPLUS_IOC_EXT2_SETFLAGS: {

		int err = 0;

		err = mnt_want_write(filp->f_path.mnt);

		if (err)

		if (err) {

			unlock_kernel();

			return err;

		}



		if (!is_owner_or_cap(inode)) {

			err = -EACCES;
@@ -85,9 +89,11 @@ int hfsplus_ioctl(struct inode *inode, struct file *filp, unsigned int cmd, 
		mark_inode_dirty(inode);

setflags_out:

		mnt_drop_write(filp->f_path.mnt);

		unlock_kernel();

		return err;

	}

	default:

		unlock_kernel();

		return -ENOTTY;

	}

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE