svn commit: r186911 - head/sys/fs/devfs
Edward Tomasz Napierala
trasz at FreeBSD.org
Thu Jan 8 11:13:35 PST 2009
Author: trasz
Date: Thu Jan 8 19:13:34 2009
New Revision: 186911
URL: http://svn.freebsd.org/changeset/base/186911
Log:
Don't panic with "vinvalbuf: dirty bufs" when the mounted device that was
being written to goes away.
Reviewed by: kib, scottl
Approved by: rwatson (mentor)
Sponsored by: FreeBSD Foundation
Modified:
head/sys/fs/devfs/devfs_vnops.c
Modified: head/sys/fs/devfs/devfs_vnops.c
==============================================================================
--- head/sys/fs/devfs/devfs_vnops.c Thu Jan 8 18:34:19 2009 (r186910)
+++ head/sys/fs/devfs/devfs_vnops.c Thu Jan 8 19:13:34 2009 (r186911)
@@ -540,12 +540,28 @@ devfs_close_f(struct file *fp, struct th
return (error);
}
-/* ARGSUSED */
static int
devfs_fsync(struct vop_fsync_args *ap)
{
- if (!vn_isdisk(ap->a_vp, NULL))
+ int error;
+ struct bufobj *bo;
+ struct devfs_dirent *de;
+
+ if (!vn_isdisk(ap->a_vp, &error)) {
+ bo = &ap->a_vp->v_bufobj;
+ de = ap->a_vp->v_data;
+ if (error == ENXIO && bo->bo_dirty.bv_cnt > 0) {
+ printf("Device %s went missing before all of the data "
+ "could be written to it; expect data loss.\n",
+ de->de_dirent->d_name);
+
+ error = vop_stdfsync(ap);
+ if (bo->bo_dirty.bv_cnt != 0 || error != 0)
+ panic("devfs_fsync: vop_stdfsync failed.");
+ }
+
return (0);
+ }
return (vop_stdfsync(ap));
}
More information about the svn-src-head
mailing list