diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-22 13:52:56 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-22 13:52:56 -0400 |
commit | 092e0e7e520a1fca03e13c9f2d157432a8657ff2 (patch) | |
tree | 451897252c4c08c4b5a8ef535da156f1e817e80b /drivers/scsi | |
parent | 79f14b7c56d3b3ba58f8b43d1f70b9b71477a800 (diff) | |
parent | 776c163b1b93c8dfa5edba885bc2bfbc2d228a5f (diff) |
Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl
* 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl:
vfs: make no_llseek the default
vfs: don't use BKL in default_llseek
llseek: automatically add .llseek fop
libfs: use generic_file_llseek for simple_attr
mac80211: disallow seeks in minstrel debug code
lirc: make chardev nonseekable
viotape: use noop_llseek
raw: use explicit llseek file operations
ibmasmfs: use generic_file_llseek
spufs: use llseek in all file operations
arm/omap: use generic_file_llseek in iommu_debug
lkdtm: use generic_file_llseek in debugfs
net/wireless: use generic_file_llseek in debugfs
drm: use noop_llseek
Diffstat (limited to 'drivers/scsi')
-rw-r--r-- | drivers/scsi/3w-9xxx.c | 3 | ||||
-rw-r--r-- | drivers/scsi/3w-sas.c | 3 | ||||
-rw-r--r-- | drivers/scsi/3w-xxxx.c | 3 | ||||
-rw-r--r-- | drivers/scsi/aacraid/linit.c | 1 | ||||
-rw-r--r-- | drivers/scsi/ch.c | 1 | ||||
-rw-r--r-- | drivers/scsi/dpt_i2o.c | 1 | ||||
-rw-r--r-- | drivers/scsi/gdth.c | 1 | ||||
-rw-r--r-- | drivers/scsi/megaraid.c | 1 | ||||
-rw-r--r-- | drivers/scsi/megaraid/megaraid_mm.c | 1 | ||||
-rw-r--r-- | drivers/scsi/megaraid/megaraid_sas.c | 1 | ||||
-rw-r--r-- | drivers/scsi/mpt2sas/mpt2sas_ctl.c | 1 | ||||
-rw-r--r-- | drivers/scsi/osd/osd_uld.c | 1 | ||||
-rw-r--r-- | drivers/scsi/pmcraid.c | 1 | ||||
-rw-r--r-- | drivers/scsi/qla2xxx/qla_os.c | 1 | ||||
-rw-r--r-- | drivers/scsi/scsi_tgt_if.c | 1 | ||||
-rw-r--r-- | drivers/scsi/sg.c | 1 |
16 files changed, 19 insertions, 3 deletions
diff --git a/drivers/scsi/3w-9xxx.c b/drivers/scsi/3w-9xxx.c index 09a139f61ca4..fcf08b3f52c1 100644 --- a/drivers/scsi/3w-9xxx.c +++ b/drivers/scsi/3w-9xxx.c | |||
@@ -222,7 +222,8 @@ static const struct file_operations twa_fops = { | |||
222 | .owner = THIS_MODULE, | 222 | .owner = THIS_MODULE, |
223 | .unlocked_ioctl = twa_chrdev_ioctl, | 223 | .unlocked_ioctl = twa_chrdev_ioctl, |
224 | .open = twa_chrdev_open, | 224 | .open = twa_chrdev_open, |
225 | .release = NULL | 225 | .release = NULL, |
226 | .llseek = noop_llseek, | ||
226 | }; | 227 | }; |
227 | 228 | ||
228 | /* This function will complete an aen request from the isr */ | 229 | /* This function will complete an aen request from the isr */ |
diff --git a/drivers/scsi/3w-sas.c b/drivers/scsi/3w-sas.c index 7e5f2385e3e6..6a95d111d207 100644 --- a/drivers/scsi/3w-sas.c +++ b/drivers/scsi/3w-sas.c | |||
@@ -889,7 +889,8 @@ static const struct file_operations twl_fops = { | |||
889 | .owner = THIS_MODULE, | 889 | .owner = THIS_MODULE, |
890 | .unlocked_ioctl = twl_chrdev_ioctl, | 890 | .unlocked_ioctl = twl_chrdev_ioctl, |
891 | .open = twl_chrdev_open, | 891 | .open = twl_chrdev_open, |
892 | .release = NULL | 892 | .release = NULL, |
893 | .llseek = noop_llseek, | ||
893 | }; | 894 | }; |
894 | 895 | ||
895 | /* This function passes sense data from firmware to scsi layer */ | 896 | /* This function passes sense data from firmware to scsi layer */ |
diff --git a/drivers/scsi/3w-xxxx.c b/drivers/scsi/3w-xxxx.c index 081c864c11d2..b1125341f4c8 100644 --- a/drivers/scsi/3w-xxxx.c +++ b/drivers/scsi/3w-xxxx.c | |||
@@ -1058,7 +1058,8 @@ static const struct file_operations tw_fops = { | |||
1058 | .owner = THIS_MODULE, | 1058 | .owner = THIS_MODULE, |
1059 | .unlocked_ioctl = tw_chrdev_ioctl, | 1059 | .unlocked_ioctl = tw_chrdev_ioctl, |
1060 | .open = tw_chrdev_open, | 1060 | .open = tw_chrdev_open, |
1061 | .release = NULL | 1061 | .release = NULL, |
1062 | .llseek = noop_llseek, | ||
1062 | }; | 1063 | }; |
1063 | 1064 | ||
1064 | /* This function will free up device extension resources */ | 1065 | /* This function will free up device extension resources */ |
diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c index 6e233362dd7b..dae46d779c7b 100644 --- a/drivers/scsi/aacraid/linit.c +++ b/drivers/scsi/aacraid/linit.c | |||
@@ -1040,6 +1040,7 @@ static const struct file_operations aac_cfg_fops = { | |||
1040 | .compat_ioctl = aac_compat_cfg_ioctl, | 1040 | .compat_ioctl = aac_compat_cfg_ioctl, |
1041 | #endif | 1041 | #endif |
1042 | .open = aac_cfg_open, | 1042 | .open = aac_cfg_open, |
1043 | .llseek = noop_llseek, | ||
1043 | }; | 1044 | }; |
1044 | 1045 | ||
1045 | static struct scsi_host_template aac_driver_template = { | 1046 | static struct scsi_host_template aac_driver_template = { |
diff --git a/drivers/scsi/ch.c b/drivers/scsi/ch.c index e805c8fda239..a15474eef5f7 100644 --- a/drivers/scsi/ch.c +++ b/drivers/scsi/ch.c | |||
@@ -981,6 +981,7 @@ static const struct file_operations changer_fops = { | |||
981 | #ifdef CONFIG_COMPAT | 981 | #ifdef CONFIG_COMPAT |
982 | .compat_ioctl = ch_ioctl_compat, | 982 | .compat_ioctl = ch_ioctl_compat, |
983 | #endif | 983 | #endif |
984 | .llseek = noop_llseek, | ||
984 | }; | 985 | }; |
985 | 986 | ||
986 | static int __init init_ch_module(void) | 987 | static int __init init_ch_module(void) |
diff --git a/drivers/scsi/dpt_i2o.c b/drivers/scsi/dpt_i2o.c index 410ac1def8a6..23dec0063385 100644 --- a/drivers/scsi/dpt_i2o.c +++ b/drivers/scsi/dpt_i2o.c | |||
@@ -126,6 +126,7 @@ static const struct file_operations adpt_fops = { | |||
126 | #ifdef CONFIG_COMPAT | 126 | #ifdef CONFIG_COMPAT |
127 | .compat_ioctl = compat_adpt_ioctl, | 127 | .compat_ioctl = compat_adpt_ioctl, |
128 | #endif | 128 | #endif |
129 | .llseek = noop_llseek, | ||
129 | }; | 130 | }; |
130 | 131 | ||
131 | /* Structures and definitions for synchronous message posting. | 132 | /* Structures and definitions for synchronous message posting. |
diff --git a/drivers/scsi/gdth.c b/drivers/scsi/gdth.c index e927607bbf89..5a3f93101017 100644 --- a/drivers/scsi/gdth.c +++ b/drivers/scsi/gdth.c | |||
@@ -373,6 +373,7 @@ static const struct file_operations gdth_fops = { | |||
373 | .unlocked_ioctl = gdth_unlocked_ioctl, | 373 | .unlocked_ioctl = gdth_unlocked_ioctl, |
374 | .open = gdth_open, | 374 | .open = gdth_open, |
375 | .release = gdth_close, | 375 | .release = gdth_close, |
376 | .llseek = noop_llseek, | ||
376 | }; | 377 | }; |
377 | 378 | ||
378 | #include "gdth_proc.h" | 379 | #include "gdth_proc.h" |
diff --git a/drivers/scsi/megaraid.c b/drivers/scsi/megaraid.c index 4d0cf5cd82cc..7ceb5cf12c6b 100644 --- a/drivers/scsi/megaraid.c +++ b/drivers/scsi/megaraid.c | |||
@@ -102,6 +102,7 @@ static const struct file_operations megadev_fops = { | |||
102 | .owner = THIS_MODULE, | 102 | .owner = THIS_MODULE, |
103 | .unlocked_ioctl = megadev_unlocked_ioctl, | 103 | .unlocked_ioctl = megadev_unlocked_ioctl, |
104 | .open = megadev_open, | 104 | .open = megadev_open, |
105 | .llseek = noop_llseek, | ||
105 | }; | 106 | }; |
106 | 107 | ||
107 | /* | 108 | /* |
diff --git a/drivers/scsi/megaraid/megaraid_mm.c b/drivers/scsi/megaraid/megaraid_mm.c index 42770a1e7b8a..a7008c0c24f9 100644 --- a/drivers/scsi/megaraid/megaraid_mm.c +++ b/drivers/scsi/megaraid/megaraid_mm.c | |||
@@ -76,6 +76,7 @@ static const struct file_operations lsi_fops = { | |||
76 | .compat_ioctl = mraid_mm_compat_ioctl, | 76 | .compat_ioctl = mraid_mm_compat_ioctl, |
77 | #endif | 77 | #endif |
78 | .owner = THIS_MODULE, | 78 | .owner = THIS_MODULE, |
79 | .llseek = noop_llseek, | ||
79 | }; | 80 | }; |
80 | 81 | ||
81 | static struct miscdevice megaraid_mm_dev = { | 82 | static struct miscdevice megaraid_mm_dev = { |
diff --git a/drivers/scsi/megaraid/megaraid_sas.c b/drivers/scsi/megaraid/megaraid_sas.c index c4a595d8d23a..51e2579a743a 100644 --- a/drivers/scsi/megaraid/megaraid_sas.c +++ b/drivers/scsi/megaraid/megaraid_sas.c | |||
@@ -3955,6 +3955,7 @@ static const struct file_operations megasas_mgmt_fops = { | |||
3955 | #ifdef CONFIG_COMPAT | 3955 | #ifdef CONFIG_COMPAT |
3956 | .compat_ioctl = megasas_mgmt_compat_ioctl, | 3956 | .compat_ioctl = megasas_mgmt_compat_ioctl, |
3957 | #endif | 3957 | #endif |
3958 | .llseek = noop_llseek, | ||
3958 | }; | 3959 | }; |
3959 | 3960 | ||
3960 | /* | 3961 | /* |
diff --git a/drivers/scsi/mpt2sas/mpt2sas_ctl.c b/drivers/scsi/mpt2sas/mpt2sas_ctl.c index 31cf126ed440..40cb8aeb21b1 100644 --- a/drivers/scsi/mpt2sas/mpt2sas_ctl.c +++ b/drivers/scsi/mpt2sas/mpt2sas_ctl.c | |||
@@ -2953,6 +2953,7 @@ static const struct file_operations ctl_fops = { | |||
2953 | #ifdef CONFIG_COMPAT | 2953 | #ifdef CONFIG_COMPAT |
2954 | .compat_ioctl = _ctl_ioctl_compat, | 2954 | .compat_ioctl = _ctl_ioctl_compat, |
2955 | #endif | 2955 | #endif |
2956 | .llseek = noop_llseek, | ||
2956 | }; | 2957 | }; |
2957 | 2958 | ||
2958 | static struct miscdevice ctl_dev = { | 2959 | static struct miscdevice ctl_dev = { |
diff --git a/drivers/scsi/osd/osd_uld.c b/drivers/scsi/osd/osd_uld.c index ffdd9fdb9995..b31a8e3841d7 100644 --- a/drivers/scsi/osd/osd_uld.c +++ b/drivers/scsi/osd/osd_uld.c | |||
@@ -182,6 +182,7 @@ static const struct file_operations osd_fops = { | |||
182 | .open = osd_uld_open, | 182 | .open = osd_uld_open, |
183 | .release = osd_uld_release, | 183 | .release = osd_uld_release, |
184 | .unlocked_ioctl = osd_uld_ioctl, | 184 | .unlocked_ioctl = osd_uld_ioctl, |
185 | .llseek = noop_llseek, | ||
185 | }; | 186 | }; |
186 | 187 | ||
187 | struct osd_dev *osduld_path_lookup(const char *name) | 188 | struct osd_dev *osduld_path_lookup(const char *name) |
diff --git a/drivers/scsi/pmcraid.c b/drivers/scsi/pmcraid.c index ecc45c8b4e6b..4b8765785aeb 100644 --- a/drivers/scsi/pmcraid.c +++ b/drivers/scsi/pmcraid.c | |||
@@ -4165,6 +4165,7 @@ static const struct file_operations pmcraid_fops = { | |||
4165 | #ifdef CONFIG_COMPAT | 4165 | #ifdef CONFIG_COMPAT |
4166 | .compat_ioctl = pmcraid_chr_ioctl, | 4166 | .compat_ioctl = pmcraid_chr_ioctl, |
4167 | #endif | 4167 | #endif |
4168 | .llseek = noop_llseek, | ||
4168 | }; | 4169 | }; |
4169 | 4170 | ||
4170 | 4171 | ||
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c index 1e4bff695254..9946fac54255 100644 --- a/drivers/scsi/qla2xxx/qla_os.c +++ b/drivers/scsi/qla2xxx/qla_os.c | |||
@@ -3948,6 +3948,7 @@ static struct pci_driver qla2xxx_pci_driver = { | |||
3948 | 3948 | ||
3949 | static struct file_operations apidev_fops = { | 3949 | static struct file_operations apidev_fops = { |
3950 | .owner = THIS_MODULE, | 3950 | .owner = THIS_MODULE, |
3951 | .llseek = noop_llseek, | ||
3951 | }; | 3952 | }; |
3952 | 3953 | ||
3953 | /** | 3954 | /** |
diff --git a/drivers/scsi/scsi_tgt_if.c b/drivers/scsi/scsi_tgt_if.c index 02034460babb..0172de197008 100644 --- a/drivers/scsi/scsi_tgt_if.c +++ b/drivers/scsi/scsi_tgt_if.c | |||
@@ -331,6 +331,7 @@ static const struct file_operations tgt_fops = { | |||
331 | .poll = tgt_poll, | 331 | .poll = tgt_poll, |
332 | .write = tgt_write, | 332 | .write = tgt_write, |
333 | .mmap = tgt_mmap, | 333 | .mmap = tgt_mmap, |
334 | .llseek = noop_llseek, | ||
334 | }; | 335 | }; |
335 | 336 | ||
336 | static struct miscdevice tgt_miscdev = { | 337 | static struct miscdevice tgt_miscdev = { |
diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c index b5507d59b5a6..58ec8f4efcc2 100644 --- a/drivers/scsi/sg.c +++ b/drivers/scsi/sg.c | |||
@@ -1353,6 +1353,7 @@ static const struct file_operations sg_fops = { | |||
1353 | .mmap = sg_mmap, | 1353 | .mmap = sg_mmap, |
1354 | .release = sg_release, | 1354 | .release = sg_release, |
1355 | .fasync = sg_fasync, | 1355 | .fasync = sg_fasync, |
1356 | .llseek = no_llseek, | ||
1356 | }; | 1357 | }; |
1357 | 1358 | ||
1358 | static struct class *sg_sysfs_class; | 1359 | static struct class *sg_sysfs_class; |