svn commit: r242616 - head/sys/fs/fuse

Attilio Rao attilio at FreeBSD.org
Mon Nov 5 15:23:55 UTC 2012


Author: attilio
Date: Mon Nov  5 15:23:54 2012
New Revision: 242616
URL: http://svnweb.freebsd.org/changeset/base/242616

Log:
  fuse_io* must be able to crunch also VDIR vnodes.
  Update assert appropriately.
  
  Reported and Tested by:	flo
  MFC after:	2 months
  X-MFC:		241519,242536

Modified:
  head/sys/fs/fuse/fuse_io.c

Modified: head/sys/fs/fuse/fuse_io.c
==============================================================================
--- head/sys/fs/fuse/fuse_io.c	Mon Nov  5 13:02:34 2012	(r242615)
+++ head/sys/fs/fuse/fuse_io.c	Mon Nov  5 15:23:54 2012	(r242616)
@@ -122,7 +122,7 @@ fuse_io_dispatch(struct vnode *vp, struc
 	struct fuse_filehandle *fufh;
 	int err, directio;
 
-	MPASS(vp->v_type == VREG);
+	MPASS(vp->v_type == VREG || vp->v_type == VDIR);
 
 	err = fuse_filehandle_getrw(vp,
 	    (uio->uio_rw == UIO_READ) ? FUFH_RDONLY : FUFH_WRONLY, &fufh);
@@ -612,7 +612,7 @@ fuse_io_strategy(struct vnode *vp, struc
 
 	const int biosize = fuse_iosize(vp);
 
-	MPASS(vp->v_type == VREG);
+	MPASS(vp->v_type == VREG || vp->v_type == VDIR);
 	MPASS(bp->b_iocmd == BIO_READ || bp->b_iocmd == BIO_WRITE);
 	FS_DEBUG("inode=%ju offset=%jd resid=%ld\n",
 	    (uintmax_t)VTOI(vp), (intmax_t)(((off_t)bp->b_blkno) * biosize),


More information about the svn-src-head mailing list