aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2005-10-18 17:20:20 -0400
committerTrond Myklebust <Trond.Myklebust@netapp.com>2005-10-18 17:20:20 -0400
commitb8e5c4c2978fa666287525a9de2fa648a7581262 (patch)
treeb90d9aca86dcb187d985be1eb39e5f691dfcf187
parent642ac54923e0291ae2c8e42edde18d8c9c0a3c84 (diff)
NFSv4: If a delegated open fails, ensure that we return the delegation
Unless of course the open fails due to permission issues. Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
-rw-r--r--fs/nfs/nfs4proc.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index c10dcd12af51..a8be9af610ac 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -658,6 +658,8 @@ out_err:
658 } 658 }
659 up_read(&nfsi->rwsem); 659 up_read(&nfsi->rwsem);
660 up_read(&clp->cl_sem); 660 up_read(&clp->cl_sem);
661 if (err != -EACCES)
662 nfs_inode_return_delegation(inode);
661 return err; 663 return err;
662} 664}
663 665