diff options
author | Steve French <sfrench@us.ibm.com> | 2008-05-15 01:51:55 -0400 |
---|---|---|
committer | Steve French <sfrench@us.ibm.com> | 2008-05-15 01:51:55 -0400 |
commit | f9ddcca4cf7d95238beb295484d1de7c0bf490dd (patch) | |
tree | 07ed83773e89d32f2d509b6514ef0feaa75b22d5 /fs/cifs/cifsfs.c | |
parent | c32916374b2b4f4d2b7ccdb357fe7989f3b407a6 (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/cifs/cifsfs.c')
-rw-r--r-- | fs/cifs/cifsfs.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c index 427a7c695896..b6436b888cf9 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 | ||
737 | static void | 737 | static void |