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>

7 files changed, 0 insertions, 18 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 = {
 
 static const struct file_operations zero_fops = {
         .llseek         = zero_lseek,
-        .read           = new_sync_read,
         .write          = write_zero,
         .read_iter      = read_iter_zero,
         .aio_write      = aio_write_zero,
@@ -776,7 +775,6 @@ static const struct file_operations zero_fops = {
 
 static const struct file_operations full_fops = {
         .llseek         = full_lseek,
-        .read           = new_sync_read,
         .read_iter      = read_iter_zero,
         .write          = write_full,
 };
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,
 #endif
 
 static const struct file_operations raw_fops = {
-        .read           = new_sync_read,
         .read_iter      = blkdev_read_iter,
-        .write          = new_sync_write,
         .write_iter     = blkdev_write_iter,
         .fsync          = blkdev_fsync,
         .open           = raw_open,
diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c
index 8362aef0c15e..9c91ff872485 100644
--- a/drivers/net/macvtap.c
+++ b/drivers/net/macvtap.c
@@ -1118,8 +1118,6 @@ static const struct file_operations macvtap_fops = {
         .owner          = THIS_MODULE,
         .open           = macvtap_open,
         .release        = macvtap_release,
-        .read           = new_sync_read,
-        .write          = new_sync_write,
         .read_iter      = macvtap_read_iter,
         .write_iter     = macvtap_write_iter,
         .poll           = macvtap_poll,
diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index b96b94cee760..e470ae59d405 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -2223,8 +2223,6 @@ static void tun_chr_show_fdinfo(struct seq_file *m, struct file *f)
 static const struct file_operations tun_fops = {
         .owner  = THIS_MODULE,
         .llseek = no_llseek,
-        .read  = new_sync_read,
-        .write = new_sync_write,
         .read_iter  = tun_chr_read_iter,
         .write_iter = tun_chr_write_iter,
         .poll   = tun_chr_poll,
diff --git a/drivers/staging/lustre/lustre/llite/file.c b/drivers/staging/lustre/lustre/llite/file.c
index 5ebee6ca0a10..d73111ef949e 100644
--- a/drivers/staging/lustre/lustre/llite/file.c
+++ b/drivers/staging/lustre/lustre/llite/file.c
@@ -3128,9 +3128,7 @@ int ll_inode_permission(struct inode *inode, int mask)
 
 /* -o localflock - only provides locally consistent flock locks */
 struct file_operations ll_file_operations = {
-        .read      = new_sync_read,
         .read_iter = ll_file_read_iter,
-        .write    = new_sync_write,
         .write_iter = ll_file_write_iter,
         .unlocked_ioctl = ll_file_ioctl,
         .open      = ll_file_open,
@@ -3143,9 +3141,7 @@ struct file_operations ll_file_operations = {
 };
 
 struct file_operations ll_file_operations_flock = {
-        .read      = new_sync_read,
         .read_iter    = ll_file_read_iter,
-        .write    = new_sync_write,
         .write_iter   = ll_file_write_iter,
         .unlocked_ioctl = ll_file_ioctl,
         .open      = ll_file_open,
@@ -3161,9 +3157,7 @@ struct file_operations ll_file_operations_flock = {
 
 /* These are for -o noflock - to return ENOSYS on flock calls */
 struct file_operations ll_file_operations_noflock = {
-        .read      = new_sync_read,
         .read_iter    = ll_file_read_iter,
-        .write    = new_sync_write,
         .write_iter   = ll_file_write_iter,
         .unlocked_ioctl = ll_file_ioctl,
         .open      = ll_file_open,
diff --git a/drivers/usb/gadget/function/f_fs.c b/drivers/usb/gadget/function/f_fs.c
index a12315a78248..6bdb57069044 100644
--- a/drivers/usb/gadget/function/f_fs.c
+++ b/drivers/usb/gadget/function/f_fs.c
@@ -1061,8 +1061,6 @@ static const struct file_operations ffs_epfile_operations = {
         .llseek =       no_llseek,
 
         .open =         ffs_epfile_open,
-        .write =        new_sync_write,
-        .read =         new_sync_read,
         .write_iter =   ffs_epfile_write_iter,
         .read_iter =    ffs_epfile_read_iter,
         .release =      ffs_epfile_release,
diff --git a/drivers/usb/gadget/legacy/inode.c b/drivers/usb/gadget/legacy/inode.c
index 662ef2c1c62b..6af58c6dba5e 100644
--- a/drivers/usb/gadget/legacy/inode.c
+++ b/drivers/usb/gadget/legacy/inode.c
@@ -699,8 +699,6 @@ static const struct file_operations ep_io_operations = {
         .open =         ep_open,
         .release =      ep_release,
         .llseek =       no_llseek,
-        .read =         new_sync_read,
-        .write =        new_sync_write,
         .unlocked_ioctl = ep_ioctl,
         .read_iter =    ep_read_iter,
         .write_iter =   ep_write_iter,