nfsd4: fail when delegreturn gets a non-delegation stateid
Previous cleanup reveals an obvious (though harmless) bug: when
delegreturn gets a stateid that isn't for a delegation, it should return
an error rather than doing nothing.
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index 3570a0d..6ae28e6 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -2418,10 +2418,9 @@
status = nfserr_stale_stateid;
if (STALE_STATEID(stateid))
goto out;
- status = nfs_ok;
+ status = nfserr_bad_stateid;
if (!is_delegation_stateid(stateid))
goto out;
- status = nfserr_bad_stateid;
dp = find_delegation_stateid(inode, stateid);
if (!dp)
goto out;