PERFORCE change 193893 for review

[Ilya Putsikau]

http://p4web.freebsd.org/@@193893?ac=10

Change 193893 by ilya at 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 <vm/vm_object.h>
 
 #include "fuse.h"
+#include "fuse_file.h"
 #include "fuse_internal.h"
 #include "fuse_session.h"
 #include "fuse_node.h"