diff options
| author |   Trond Myklebust <trond.myklebust@hammerspace.com> | 2021-10-10 10:58:12 +0200 |
|---|---|---|
| committer | Trond Myklebust <trond.myklebust@hammerspace.com> | 2021-10-20 18:09:53 -0400 |
| commit | 6e176d47160cec8bcaa28d9aa06926d72d54237c (patch) | |
| tree | 7629a45968af72e96fa51814e5e1be52d08441ab /fs/nfs/delegation.c | |
| parent | NFS: Fix an Oops in pnfs_mark_request_commit() (diff) | |
| download | linux-dev-6e176d47160cec8bcaa28d9aa06926d72d54237c.tar.xz linux-dev-6e176d47160cec8bcaa28d9aa06926d72d54237c.zip | |
NFSv4: Fixes for nfs4_inode_return_delegation()
We mustn't call nfs_wb_all() on anything other than a regular file.
Furthermore, we can exit early when we don't hold a delegation.
Reported-by: David Wysochanski <dwysocha@redhat.com>
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Diffstat (limited to 'fs/nfs/delegation.c')
| -rw-r--r-- | fs/nfs/delegation.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/fs/nfs/delegation.c b/fs/nfs/delegation.c index 11118398f495..7c9eb679dbdb 100644 --- a/fs/nfs/delegation.c +++ b/fs/nfs/delegation.c @@ -755,11 +755,13 @@ int nfs4_inode_return_delegation(struct inode *inode) struct nfs_delegation *delegation; delegation = nfs_start_delegation_return(nfsi); - /* Synchronous recall of any application leases */ - break_lease(inode, O_WRONLY | O_RDWR); - nfs_wb_all(inode); - if (delegation != NULL) + if (delegation != NULL) { + /* Synchronous recall of any application leases */ + break_lease(inode, O_WRONLY | O_RDWR); + if (S_ISREG(inode->i_mode)) + nfs_wb_all(inode); return nfs_end_delegation_return(inode, delegation, 1); + } return 0; } |