diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2015-04-03 15:41:18 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2015-04-11 22:29:40 -0400 |
commit | 5d5d568975307877e9195f5305f4240e506a2807 (patch) | |
tree | b58d5b1af9e77189357b95f5cb0dc635bba65285 /drivers/char | |
parent | 86cc05840a0da1afcb6b8151b53f3b606457c91b (diff) |
make new_sync_{read,write}() static
All places outside of core VFS that checked ->read and ->write for being NULL or
called the methods directly are gone now, so NULL {read,write} with non-NULL
{read,write}_iter will do the right thing in all cases.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'drivers/char')
-rw-r--r-- | drivers/char/mem.c | 2 | ||||
-rw-r--r-- | drivers/char/raw.c | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/drivers/char/mem.c b/drivers/char/mem.c index 9c4fd7a8e2e5..ad08400491ae 100644 --- a/drivers/char/mem.c +++ b/drivers/char/mem.c | |||
@@ -764,7 +764,6 @@ static const struct file_operations __maybe_unused port_fops = { | |||
764 | 764 | ||
765 | static const struct file_operations zero_fops = { | 765 | static const struct file_operations zero_fops = { |
766 | .llseek = zero_lseek, | 766 | .llseek = zero_lseek, |
767 | .read = new_sync_read, | ||
768 | .write = write_zero, | 767 | .write = write_zero, |
769 | .read_iter = read_iter_zero, | 768 | .read_iter = read_iter_zero, |
770 | .aio_write = aio_write_zero, | 769 | .aio_write = aio_write_zero, |
@@ -776,7 +775,6 @@ static const struct file_operations zero_fops = { | |||
776 | 775 | ||
777 | static const struct file_operations full_fops = { | 776 | static const struct file_operations full_fops = { |
778 | .llseek = full_lseek, | 777 | .llseek = full_lseek, |
779 | .read = new_sync_read, | ||
780 | .read_iter = read_iter_zero, | 778 | .read_iter = read_iter_zero, |
781 | .write = write_full, | 779 | .write = write_full, |
782 | }; | 780 | }; |
diff --git a/drivers/char/raw.c b/drivers/char/raw.c index 6e29bf2db536..5fc291c6157e 100644 --- a/drivers/char/raw.c +++ b/drivers/char/raw.c | |||
@@ -282,9 +282,7 @@ static long raw_ctl_compat_ioctl(struct file *file, unsigned int cmd, | |||
282 | #endif | 282 | #endif |
283 | 283 | ||
284 | static const struct file_operations raw_fops = { | 284 | static const struct file_operations raw_fops = { |
285 | .read = new_sync_read, | ||
286 | .read_iter = blkdev_read_iter, | 285 | .read_iter = blkdev_read_iter, |
287 | .write = new_sync_write, | ||
288 | .write_iter = blkdev_write_iter, | 286 | .write_iter = blkdev_write_iter, |
289 | .fsync = blkdev_fsync, | 287 | .fsync = blkdev_fsync, |
290 | .open = raw_open, | 288 | .open = raw_open, |