| nfs_clnode.c (197048) | nfs_clnode.c (207082) |
|---|---|
| 1/*- 2 * Copyright (c) 1989, 1993 3 * The Regents of the University of California. All rights reserved. 4 * 5 * This code is derived from software contributed to Berkeley by 6 * Rick Macklem at The University of Guelph. 7 * 8 * Redistribution and use in source and binary forms, with or without --- 19 unchanged lines hidden (view full) --- 28 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 29 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 30 * SUCH DAMAGE. 31 * 32 * from nfs_node.c 8.6 (Berkeley) 5/22/95 33 */ 34 35#include <sys/cdefs.h> | 1/*- 2 * Copyright (c) 1989, 1993 3 * The Regents of the University of California. All rights reserved. 4 * 5 * This code is derived from software contributed to Berkeley by 6 * Rick Macklem at The University of Guelph. 7 * 8 * Redistribution and use in source and binary forms, with or without --- 19 unchanged lines hidden (view full) --- 28 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 29 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 30 * SUCH DAMAGE. 31 * 32 * from nfs_node.c 8.6 (Berkeley) 5/22/95 33 */ 34 35#include <sys/cdefs.h> |
| 36__FBSDID("$FreeBSD: head/sys/fs/nfsclient/nfs_clnode.c 197048 2009-09-09 20:37:49Z rmacklem $"); | 36__FBSDID("$FreeBSD: head/sys/fs/nfsclient/nfs_clnode.c 207082 2010-04-22 23:51:01Z rmacklem $"); |
| 37 38#include <sys/param.h> 39#include <sys/systm.h> 40#include <sys/lock.h> 41#include <sys/malloc.h> 42#include <sys/mount.h> 43#include <sys/namei.h> 44#include <sys/proc.h> --- 149 unchanged lines hidden (view full) --- 194 if (NFS_ISV4(vp) && vp->v_type == VREG) { 195 /* 196 * Since mmap()'d files do I/O after VOP_CLOSE(), the NFSv4 197 * Close operations are delayed until now. Any dirty buffers 198 * must be flushed before the close, so that the stateid is 199 * available for the writes. 200 */ 201 if (nfscl_mustflush(vp)) | 37 38#include <sys/param.h> 39#include <sys/systm.h> 40#include <sys/lock.h> 41#include <sys/malloc.h> 42#include <sys/mount.h> 43#include <sys/namei.h> 44#include <sys/proc.h> --- 149 unchanged lines hidden (view full) --- 194 if (NFS_ISV4(vp) && vp->v_type == VREG) { 195 /* 196 * Since mmap()'d files do I/O after VOP_CLOSE(), the NFSv4 197 * Close operations are delayed until now. Any dirty buffers 198 * must be flushed before the close, so that the stateid is 199 * available for the writes. 200 */ 201 if (nfscl_mustflush(vp)) |
| 202 (void) ncl_flush(vp, MNT_WAIT, NULL, ap->a_td, 1); | 202 (void) ncl_flush(vp, MNT_WAIT, NULL, ap->a_td, 1, 0); |
| 203 (void) nfsrpc_close(vp, 1, ap->a_td); 204 } 205 206 if (vp->v_type != VDIR) { 207 sp = np->n_sillyrename; 208 np->n_sillyrename = NULL; 209 } else 210 sp = NULL; --- 86 unchanged lines hidden --- | 203 (void) nfsrpc_close(vp, 1, ap->a_td); 204 } 205 206 if (vp->v_type != VDIR) { 207 sp = np->n_sillyrename; 208 np->n_sillyrename = NULL; 209 } else 210 sp = NULL; --- 86 unchanged lines hidden --- |