Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 13602896 authored by Fred Isaman's avatar Fred Isaman Committed by Trond Myklebust
Browse files

NFS: change nfs_writeback_done to return void 



The return values are not used by any callers.

Signed-off-by: default avatarFred Isaman <iisaman@netapp.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 83762c56

fs/nfs/write.c

+4 −4
Original line number Diff line number Diff line
@@ -1132,7 +1132,7 @@ static const struct rpc_call_ops nfs_write_full_ops = { 
/*

 * This function is called when the WRITE call is complete.

 */

int nfs_writeback_done(struct rpc_task *task, struct nfs_write_data *data)

void nfs_writeback_done(struct rpc_task *task, struct nfs_write_data *data)

{

	struct nfs_writeargs	*argp = &data->args;

	struct nfs_writeres	*resp = &data->res;
@@ -1151,7 +1151,7 @@ int nfs_writeback_done(struct rpc_task *task, struct nfs_write_data *data) 
	 */

	status = NFS_PROTO(data->inode)->write_done(task, data);

	if (status != 0)

		return status;

		return;

	nfs_add_stats(data->inode, NFSIOS_SERVERWRITTENBYTES, resp->count);



#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) 
				argp->stable = NFS_FILE_SYNC;

			}

			nfs_restart_rpc(task, server->nfs_client);

			return -EAGAIN;

			return;

		}

		if (time_before(complain, jiffies)) {

			printk(KERN_WARNING
@@ -1207,7 +1207,7 @@ int nfs_writeback_done(struct rpc_task *task, struct nfs_write_data *data) 
		/* Can't do anything about it except throw an error. */

		task->tk_status = -EIO;

	}

	return 0;

	return;

}

include/linux/nfs_fs.h

+1 −1
Original line number Diff line number Diff line
@@ -501,7 +501,7 @@ extern int nfs_writepage(struct page *page, struct writeback_control *wbc); 
extern int  nfs_writepages(struct address_space *, struct writeback_control *);

extern int  nfs_flush_incompatible(struct file *file, struct page *page);

extern int  nfs_updatepage(struct file *, struct page *, unsigned int, unsigned int);

extern int nfs_writeback_done(struct rpc_task *, struct nfs_write_data *);

extern void nfs_writeback_done(struct rpc_task *, struct nfs_write_data *);



/*

 * Try to write back everything synchronously (but check the