summaryrefslogtreecommitdiffstats
path: root/fs/nfsd/nfs4recover.c
diff options
context:
space:
mode:
authorJ. Bruce Fields <bfields@redhat.com>2010-11-24 17:30:54 -0500
committerJ. Bruce Fields <bfields@redhat.com>2010-12-17 15:48:01 -0500
commite203d506bd221bfa5b3acbb7336ae7b7646636a4 (patch)
tree237901e3b618d50f7ab65ff86dde3aaf1497c09f /fs/nfsd/nfs4recover.c
parent6e5f15c93dc745d46c2bb9e4597b44463203844b (diff)
downloadop-kernel-dev-e203d506bd221bfa5b3acbb7336ae7b7646636a4.zip
op-kernel-dev-e203d506bd221bfa5b3acbb7336ae7b7646636a4.tar.gz
nfsd4: fix mixed 4.0/4.1 handling, 4.1 reboot
Instead of failing to find client entries which don't match the minorversion, we should be finding them, then either erroring out or expiring them as appropriate. This also fixes a problem which would cause the 4.1 server to fail to recognize clients after a second reboot. Reported-by: Casey Bodley <cbodley@citi.umich.edu> Reviewed-by: Benny Halevy <bhalevy@panasas.com> Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfsd/nfs4recover.c')
-rw-r--r--fs/nfsd/nfs4recover.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/nfsd/nfs4recover.c b/fs/nfsd/nfs4recover.c
index 7e26caa..ffb59ef 100644
--- a/fs/nfsd/nfs4recover.c
+++ b/fs/nfsd/nfs4recover.c
@@ -302,7 +302,6 @@ purge_old(struct dentry *parent, struct dentry *child)
{
int status;
- /* note: we currently use this path only for minorversion 0 */
if (nfs4_has_reclaimed_state(child->d_name.name, false))
return 0;
OpenPOWER on IntegriCloud