summaryrefslogtreecommitdiffstats
path: root/sys/fs/nandfs
diff options
context:
space:
mode:
authorrpokala <rpokala@FreeBSD.org>2016-01-17 01:04:20 +0000
committerrpokala <rpokala@FreeBSD.org>2016-01-17 01:04:20 +0000
commit157f6a3fb88456770b17694d937e5686e0bbc5e5 (patch)
tree14913b8627af04992552fe4e2d958dfcc14708fd /sys/fs/nandfs
parentca8dc5352dd5dd02635f70706c01a1a7868f9cff (diff)
downloadFreeBSD-src-157f6a3fb88456770b17694d937e5686e0bbc5e5.zip
FreeBSD-src-157f6a3fb88456770b17694d937e5686e0bbc5e5.tar.gz
[PR 206224] bv_cnt is sometimes examined without holding the bufobj lock
Add locking around access to bv_cnt which is currently being done unlocked PR: 206224 Reviewed by: imp Approved by: jhb MFC after: 1 week Sponsored by: Panasas, Inc. Differential Revision: https://reviews.freebsd.org/D4931
Diffstat (limited to 'sys/fs/nandfs')
-rw-r--r--sys/fs/nandfs/nandfs_segment.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/sys/fs/nandfs/nandfs_segment.c b/sys/fs/nandfs/nandfs_segment.c
index 8b1dc41..22fb7cd 100644
--- a/sys/fs/nandfs/nandfs_segment.c
+++ b/sys/fs/nandfs/nandfs_segment.c
@@ -479,6 +479,7 @@ nandfs_iterate_dirty_vnodes(struct mount *mp, struct nandfs_seginfo *seginfo)
struct nandfs_node *nandfs_node;
struct vnode *vp, *mvp;
struct thread *td;
+ struct bufobj *bo;
int error, update;
td = curthread;
@@ -499,17 +500,21 @@ nandfs_iterate_dirty_vnodes(struct mount *mp, struct nandfs_seginfo *seginfo)
update = 1;
}
+ bo = &vp->v_bufobj;
+ BO_LOCK(bo);
if (vp->v_bufobj.bo_dirty.bv_cnt) {
error = nandfs_iterate_dirty_buf(vp, seginfo, 0);
if (error) {
nandfs_error("%s: cannot iterate vnode:%p "
"err:%d\n", __func__, vp, error);
vput(vp);
+ BO_UNLOCK(bo);
return (error);
}
update = 1;
} else
vput(vp);
+ BO_UNLOCK(bo);
if (update)
nandfs_node_update(nandfs_node);
OpenPOWER on IntegriCloud