summaryrefslogtreecommitdiffstats
path: root/sys/fs
diff options
context:
space:
mode:
authorrmacklem <rmacklem@FreeBSD.org>2010-04-28 23:16:21 +0000
committerrmacklem <rmacklem@FreeBSD.org>2010-04-28 23:16:21 +0000
commita101ef6559ba33feff4e60757b06a186082bc97d (patch)
treee0fe7e2d889f4a4935c7b19a9a9fa9977a7440e1 /sys/fs
parente2e8a8241277c6ae0d4908670d9baf2b2c538602 (diff)
downloadFreeBSD-src-a101ef6559ba33feff4e60757b06a186082bc97d.zip
FreeBSD-src-a101ef6559ba33feff4e60757b06a186082bc97d.tar.gz
For the experimental NFS client, it should always flush dirty
buffers before closing the NFSv4 opens, as the comment states. This patch deletes the call to nfscl_mustflush() which would return 0 for the case where a delegation still exists, which was incorrect and could cause crashes during recovery from an expired lease. MFC after: 1 week
Diffstat (limited to 'sys/fs')
-rw-r--r--sys/fs/nfsclient/nfs_clnode.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/sys/fs/nfsclient/nfs_clnode.c b/sys/fs/nfsclient/nfs_clnode.c
index c133742..e36431f 100644
--- a/sys/fs/nfsclient/nfs_clnode.c
+++ b/sys/fs/nfsclient/nfs_clnode.c
@@ -198,8 +198,7 @@ ncl_inactive(struct vop_inactive_args *ap)
* must be flushed before the close, so that the stateid is
* available for the writes.
*/
- if (nfscl_mustflush(vp))
- (void) ncl_flush(vp, MNT_WAIT, NULL, ap->a_td, 1, 0);
+ (void) ncl_flush(vp, MNT_WAIT, NULL, ap->a_td, 1, 0);
(void) nfsrpc_close(vp, 1, ap->a_td);
}
OpenPOWER on IntegriCloud