From owner-p4-projects@FreeBSD.ORG Sun Jun 19 09:35:35 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8B5871065672; Sun, 19 Jun 2011 09:35:35 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4DD2B106566C for ; Sun, 19 Jun 2011 09:35:35 +0000 (UTC) (envelope-from ilya@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 21F048FC12 for ; Sun, 19 Jun 2011 09:35:35 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p5J9ZZjD070454 for ; Sun, 19 Jun 2011 09:35:35 GMT (envelope-from ilya@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p5J9ZYKQ070451 for perforce@freebsd.org; Sun, 19 Jun 2011 09:35:34 GMT (envelope-from ilya@FreeBSD.org) Date: Sun, 19 Jun 2011 09:35:34 GMT Message-Id: <201106190935.p5J9ZYKQ070451@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to ilya@FreeBSD.org using -f From: Ilya Putsikau To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 194957 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 19 Jun 2011 09:35:35 -0000 http://p4web.freebsd.org/@@194957?ac=10 Change 194957 by ilya@ilya_triton2011 on 2011/06/19 09:35:01 Create vobject. Fix typo in fuse_io_dispatch While faking vfs_getattr(), changed to return a non-zero block size. (macfuse rev 63) Use cnp->cn_thread and cnp->cn_cred when available Affected files ... .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_internal.c#10 edit .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_io.c#9 edit .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_vfsops.c#13 edit .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_vnops.c#16 edit Differences ... ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_internal.c#10 (text+ko) ==== @@ -393,7 +393,7 @@ debug_printf("dvp=%p, cnp=%p, op=%d\n", vp, cnp, op); fdisp_init(&fdi, cnp->cn_namelen + 1); - fdisp_make_vp(&fdi, op, dvp, curthread, NULL); + fdisp_make_vp(&fdi, op, dvp, cnp->cn_thread, cnp->cn_cred); memcpy(fdi.indata, cnp->cn_nameptr, cnp->cn_namelen); ((char *)fdi.indata)[cnp->cn_namelen] = '\0'; @@ -478,7 +478,7 @@ fdip->iosize = bufsize + cnp->cn_namelen + 1; - fdisp_make(fdip, op, mp, dnid, curthread, NULL); + fdisp_make(fdip, op, mp, dnid, cnp->cn_thread, cnp->cn_cred); memcpy(fdip->indata, buf, bufsize); memcpy((char *)fdip->indata + bufsize, cnp->cn_nameptr, cnp->cn_namelen); ((char *)fdip->indata)[bufsize + cnp->cn_namelen] = '\0'; @@ -512,7 +512,7 @@ err = fuse_vnode_get(mp, feo->nodeid, dvp, vpp, cnp, vtyp, 0); if (err) { - fuse_internal_forget_send(mp, curthread, NULL, feo->nodeid, 1, fdip); + fuse_internal_forget_send(mp, cnp->cn_thread, cnp->cn_cred, feo->nodeid, 1, fdip); return err; } ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_io.c#9 (text+ko) ==== @@ -112,7 +112,7 @@ err = fuse_io_filehandle_get(vp, (uio->uio_rw == UIO_READ), cred, &fufh); - if (!err) + if (err) return (err); bzero(&fioda, sizeof(fioda)); ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_vfsops.c#13 (text+ko) ==== @@ -21,6 +21,7 @@ #include #include "fuse.h" +#include "fuse_param.h" #include "fuse_node.h" #include "fuse_ipc.h" #include "fuse_internal.h" @@ -394,7 +395,7 @@ sbp->f_files = 0; sbp->f_ffree = 0; sbp->f_namemax = 0; - sbp->f_bsize = 0; + sbp->f_bsize = FUSE_DEFAULT_BLOCKSIZE; return (0); } ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_vnops.c#16 (text+ko) ==== @@ -1169,6 +1169,11 @@ } ok: + if (vnode_vtype(vp) == VREG) { + /* XXXIP prevent getattr, by using cached node size */ + vnode_create_vobject(vp, 0, td); + } + { /* * Doing this here because when a vnode goes inactive, no-cache and