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

Commit f9ddcca4 authored by Steve French's avatar Steve French
Browse files

[CIFS] BKL-removal: convert CIFS over to unlocked_ioctl 



cifs_ioctl doesn't seem to need the BKL for anything, so convert it over
to use unlocked_ioctl.

Signed-off-by: default avatarAndi Kleen <andi@firstfloor.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarSteve French <sfrench@us.ibm.com>
parent c3291637

fs/cifs/cifsfs.c

+5 −5
Original line number Diff line number Diff line
@@ -657,7 +657,7 @@ const struct file_operations cifs_file_ops = { 
	.splice_read = generic_file_splice_read,

	.llseek = cifs_llseek,

#ifdef CONFIG_CIFS_POSIX

	.ioctl	= cifs_ioctl,

	.unlocked_ioctl	= cifs_ioctl,

#endif /* CONFIG_CIFS_POSIX */



#ifdef CONFIG_CIFS_EXPERIMENTAL
@@ -677,7 +677,7 @@ const struct file_operations cifs_file_direct_ops = { 
	.flush = cifs_flush,

	.splice_read = generic_file_splice_read,

#ifdef CONFIG_CIFS_POSIX

	.ioctl  = cifs_ioctl,

	.unlocked_ioctl  = cifs_ioctl,

#endif /* CONFIG_CIFS_POSIX */

	.llseek = cifs_llseek,

#ifdef CONFIG_CIFS_EXPERIMENTAL
@@ -697,7 +697,7 @@ const struct file_operations cifs_file_nobrl_ops = { 
	.splice_read = generic_file_splice_read,

	.llseek = cifs_llseek,

#ifdef CONFIG_CIFS_POSIX

	.ioctl	= cifs_ioctl,

	.unlocked_ioctl	= cifs_ioctl,

#endif /* CONFIG_CIFS_POSIX */



#ifdef CONFIG_CIFS_EXPERIMENTAL
@@ -716,7 +716,7 @@ const struct file_operations cifs_file_direct_nobrl_ops = { 
	.flush = cifs_flush,

	.splice_read = generic_file_splice_read,

#ifdef CONFIG_CIFS_POSIX

	.ioctl  = cifs_ioctl,

	.unlocked_ioctl  = cifs_ioctl,

#endif /* CONFIG_CIFS_POSIX */

	.llseek = cifs_llseek,

#ifdef CONFIG_CIFS_EXPERIMENTAL
@@ -731,7 +731,7 @@ const struct file_operations cifs_dir_ops = { 
#ifdef CONFIG_CIFS_EXPERIMENTAL

	.dir_notify = cifs_dir_notify,

#endif /* CONFIG_CIFS_EXPERIMENTAL */

	.ioctl  = cifs_ioctl,

	.unlocked_ioctl  = cifs_ioctl,

};



static void

fs/cifs/cifsfs.h

+1 −2
Original line number Diff line number Diff line
@@ -95,8 +95,7 @@ extern int cifs_setxattr(struct dentry *, const char *, const void *, 
			size_t, int);

extern ssize_t	cifs_getxattr(struct dentry *, const char *, void *, size_t);

extern ssize_t	cifs_listxattr(struct dentry *, char *, size_t);

extern int cifs_ioctl(struct inode *inode, struct file *filep,

		       unsigned int command, unsigned long arg);

extern long cifs_ioctl(struct file *filep, unsigned int cmd, unsigned long arg);



#ifdef CONFIG_CIFS_EXPERIMENTAL

extern const struct export_operations cifs_export_ops;

fs/cifs/ioctl.c

+2 −2
Original line number Diff line number Diff line
@@ -30,9 +30,9 @@ 


#define CIFS_IOC_CHECKUMOUNT _IO(0xCF, 2)



int cifs_ioctl(struct inode *inode, struct file *filep,

		unsigned int command, unsigned long arg)

long cifs_ioctl(struct file *filep, unsigned int command, unsigned long arg)

{

	struct inode *inode = filep->f_dentry->d_inode;

	int rc = -ENOTTY; /* strange error - but the precedent */

	int xid;

	struct cifs_sb_info *cifs_sb;