From: J. Bruce Fields Date: Thu, 22 Apr 2010 20:21:39 +0000 (-0400) Subject: Revert "nfsd4: distinguish expired from stale stateids" X-Git-Tag: cont_sys_log_2~3^2~2 X-Git-Url: http://ftp.safe.ca/?p=safe%2Fjmp%2Flinux-2.6;a=commitdiff_plain;h=e4e83ea47babd9d4bf95a13aed87f8ef51e46472;hp=e4e83ea47babd9d4bf95a13aed87f8ef51e46472 Revert "nfsd4: distinguish expired from stale stateids" This reverts commit 78155ed75f470710f2aecb3e75e3d97107ba8374. We're depending here on the boot time that we use to generate the stateid being monotonic, but get_seconds() is not necessarily. We still depend at least on boot_time being different every time, but that is a safer bet. We have a few reports of errors that might be explained by this problem, though we haven't been able to confirm any of them. But the minor gain of distinguishing expired from stale errors seems not worth the risk. Conflicts: fs/nfsd/nfs4state.c Signed-off-by: J. Bruce Fields ---