Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[PATCH] nfsd4: fix fh_expire_type

After discussion at the recent NFSv4 bake-a-thon, I realized that my
assumption that NFS4_FH_PERSISTENT required filehandles to persist was a
misreading of the spec. This also fixes an interoperability problem with the
Solaris client.

Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

authored by

NeilBrown and committed by
Linus Torvalds
e34ac862 4c4cd222

+2 -2
+2 -2
fs/nfsd/nfs4xdr.c
··· 1366 1366 if ((buflen -= 4) < 0) 1367 1367 goto out_resource; 1368 1368 if (exp->ex_flags & NFSEXP_NOSUBTREECHECK) 1369 - WRITE32(NFS4_FH_VOLATILE_ANY); 1369 + WRITE32(NFS4_FH_PERSISTENT); 1370 1370 else 1371 - WRITE32(NFS4_FH_VOLATILE_ANY|NFS4_FH_VOL_RENAME); 1371 + WRITE32(NFS4_FH_PERSISTENT|NFS4_FH_VOL_RENAME); 1372 1372 } 1373 1373 if (bmval0 & FATTR4_WORD0_CHANGE) { 1374 1374 /*