Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

NFS: Remove unused nfs_rw_ops->rw_release() function

This was only ever set to nfs_writeback_release_common(), a function
which is completely empty. Let's just drop this function pointer and
simplify the code a bit.

Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>

authored by

Anna Schumaker and committed by
Trond Myklebust
11598b8f c86c90c6

-9
-2
fs/nfs/pagelist.c
··· 690 690 static void nfs_pgio_release(void *calldata) 691 691 { 692 692 struct nfs_pgio_header *hdr = calldata; 693 - if (hdr->rw_ops->rw_release) 694 - hdr->rw_ops->rw_release(hdr); 695 693 nfs_pgio_data_destroy(hdr); 696 694 hdr->completion_ops->completion(hdr); 697 695 }
-6
fs/nfs/write.c
··· 1347 1347 NFS_PROTO(data->inode)->commit_rpc_prepare(task, data); 1348 1348 } 1349 1349 1350 - static void nfs_writeback_release_common(struct nfs_pgio_header *hdr) 1351 - { 1352 - /* do nothing! */ 1353 - } 1354 - 1355 1350 /* 1356 1351 * Special version of should_remove_suid() that ignores capabilities. 1357 1352 */ ··· 2007 2012 .rw_mode = FMODE_WRITE, 2008 2013 .rw_alloc_header = nfs_writehdr_alloc, 2009 2014 .rw_free_header = nfs_writehdr_free, 2010 - .rw_release = nfs_writeback_release_common, 2011 2015 .rw_done = nfs_writeback_done, 2012 2016 .rw_result = nfs_writeback_result, 2013 2017 .rw_initiate = nfs_initiate_write,
-1
include/linux/nfs_page.h
··· 67 67 const fmode_t rw_mode; 68 68 struct nfs_pgio_header *(*rw_alloc_header)(void); 69 69 void (*rw_free_header)(struct nfs_pgio_header *); 70 - void (*rw_release)(struct nfs_pgio_header *); 71 70 int (*rw_done)(struct rpc_task *, struct nfs_pgio_header *, 72 71 struct inode *); 73 72 void (*rw_result)(struct rpc_task *, struct nfs_pgio_header *);