Signed-off-by: Fred Isaman <iisaman@xxxxxxxxxx> --- fs/nfs/nfs4proc.c | 15 +-------------- 1 files changed, 1 insertions(+), 14 deletions(-) diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index 0ac77a6..d29ed4b 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -5662,7 +5662,7 @@ static const struct rpc_call_ops nfs4_layoutreturn_call_ops = { .rpc_release = nfs4_layoutreturn_release, }; -int _nfs4_proc_layoutreturn(struct nfs4_layoutreturn *lrp, bool issync) +int nfs4_proc_layoutreturn(struct nfs4_layoutreturn *lrp, bool issync) { struct inode *ino = lrp->args.inode; struct nfs_server *server = NFS_SERVER(ino); @@ -5698,19 +5698,6 @@ out: return status; } -int nfs4_proc_layoutreturn(struct nfs4_layoutreturn *lrp, bool issync) -{ - struct nfs_server *server = NFS_SERVER(lrp->args.inode); - struct nfs4_exception exception = { }; - int err; - do { - err = nfs4_handle_exception(server, - _nfs4_proc_layoutreturn(lrp, issync), - &exception); - } while (exception.retry); - return err; -} - static int _nfs4_proc_getdeviceinfo(struct nfs_server *server, struct pnfs_device *pdev) { -- 1.7.2.1 -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html