From owner-svn-src-all@FreeBSD.ORG  Mon Nov  5 15:23:55 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 5B3958E8;
 Mon,  5 Nov 2012 15:23:55 +0000 (UTC)
 (envelope-from attilio@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 407148FC18;
 Mon,  5 Nov 2012 15:23:55 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qA5FNtp2026779;
 Mon, 5 Nov 2012 15:23:55 GMT (envelope-from attilio@svn.freebsd.org)
Received: (from attilio@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qA5FNtCP026777;
 Mon, 5 Nov 2012 15:23:55 GMT (envelope-from attilio@svn.freebsd.org)
Message-Id: <201211051523.qA5FNtCP026777@svn.freebsd.org>
From: Attilio Rao <attilio@FreeBSD.org>
Date: Mon, 5 Nov 2012 15:23:55 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r242616 - head/sys/fs/fuse
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 05 Nov 2012 15:23:55 -0000

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),