diff options
author | Arnd Bergmann <arnd@arndb.de> | 2010-09-14 06:22:33 -0400 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-10-13 01:19:22 -0400 |
commit | fc15351d9d63a35fd00c15850fa93a27940f16a0 (patch) | |
tree | f36348a0e322df1a808c11baaaa4a1c87bd6254e /arch | |
parent | f56029b5eafda6175be4e5c91ca69c04ccda3661 (diff) |
powerpc/spufs: Use llseek in all file operations
The default for llseek is changing, so we need
explicit operations everywhere.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Jeremy Kerr <jk@ozlabs.org>
Cc: linuxppc-dev@ozlabs.org
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/powerpc/platforms/cell/spufs/file.c | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/arch/powerpc/platforms/cell/spufs/file.c b/arch/powerpc/platforms/cell/spufs/file.c index 1a40da92154c..02f7b113a31b 100644 --- a/arch/powerpc/platforms/cell/spufs/file.c +++ b/arch/powerpc/platforms/cell/spufs/file.c | |||
@@ -154,6 +154,7 @@ static const struct file_operations __fops = { \ | |||
154 | .release = spufs_attr_release, \ | 154 | .release = spufs_attr_release, \ |
155 | .read = spufs_attr_read, \ | 155 | .read = spufs_attr_read, \ |
156 | .write = spufs_attr_write, \ | 156 | .write = spufs_attr_write, \ |
157 | .llseek = generic_file_llseek, \ | ||
157 | }; | 158 | }; |
158 | 159 | ||
159 | 160 | ||
@@ -521,6 +522,7 @@ static const struct file_operations spufs_cntl_fops = { | |||
521 | .release = spufs_cntl_release, | 522 | .release = spufs_cntl_release, |
522 | .read = simple_attr_read, | 523 | .read = simple_attr_read, |
523 | .write = simple_attr_write, | 524 | .write = simple_attr_write, |
525 | .llseek = generic_file_llseek, | ||
524 | .mmap = spufs_cntl_mmap, | 526 | .mmap = spufs_cntl_mmap, |
525 | }; | 527 | }; |
526 | 528 | ||
@@ -714,6 +716,7 @@ static ssize_t spufs_mbox_read(struct file *file, char __user *buf, | |||
714 | static const struct file_operations spufs_mbox_fops = { | 716 | static const struct file_operations spufs_mbox_fops = { |
715 | .open = spufs_pipe_open, | 717 | .open = spufs_pipe_open, |
716 | .read = spufs_mbox_read, | 718 | .read = spufs_mbox_read, |
719 | .llseek = no_llseek, | ||
717 | }; | 720 | }; |
718 | 721 | ||
719 | static ssize_t spufs_mbox_stat_read(struct file *file, char __user *buf, | 722 | static ssize_t spufs_mbox_stat_read(struct file *file, char __user *buf, |
@@ -743,6 +746,7 @@ static ssize_t spufs_mbox_stat_read(struct file *file, char __user *buf, | |||
743 | static const struct file_operations spufs_mbox_stat_fops = { | 746 | static const struct file_operations spufs_mbox_stat_fops = { |
744 | .open = spufs_pipe_open, | 747 | .open = spufs_pipe_open, |
745 | .read = spufs_mbox_stat_read, | 748 | .read = spufs_mbox_stat_read, |
749 | .llseek = no_llseek, | ||
746 | }; | 750 | }; |
747 | 751 | ||
748 | /* low-level ibox access function */ | 752 | /* low-level ibox access function */ |
@@ -863,6 +867,7 @@ static const struct file_operations spufs_ibox_fops = { | |||
863 | .read = spufs_ibox_read, | 867 | .read = spufs_ibox_read, |
864 | .poll = spufs_ibox_poll, | 868 | .poll = spufs_ibox_poll, |
865 | .fasync = spufs_ibox_fasync, | 869 | .fasync = spufs_ibox_fasync, |
870 | .llseek = no_llseek, | ||
866 | }; | 871 | }; |
867 | 872 | ||
868 | static ssize_t spufs_ibox_stat_read(struct file *file, char __user *buf, | 873 | static ssize_t spufs_ibox_stat_read(struct file *file, char __user *buf, |
@@ -890,6 +895,7 @@ static ssize_t spufs_ibox_stat_read(struct file *file, char __user *buf, | |||
890 | static const struct file_operations spufs_ibox_stat_fops = { | 895 | static const struct file_operations spufs_ibox_stat_fops = { |
891 | .open = spufs_pipe_open, | 896 | .open = spufs_pipe_open, |
892 | .read = spufs_ibox_stat_read, | 897 | .read = spufs_ibox_stat_read, |
898 | .llseek = no_llseek, | ||
893 | }; | 899 | }; |
894 | 900 | ||
895 | /* low-level mailbox write */ | 901 | /* low-level mailbox write */ |
@@ -1011,6 +1017,7 @@ static const struct file_operations spufs_wbox_fops = { | |||
1011 | .write = spufs_wbox_write, | 1017 | .write = spufs_wbox_write, |
1012 | .poll = spufs_wbox_poll, | 1018 | .poll = spufs_wbox_poll, |
1013 | .fasync = spufs_wbox_fasync, | 1019 | .fasync = spufs_wbox_fasync, |
1020 | .llseek = no_llseek, | ||
1014 | }; | 1021 | }; |
1015 | 1022 | ||
1016 | static ssize_t spufs_wbox_stat_read(struct file *file, char __user *buf, | 1023 | static ssize_t spufs_wbox_stat_read(struct file *file, char __user *buf, |
@@ -1038,6 +1045,7 @@ static ssize_t spufs_wbox_stat_read(struct file *file, char __user *buf, | |||
1038 | static const struct file_operations spufs_wbox_stat_fops = { | 1045 | static const struct file_operations spufs_wbox_stat_fops = { |
1039 | .open = spufs_pipe_open, | 1046 | .open = spufs_pipe_open, |
1040 | .read = spufs_wbox_stat_read, | 1047 | .read = spufs_wbox_stat_read, |
1048 | .llseek = no_llseek, | ||
1041 | }; | 1049 | }; |
1042 | 1050 | ||
1043 | static int spufs_signal1_open(struct inode *inode, struct file *file) | 1051 | static int spufs_signal1_open(struct inode *inode, struct file *file) |
@@ -1166,6 +1174,7 @@ static const struct file_operations spufs_signal1_fops = { | |||
1166 | .read = spufs_signal1_read, | 1174 | .read = spufs_signal1_read, |
1167 | .write = spufs_signal1_write, | 1175 | .write = spufs_signal1_write, |
1168 | .mmap = spufs_signal1_mmap, | 1176 | .mmap = spufs_signal1_mmap, |
1177 | .llseek = no_llseek, | ||
1169 | }; | 1178 | }; |
1170 | 1179 | ||
1171 | static const struct file_operations spufs_signal1_nosched_fops = { | 1180 | static const struct file_operations spufs_signal1_nosched_fops = { |
@@ -1173,6 +1182,7 @@ static const struct file_operations spufs_signal1_nosched_fops = { | |||
1173 | .release = spufs_signal1_release, | 1182 | .release = spufs_signal1_release, |
1174 | .write = spufs_signal1_write, | 1183 | .write = spufs_signal1_write, |
1175 | .mmap = spufs_signal1_mmap, | 1184 | .mmap = spufs_signal1_mmap, |
1185 | .llseek = no_llseek, | ||
1176 | }; | 1186 | }; |
1177 | 1187 | ||
1178 | static int spufs_signal2_open(struct inode *inode, struct file *file) | 1188 | static int spufs_signal2_open(struct inode *inode, struct file *file) |
@@ -1305,6 +1315,7 @@ static const struct file_operations spufs_signal2_fops = { | |||
1305 | .read = spufs_signal2_read, | 1315 | .read = spufs_signal2_read, |
1306 | .write = spufs_signal2_write, | 1316 | .write = spufs_signal2_write, |
1307 | .mmap = spufs_signal2_mmap, | 1317 | .mmap = spufs_signal2_mmap, |
1318 | .llseek = no_llseek, | ||
1308 | }; | 1319 | }; |
1309 | 1320 | ||
1310 | static const struct file_operations spufs_signal2_nosched_fops = { | 1321 | static const struct file_operations spufs_signal2_nosched_fops = { |
@@ -1312,6 +1323,7 @@ static const struct file_operations spufs_signal2_nosched_fops = { | |||
1312 | .release = spufs_signal2_release, | 1323 | .release = spufs_signal2_release, |
1313 | .write = spufs_signal2_write, | 1324 | .write = spufs_signal2_write, |
1314 | .mmap = spufs_signal2_mmap, | 1325 | .mmap = spufs_signal2_mmap, |
1326 | .llseek = no_llseek, | ||
1315 | }; | 1327 | }; |
1316 | 1328 | ||
1317 | /* | 1329 | /* |
@@ -1451,6 +1463,7 @@ static const struct file_operations spufs_mss_fops = { | |||
1451 | .open = spufs_mss_open, | 1463 | .open = spufs_mss_open, |
1452 | .release = spufs_mss_release, | 1464 | .release = spufs_mss_release, |
1453 | .mmap = spufs_mss_mmap, | 1465 | .mmap = spufs_mss_mmap, |
1466 | .llseek = no_llseek, | ||
1454 | }; | 1467 | }; |
1455 | 1468 | ||
1456 | static int | 1469 | static int |
@@ -1508,6 +1521,7 @@ static const struct file_operations spufs_psmap_fops = { | |||
1508 | .open = spufs_psmap_open, | 1521 | .open = spufs_psmap_open, |
1509 | .release = spufs_psmap_release, | 1522 | .release = spufs_psmap_release, |
1510 | .mmap = spufs_psmap_mmap, | 1523 | .mmap = spufs_psmap_mmap, |
1524 | .llseek = no_llseek, | ||
1511 | }; | 1525 | }; |
1512 | 1526 | ||
1513 | 1527 | ||
@@ -1871,6 +1885,7 @@ static const struct file_operations spufs_mfc_fops = { | |||
1871 | .fsync = spufs_mfc_fsync, | 1885 | .fsync = spufs_mfc_fsync, |
1872 | .fasync = spufs_mfc_fasync, | 1886 | .fasync = spufs_mfc_fasync, |
1873 | .mmap = spufs_mfc_mmap, | 1887 | .mmap = spufs_mfc_mmap, |
1888 | .llseek = no_llseek, | ||
1874 | }; | 1889 | }; |
1875 | 1890 | ||
1876 | static int spufs_npc_set(void *data, u64 val) | 1891 | static int spufs_npc_set(void *data, u64 val) |
@@ -2246,6 +2261,7 @@ static ssize_t spufs_dma_info_read(struct file *file, char __user *buf, | |||
2246 | static const struct file_operations spufs_dma_info_fops = { | 2261 | static const struct file_operations spufs_dma_info_fops = { |
2247 | .open = spufs_info_open, | 2262 | .open = spufs_info_open, |
2248 | .read = spufs_dma_info_read, | 2263 | .read = spufs_dma_info_read, |
2264 | .llseek = no_llseek, | ||
2249 | }; | 2265 | }; |
2250 | 2266 | ||
2251 | static ssize_t __spufs_proxydma_info_read(struct spu_context *ctx, | 2267 | static ssize_t __spufs_proxydma_info_read(struct spu_context *ctx, |
@@ -2299,6 +2315,7 @@ static ssize_t spufs_proxydma_info_read(struct file *file, char __user *buf, | |||
2299 | static const struct file_operations spufs_proxydma_info_fops = { | 2315 | static const struct file_operations spufs_proxydma_info_fops = { |
2300 | .open = spufs_info_open, | 2316 | .open = spufs_info_open, |
2301 | .read = spufs_proxydma_info_read, | 2317 | .read = spufs_proxydma_info_read, |
2318 | .llseek = no_llseek, | ||
2302 | }; | 2319 | }; |
2303 | 2320 | ||
2304 | static int spufs_show_tid(struct seq_file *s, void *private) | 2321 | static int spufs_show_tid(struct seq_file *s, void *private) |
@@ -2585,6 +2602,7 @@ static const struct file_operations spufs_switch_log_fops = { | |||
2585 | .read = spufs_switch_log_read, | 2602 | .read = spufs_switch_log_read, |
2586 | .poll = spufs_switch_log_poll, | 2603 | .poll = spufs_switch_log_poll, |
2587 | .release = spufs_switch_log_release, | 2604 | .release = spufs_switch_log_release, |
2605 | .llseek = no_llseek, | ||
2588 | }; | 2606 | }; |
2589 | 2607 | ||
2590 | /** | 2608 | /** |