aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorSteve French <sfrench@us.ibm.com>2008-05-15 01:51:55 -0400
committerSteve French <sfrench@us.ibm.com>2008-05-15 01:51:55 -0400
commitf9ddcca4cf7d95238beb295484d1de7c0bf490dd (patch)
tree07ed83773e89d32f2d509b6514ef0feaa75b22d5 /fs
parentc32916374b2b4f4d2b7ccdb357fe7989f3b407a6 (diff)
[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: Andi Kleen <andi@firstfloor.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/cifs/cifsfs.c10
-rw-r--r--fs/cifs/cifsfs.h3
-rw-r--r--fs/cifs/ioctl.c4
3 files changed, 8 insertions, 9 deletions
diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
index 427a7c69589..b6436b888cf 100644
--- a/fs/cifs/cifsfs.c
+++ b/fs/cifs/cifsfs.c
@@ -657,7 +657,7 @@ const struct file_operations cifs_file_ops = {
657 .splice_read = generic_file_splice_read, 657 .splice_read = generic_file_splice_read,
658 .llseek = cifs_llseek, 658 .llseek = cifs_llseek,
659#ifdef CONFIG_CIFS_POSIX 659#ifdef CONFIG_CIFS_POSIX
660 .ioctl = cifs_ioctl, 660 .unlocked_ioctl = cifs_ioctl,
661#endif /* CONFIG_CIFS_POSIX */ 661#endif /* CONFIG_CIFS_POSIX */
662 662
663#ifdef CONFIG_CIFS_EXPERIMENTAL 663#ifdef CONFIG_CIFS_EXPERIMENTAL
@@ -677,7 +677,7 @@ const struct file_operations cifs_file_direct_ops = {
677 .flush = cifs_flush, 677 .flush = cifs_flush,
678 .splice_read = generic_file_splice_read, 678 .splice_read = generic_file_splice_read,
679#ifdef CONFIG_CIFS_POSIX 679#ifdef CONFIG_CIFS_POSIX
680 .ioctl = cifs_ioctl, 680 .unlocked_ioctl = cifs_ioctl,
681#endif /* CONFIG_CIFS_POSIX */ 681#endif /* CONFIG_CIFS_POSIX */
682 .llseek = cifs_llseek, 682 .llseek = cifs_llseek,
683#ifdef CONFIG_CIFS_EXPERIMENTAL 683#ifdef CONFIG_CIFS_EXPERIMENTAL
@@ -697,7 +697,7 @@ const struct file_operations cifs_file_nobrl_ops = {
697 .splice_read = generic_file_splice_read, 697 .splice_read = generic_file_splice_read,
698 .llseek = cifs_llseek, 698 .llseek = cifs_llseek,
699#ifdef CONFIG_CIFS_POSIX 699#ifdef CONFIG_CIFS_POSIX
700 .ioctl = cifs_ioctl, 700 .unlocked_ioctl = cifs_ioctl,
701#endif /* CONFIG_CIFS_POSIX */ 701#endif /* CONFIG_CIFS_POSIX */
702 702
703#ifdef CONFIG_CIFS_EXPERIMENTAL 703#ifdef CONFIG_CIFS_EXPERIMENTAL
@@ -716,7 +716,7 @@ const struct file_operations cifs_file_direct_nobrl_ops = {
716 .flush = cifs_flush, 716 .flush = cifs_flush,
717 .splice_read = generic_file_splice_read, 717 .splice_read = generic_file_splice_read,
718#ifdef CONFIG_CIFS_POSIX 718#ifdef CONFIG_CIFS_POSIX
719 .ioctl = cifs_ioctl, 719 .unlocked_ioctl = cifs_ioctl,
720#endif /* CONFIG_CIFS_POSIX */ 720#endif /* CONFIG_CIFS_POSIX */
721 .llseek = cifs_llseek, 721 .llseek = cifs_llseek,
722#ifdef CONFIG_CIFS_EXPERIMENTAL 722#ifdef CONFIG_CIFS_EXPERIMENTAL
@@ -731,7 +731,7 @@ const struct file_operations cifs_dir_ops = {
731#ifdef CONFIG_CIFS_EXPERIMENTAL 731#ifdef CONFIG_CIFS_EXPERIMENTAL
732 .dir_notify = cifs_dir_notify, 732 .dir_notify = cifs_dir_notify,
733#endif /* CONFIG_CIFS_EXPERIMENTAL */ 733#endif /* CONFIG_CIFS_EXPERIMENTAL */
734 .ioctl = cifs_ioctl, 734 .unlocked_ioctl = cifs_ioctl,
735}; 735};
736 736
737static void 737static void
diff --git a/fs/cifs/cifsfs.h b/fs/cifs/cifsfs.h
index cd1301a09b3..25a6cbd1552 100644
--- a/fs/cifs/cifsfs.h
+++ b/fs/cifs/cifsfs.h
@@ -95,8 +95,7 @@ extern int cifs_setxattr(struct dentry *, const char *, const void *,
95 size_t, int); 95 size_t, int);
96extern ssize_t cifs_getxattr(struct dentry *, const char *, void *, size_t); 96extern ssize_t cifs_getxattr(struct dentry *, const char *, void *, size_t);
97extern ssize_t cifs_listxattr(struct dentry *, char *, size_t); 97extern ssize_t cifs_listxattr(struct dentry *, char *, size_t);
98extern int cifs_ioctl(struct inode *inode, struct file *filep, 98extern long cifs_ioctl(struct file *filep, unsigned int cmd, unsigned long arg);
99 unsigned int command, unsigned long arg);
100 99
101#ifdef CONFIG_CIFS_EXPERIMENTAL 100#ifdef CONFIG_CIFS_EXPERIMENTAL
102extern const struct export_operations cifs_export_ops; 101extern const struct export_operations cifs_export_ops;
diff --git a/fs/cifs/ioctl.c b/fs/cifs/ioctl.c
index 5c792df13d6..0088a5b5256 100644
--- a/fs/cifs/ioctl.c
+++ b/fs/cifs/ioctl.c
@@ -30,9 +30,9 @@
30 30
31#define CIFS_IOC_CHECKUMOUNT _IO(0xCF, 2) 31#define CIFS_IOC_CHECKUMOUNT _IO(0xCF, 2)
32 32
33int cifs_ioctl(struct inode *inode, struct file *filep, 33long cifs_ioctl(struct file *filep, unsigned int command, unsigned long arg)
34 unsigned int command, unsigned long arg)
35{ 34{
35 struct inode *inode = filep->f_dentry->d_inode;
36 int rc = -ENOTTY; /* strange error - but the precedent */ 36 int rc = -ENOTTY; /* strange error - but the precedent */
37 int xid; 37 int xid;
38 struct cifs_sb_info *cifs_sb; 38 struct cifs_sb_info *cifs_sb;