diff options
| author |   Trond Myklebust <trond.myklebust@hammerspace.com> | 2018-05-30 16:11:52 -0400 |
|---|---|---|
| committer | Trond Myklebust <trond.myklebust@hammerspace.com> | 2018-05-31 15:02:16 -0400 |
| commit | ed7e9ad0908a8c2a502f49ceed940d0ce122fe8b (patch) | |
| tree | 45c6f3d289a084cae5415695591bb9ad7316f6cd /fs/nfs/nfs4proc.c | |
| parent | NFSv4: Only pass the delegation to setattr if we're sending a truncate (diff) | |
| download | linux-dev-ed7e9ad0908a8c2a502f49ceed940d0ce122fe8b.tar.xz linux-dev-ed7e9ad0908a8c2a502f49ceed940d0ce122fe8b.zip | |
NFSv4: Fix sillyrename to return the delegation when appropriate
Ensure that we pass down the inode of the file being deleted so
that we can return any delegation being held.
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Diffstat (limited to 'fs/nfs/nfs4proc.c')
| -rw-r--r-- | fs/nfs/nfs4proc.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index 844eafbf1564..d21c5e4220a0 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -4260,11 +4260,12 @@ static int nfs4_proc_rmdir(struct inode *dir, const struct qstr *name) return err; } -static void nfs4_proc_unlink_setup(struct rpc_message *msg, struct dentry *dentry) +static void nfs4_proc_unlink_setup(struct rpc_message *msg, + struct dentry *dentry, + struct inode *inode) { struct nfs_removeargs *args = msg->rpc_argp; struct nfs_removeres *res = msg->rpc_resp; - struct inode *inode = d_inode(dentry); res->server = NFS_SB(dentry->d_sb); msg->rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_REMOVE]; |