diff options
| author | Mark Brown <broonie@kernel.org> | 2026-07-06 13:00:36 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2026-07-06 13:00:36 +0100 |
| commit | 69c4514f08f94eb3870edce65f061d8dd7fc7fcc (patch) | |
| tree | f27b84cf125dea1920037509171a9b684efc8b0a /fs | |
| parent | 688c48b5cd5b57b0911852a1fc3c2426d3d7f887 (diff) | |
| parent | 92ea163c773cb4d0d5eaf103ed80c49d6758b96f (diff) | |
| download | linux-next-fs-current.tar.gz linux-next-fs-current.zip | |
Merge branch 'nfsd-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/cel/linuxfs-current
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/nfsd/nfsctl.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c index d0486f4a47ba..fa92e31d19d6 100644 --- a/fs/nfsd/nfsctl.c +++ b/fs/nfsd/nfsctl.c @@ -2340,14 +2340,15 @@ int nfsd_nl_unlock_filesystem_doit(struct sk_buff *skb, if (error) return error; - nfsd4_cancel_copy_by_sb(net, path.dentry->d_sb); error = nlmsvc_unlock_all_by_sb(path.dentry->d_sb); mutex_lock(&nfsd_mutex); - if (nn->nfsd_serv) + if (nn->nfsd_serv) { + nfsd4_cancel_copy_by_sb(net, path.dentry->d_sb); nfsd4_revoke_states(nn, path.dentry->d_sb); - else + } else { error = -EINVAL; + } mutex_unlock(&nfsd_mutex); path_put(&path); |