aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFred Isaman <iisaman@netapp.com>2011-02-11 10:42:38 -0500
committerTrond Myklebust <Trond.Myklebust@netapp.com>2011-03-11 15:38:40 -0500
commit136028967a283929c6f01518d0700b73fa622d56 (patch)
tree14c55e191897a726c6cedb09a988d2f07e0e3da4
parent83762c56c1ba7c5b4b92fb32d570661633228bc6 (diff)
NFS: change nfs_writeback_done to return void
The return values are not used by any callers. Signed-off-by: Fred Isaman <iisaman@netapp.com> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
-rw-r--r--fs/nfs/write.c8
-rw-r--r--include/linux/nfs_fs.h2
2 files changed, 5 insertions, 5 deletions
diff --git a/fs/nfs/write.c b/fs/nfs/write.c
index 42b92d7a9cc4..ae528b98b804 100644
--- a/fs/nfs/write.c
+++ b/fs/nfs/write.c
@@ -1132,7 +1132,7 @@ static const struct rpc_call_ops nfs_write_full_ops = {
1132/* 1132/*
1133 * This function is called when the WRITE call is complete. 1133 * This function is called when the WRITE call is complete.
1134 */ 1134 */
1135int nfs_writeback_done(struct rpc_task *task, struct nfs_write_data *data) 1135void nfs_writeback_done(struct rpc_task *task, struct nfs_write_data *data)
1136{ 1136{
1137 struct nfs_writeargs *argp = &data->args; 1137 struct nfs_writeargs *argp = &data->args;
1138 struct nfs_writeres *resp = &data->res; 1138 struct nfs_writeres *resp = &data->res;
@@ -1151,7 +1151,7 @@ int nfs_writeback_done(struct rpc_task *task, struct nfs_write_data *data)
1151 */ 1151 */
1152 status = NFS_PROTO(data->inode)->write_done(task, data); 1152 status = NFS_PROTO(data->inode)->write_done(task, data);
1153 if (status != 0) 1153 if (status != 0)
1154 return status; 1154 return;
1155 nfs_add_stats(data->inode, NFSIOS_SERVERWRITTENBYTES, resp->count); 1155 nfs_add_stats(data->inode, NFSIOS_SERVERWRITTENBYTES, resp->count);
1156 1156
1157#if defined(CONFIG_NFS_V3) || defined(CONFIG_NFS_V4) 1157#if defined(CONFIG_NFS_V3) || defined(CONFIG_NFS_V4)
@@ -1196,7 +1196,7 @@ int nfs_writeback_done(struct rpc_task *task, struct nfs_write_data *data)
1196 argp->stable = NFS_FILE_SYNC; 1196 argp->stable = NFS_FILE_SYNC;
1197 } 1197 }
1198 nfs_restart_rpc(task, server->nfs_client); 1198 nfs_restart_rpc(task, server->nfs_client);
1199 return -EAGAIN; 1199 return;
1200 } 1200 }
1201 if (time_before(complain, jiffies)) { 1201 if (time_before(complain, jiffies)) {
1202 printk(KERN_WARNING 1202 printk(KERN_WARNING
@@ -1207,7 +1207,7 @@ int nfs_writeback_done(struct rpc_task *task, struct nfs_write_data *data)
1207 /* Can't do anything about it except throw an error. */ 1207 /* Can't do anything about it except throw an error. */
1208 task->tk_status = -EIO; 1208 task->tk_status = -EIO;
1209 } 1209 }
1210 return 0; 1210 return;
1211} 1211}
1212 1212
1213 1213
diff --git a/include/linux/nfs_fs.h b/include/linux/nfs_fs.h
index 6023efa9f5d9..f88522b10a38 100644
--- a/include/linux/nfs_fs.h
+++ b/include/linux/nfs_fs.h
@@ -501,7 +501,7 @@ extern int nfs_writepage(struct page *page, struct writeback_control *wbc);
501extern int nfs_writepages(struct address_space *, struct writeback_control *); 501extern int nfs_writepages(struct address_space *, struct writeback_control *);
502extern int nfs_flush_incompatible(struct file *file, struct page *page); 502extern int nfs_flush_incompatible(struct file *file, struct page *page);
503extern int nfs_updatepage(struct file *, struct page *, unsigned int, unsigned int); 503extern int nfs_updatepage(struct file *, struct page *, unsigned int, unsigned int);
504extern int nfs_writeback_done(struct rpc_task *, struct nfs_write_data *); 504extern void nfs_writeback_done(struct rpc_task *, struct nfs_write_data *);
505 505
506/* 506/*
507 * Try to write back everything synchronously (but check the 507 * Try to write back everything synchronously (but check the