This reverts commit 9f47c0b97353c433f6c83a1bc665ea76eb12e25f.
---
fs/nfsd/nfs4state.c | 7 -------
1 file changed, 7 deletions(-)
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index d2256d8..84fa1af 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -3556,15 +3556,8 @@ __be32 nfsd4_lookup_stateid(stateid_t *stateid, unsigned char typemask,
if (ZERO_STATEID(stateid) || ONE_STATEID(stateid))
status = nfserr_bad_stateid;
else
-#ifdef CONFIG_GFS2_FS_LOCKING_DLM
- {
- dprintk("%s Don't check DS stateid\n", __func__);
- return 0;
- }
-#else /* CONFIG_GFS2_FS_LOCKING_DLM */
status = nfs4_preprocess_pnfs_ds_stateid(current_fh,
stateid);
-#endif /* CONFIG_GFS2_FS_LOCKING_DLM */
goto out;
}
#endif /* CONFIG_PNFSD */
--
1.7.11.7
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
