summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryamt <yamt@NetBSD.org>2006-10-14 09:18:57 +0000
committeryamt <yamt@NetBSD.org>2006-10-14 09:18:57 +0000
commit583781abd34ea531c04496efe355e32c7da3ddee (patch)
tree3b4e86d5cd1d3420f422ab9bf4d74e7a67d88fe8
parent560c0c565c102d49d146b251b9fb429142056233 (diff)
grab glock when calling uvm_unp_setsize, so that it doesn't interfere
mmap'ed accesses. this fixes an assertion failure in in nfs_doio_read. ("vp->v_size >= uiop->uio_offset + uiop->uio_resid")
-rw-r--r--sys/nfs/nfs_subs.c10
-rw-r--r--sys/nfs/nfs_vnops.c20
2 files changed, 21 insertions, 9 deletions
diff --git a/sys/nfs/nfs_subs.c b/sys/nfs/nfs_subs.c
index 601af7df1b2..196bdc7d16b 100644
--- a/sys/nfs/nfs_subs.c
+++ b/sys/nfs/nfs_subs.c
@@ -1,4 +1,4 @@
-/* $NetBSD: nfs_subs.c,v 1.173 2006/10/13 20:53:59 christos Exp $ */
+/* $NetBSD: nfs_subs.c,v 1.174 2006/10/14 09:18:57 yamt Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -70,7 +70,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nfs_subs.c,v 1.173 2006/10/13 20:53:59 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nfs_subs.c,v 1.174 2006/10/14 09:18:57 yamt Exp $");
#include "fs_nfs.h"
#include "opt_nfs.h"
@@ -1832,11 +1832,13 @@ nfs_loadattrcache(vpp, fp, vaper, flags)
if (flags & NAC_NOTRUNC) {
np->n_flag |= NTRUNCDELAYED;
} else {
+ genfs_node_wrlock(vp);
simple_lock(&vp->v_interlock);
(void)VOP_PUTPAGES(vp, 0,
0, PGO_SYNCIO | PGO_CLEANIT |
PGO_FREE | PGO_ALLPAGES);
uvm_vnp_setsize(vp, np->n_size);
+ genfs_node_unlock(vp);
}
}
}
@@ -1884,7 +1886,9 @@ nfs_getattrcache(vp, vaper)
np->n_size = vap->va_size;
} else
np->n_size = vap->va_size;
+ genfs_node_wrlock(vp);
uvm_vnp_setsize(vp, np->n_size);
+ genfs_node_unlock(vp);
} else
np->n_size = vap->va_size;
}
@@ -1906,10 +1910,12 @@ nfs_delayedtruncate(vp)
if (np->n_flag & NTRUNCDELAYED) {
np->n_flag &= ~NTRUNCDELAYED;
+ genfs_node_wrlock(vp);
simple_lock(&vp->v_interlock);
(void)VOP_PUTPAGES(vp, 0,
0, PGO_SYNCIO | PGO_CLEANIT | PGO_FREE | PGO_ALLPAGES);
uvm_vnp_setsize(vp, np->n_size);
+ genfs_node_unlock(vp);
}
}
diff --git a/sys/nfs/nfs_vnops.c b/sys/nfs/nfs_vnops.c
index 15456b41df5..e04a26c4f4a 100644
--- a/sys/nfs/nfs_vnops.c
+++ b/sys/nfs/nfs_vnops.c
@@ -1,4 +1,4 @@
-/* $NetBSD: nfs_vnops.c,v 1.243 2006/10/12 01:32:47 christos Exp $ */
+/* $NetBSD: nfs_vnops.c,v 1.244 2006/10/14 09:18:57 yamt Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nfs_vnops.c,v 1.243 2006/10/12 01:32:47 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nfs_vnops.c,v 1.244 2006/10/14 09:18:57 yamt Exp $");
#include "opt_inet.h"
#include "opt_nfs.h"
@@ -71,6 +71,7 @@ __KERNEL_RCSID(0, "$NetBSD: nfs_vnops.c,v 1.243 2006/10/12 01:32:47 christos Exp
#include <miscfs/fifofs/fifo.h>
#include <miscfs/genfs/genfs.h>
+#include <miscfs/genfs/genfs_node.h>
#include <miscfs/specfs/specdev.h>
#include <nfs/rpcv2.h>
@@ -685,6 +686,7 @@ nfs_setattr(v)
*/
if (vp->v_mount->mnt_flag & MNT_RDONLY)
return (EROFS);
+ genfs_node_wrlock(vp);
uvm_vnp_setsize(vp, vap->va_size);
tsize = np->n_size;
np->n_size = vap->va_size;
@@ -696,6 +698,7 @@ nfs_setattr(v)
ap->a_cred, ap->a_l, 1);
if (error) {
uvm_vnp_setsize(vp, tsize);
+ genfs_node_unlock(vp);
return (error);
}
np->n_vattr->va_size = vap->va_size;
@@ -714,9 +717,12 @@ nfs_setattr(v)
return (error);
}
error = nfs_setattrrpc(vp, vap, ap->a_cred, ap->a_l);
- if (error && vap->va_size != VNOVAL) {
- np->n_size = np->n_vattr->va_size = tsize;
- uvm_vnp_setsize(vp, np->n_size);
+ if (vap->va_size != VNOVAL) {
+ if (error) {
+ np->n_size = np->n_vattr->va_size = tsize;
+ uvm_vnp_setsize(vp, np->n_size);
+ }
+ genfs_node_unlock(vp);
}
VN_KNOTE(vp, NOTE_ATTRIB);
return (error);
@@ -778,10 +784,10 @@ nfs_setattrrpc(vp, vap, cred, l)
nfsm_request(np, NFSPROC_SETATTR, l, cred);
#ifndef NFS_V2_ONLY
if (v3) {
- nfsm_wcc_data(vp, wccflag, 0, FALSE);
+ nfsm_wcc_data(vp, wccflag, NAC_NOTRUNC, FALSE);
} else
#endif
- nfsm_loadattr(vp, (struct vattr *)0, 0);
+ nfsm_loadattr(vp, (struct vattr *)0, NAC_NOTRUNC);
nfsm_reqdone;
return (error);
}