From owner-p4-projects@FreeBSD.ORG Sun May 29 10:57:30 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E0BBB106566C; Sun, 29 May 2011 10:57:29 +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 A31F6106564A for ; Sun, 29 May 2011 10:57:29 +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 77AEF8FC13 for ; Sun, 29 May 2011 10:57:29 +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 p4TAvTCi079440 for ; Sun, 29 May 2011 10:57:29 GMT (envelope-from ilya@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p4TAvT8G079436 for perforce@freebsd.org; Sun, 29 May 2011 10:57:29 GMT (envelope-from ilya@FreeBSD.org) Date: Sun, 29 May 2011 10:57:29 GMT Message-Id: <201105291057.p4TAvT8G079436@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 193893 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, 29 May 2011 10:57:30 -0000 http://p4web.freebsd.org/@@193893?ac=10 Change 193893 by ilya@ilya_triton2011 on 2011/05/29 10:57:00 Move struct fuse_filehandle to fuse_file. Affected files ... .. //depot/projects/soc2011/ilya_fuse/fuse_module/Makefile#5 edit .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_file.h#1 add .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_io.c#5 edit .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_io.h#2 edit .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_vnops.c#6 edit Differences ... ==== //depot/projects/soc2011/ilya_fuse/fuse_module/Makefile#5 (text+ko) ==== @@ -11,6 +11,7 @@ fuse_subr.c \ fuse.h \ fuse_session.h \ + fuse_file.h \ fuse_internal.h \ fuse_io.h \ fuse_node.h \ ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_io.c#5 (text+ko) ==== @@ -40,6 +40,7 @@ #endif #include "fuse.h" +#include "fuse_file.h" #include "fuse_node.h" #include "fuse_session.h" #include "fuse_io.h" ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_io.h#2 (text+ko) ==== @@ -1,28 +1,3 @@ -/* - * Fuse filehandle, for in-kernel bookkeping of daemon's filehandles - * (which are presented to us as an opque 64 bit id, see the fh_id - * member of the struct). - * It serves as private data for in-kernel file structures, but can - * as well occur standalone. - */ - -struct fuse_filehandle { - struct vnode *fh_vp; - uint64_t fh_id; - int mode; - struct ucred *cred; - pid_t pid; - int useco; - LIST_ENTRY(fuse_filehandle) fh_link; - struct file *fp; - int flags; - enum fuse_opcode op; -}; - -#define FTOFH(fp) ((struct fuse_filehandle *)(fp)->f_data) - -#define ASSERT_VOP_ELOCKED__FH(vp) ASSERT_VOP_ELOCKED((vp), "unsafe filehandle access") -#define ASSERT_VOP_LOCKED__FH(vp) ASSERT_VOP_LOCKED((vp), "unsafe filehandle access") /* prototype for processing an input data buffer and an uio for reading related acivities */ ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_vnops.c#6 (text+ko) ==== @@ -38,6 +38,7 @@ #include #include "fuse.h" +#include "fuse_file.h" #include "fuse_internal.h" #include "fuse_session.h" #include "fuse_node.h"