summaryrefslogtreecommitdiffstats
path: root/fs/nfsd/nfs4recover.c
diff options
context:
space:
mode:
authorJ. Bruce Fields <bfields@redhat.com>2010-11-24 23:30:54 +0100
committerJ. Bruce Fields <bfields@redhat.com>2010-12-17 21:48:01 +0100
commite203d506bd221bfa5b3acbb7336ae7b7646636a4 (patch)
tree237901e3b618d50f7ab65ff86dde3aaf1497c09f /fs/nfsd/nfs4recover.c
parentnfsd4: replace unintuitive match_clientid_establishment (diff)
downloadlinux-e203d506bd221bfa5b3acbb7336ae7b7646636a4.tar.xz
linux-e203d506bd221bfa5b3acbb7336ae7b7646636a4.zip
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 7e26caab2a26..ffb59ef6f82f 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;