Commit 11598b8f authored by Anna Schumaker's avatar Anna Schumaker Committed by Trond Myklebust

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: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
parent c86c90c6
...@@ -690,8 +690,6 @@ static int nfs_pgio_error(struct nfs_pageio_descriptor *desc, ...@@ -690,8 +690,6 @@ static int nfs_pgio_error(struct nfs_pageio_descriptor *desc,
static void nfs_pgio_release(void *calldata) static void nfs_pgio_release(void *calldata)
{ {
struct nfs_pgio_header *hdr = calldata; struct nfs_pgio_header *hdr = calldata;
if (hdr->rw_ops->rw_release)
hdr->rw_ops->rw_release(hdr);
nfs_pgio_data_destroy(hdr); nfs_pgio_data_destroy(hdr);
hdr->completion_ops->completion(hdr); hdr->completion_ops->completion(hdr);
} }
......
...@@ -1347,11 +1347,6 @@ void nfs_commit_prepare(struct rpc_task *task, void *calldata) ...@@ -1347,11 +1347,6 @@ void nfs_commit_prepare(struct rpc_task *task, void *calldata)
NFS_PROTO(data->inode)->commit_rpc_prepare(task, data); NFS_PROTO(data->inode)->commit_rpc_prepare(task, data);
} }
static void nfs_writeback_release_common(struct nfs_pgio_header *hdr)
{
/* do nothing! */
}
/* /*
* Special version of should_remove_suid() that ignores capabilities. * Special version of should_remove_suid() that ignores capabilities.
*/ */
...@@ -2012,7 +2007,6 @@ static const struct nfs_rw_ops nfs_rw_write_ops = { ...@@ -2012,7 +2007,6 @@ static const struct nfs_rw_ops nfs_rw_write_ops = {
.rw_mode = FMODE_WRITE, .rw_mode = FMODE_WRITE,
.rw_alloc_header = nfs_writehdr_alloc, .rw_alloc_header = nfs_writehdr_alloc,
.rw_free_header = nfs_writehdr_free, .rw_free_header = nfs_writehdr_free,
.rw_release = nfs_writeback_release_common,
.rw_done = nfs_writeback_done, .rw_done = nfs_writeback_done,
.rw_result = nfs_writeback_result, .rw_result = nfs_writeback_result,
.rw_initiate = nfs_initiate_write, .rw_initiate = nfs_initiate_write,
......
...@@ -67,7 +67,6 @@ struct nfs_rw_ops { ...@@ -67,7 +67,6 @@ struct nfs_rw_ops {
const fmode_t rw_mode; const fmode_t rw_mode;
struct nfs_pgio_header *(*rw_alloc_header)(void); struct nfs_pgio_header *(*rw_alloc_header)(void);
void (*rw_free_header)(struct nfs_pgio_header *); void (*rw_free_header)(struct nfs_pgio_header *);
void (*rw_release)(struct nfs_pgio_header *);
int (*rw_done)(struct rpc_task *, struct nfs_pgio_header *, int (*rw_done)(struct rpc_task *, struct nfs_pgio_header *,
struct inode *); struct inode *);
void (*rw_result)(struct rpc_task *, struct nfs_pgio_header *); void (*rw_result)(struct rpc_task *, struct nfs_pgio_header *);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment