git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
include
/
linux
/
fuse.h
diff --git
a/include/linux/fuse.h
b/include/linux/fuse.h
index
5425b60
..
9fc48a6
100644
(file)
--- a/
include/linux/fuse.h
+++ b/
include/linux/fuse.h
@@
-1,6
+1,6
@@
/*
FUSE: Filesystem in Userspace
/*
FUSE: Filesystem in Userspace
- Copyright (C) 2001-200
5
Miklos Szeredi <miklos@szeredi.hu>
+ Copyright (C) 2001-200
6
Miklos Szeredi <miklos@szeredi.hu>
This program can be distributed under the terms of the GNU GPL.
See the file COPYING.
This program can be distributed under the terms of the GNU GPL.
See the file COPYING.
@@
-9,18
+9,19
@@
/* This file defines the kernel interface of FUSE */
#include <asm/types.h>
/* This file defines the kernel interface of FUSE */
#include <asm/types.h>
+#include <linux/major.h>
/** Version number of this interface */
#define FUSE_KERNEL_VERSION 7
/** Minor version number of this interface */
/** Version number of this interface */
#define FUSE_KERNEL_VERSION 7
/** Minor version number of this interface */
-#define FUSE_KERNEL_MINOR_VERSION
6
+#define FUSE_KERNEL_MINOR_VERSION
7
/** The node ID of the root inode */
#define FUSE_ROOT_ID 1
/** The major number of the fuse character device */
/** The node ID of the root inode */
#define FUSE_ROOT_ID 1
/** The major number of the fuse character device */
-#define FUSE_MAJOR
10
+#define FUSE_MAJOR
MISC_MAJOR
/** The minor number of the fuse character device */
#define FUSE_MINOR 229
/** The minor number of the fuse character device */
#define FUSE_MINOR 229
@@
-58,6
+59,13
@@
struct fuse_kstatfs {
__u32 spare[6];
};
__u32 spare[6];
};
+struct fuse_file_lock {
+ __u64 start;
+ __u64 end;
+ __u32 type;
+ __u32 pid; /* tgid */
+};
+
/**
* Bitmasks for fuse_setattr_in.valid
*/
/**
* Bitmasks for fuse_setattr_in.valid
*/
@@
-82,6
+90,7
@@
struct fuse_kstatfs {
* INIT request/reply flags
*/
#define FUSE_ASYNC_READ (1 << 0)
* INIT request/reply flags
*/
#define FUSE_ASYNC_READ (1 << 0)
+#define FUSE_POSIX_LOCKS (1 << 1)
enum fuse_opcode {
FUSE_LOOKUP = 1,
enum fuse_opcode {
FUSE_LOOKUP = 1,
@@
-112,8
+121,12
@@
enum fuse_opcode {
FUSE_READDIR = 28,
FUSE_RELEASEDIR = 29,
FUSE_FSYNCDIR = 30,
FUSE_READDIR = 28,
FUSE_RELEASEDIR = 29,
FUSE_FSYNCDIR = 30,
+ FUSE_GETLK = 31,
+ FUSE_SETLK = 32,
+ FUSE_SETLKW = 33,
FUSE_ACCESS = 34,
FUSE_ACCESS = 34,
- FUSE_CREATE = 35
+ FUSE_CREATE = 35,
+ FUSE_INTERRUPT = 36,
};
/* The read buffer is required to be at least 8k, but may be much larger */
};
/* The read buffer is required to be at least 8k, but may be much larger */
@@
-199,6
+212,7
@@
struct fuse_flush_in {
__u64 fh;
__u32 flush_flags;
__u32 padding;
__u64 fh;
__u32 flush_flags;
__u32 padding;
+ __u64 lock_owner;
};
struct fuse_read_in {
};
struct fuse_read_in {
@@
-247,6
+261,16
@@
struct fuse_getxattr_out {
__u32 padding;
};
__u32 padding;
};
+struct fuse_lk_in {
+ __u64 fh;
+ __u64 owner;
+ struct fuse_file_lock lk;
+};
+
+struct fuse_lk_out {
+ struct fuse_file_lock lk;
+};
+
struct fuse_access_in {
__u32 mask;
__u32 padding;
struct fuse_access_in {
__u32 mask;
__u32 padding;
@@
-268,6
+292,10
@@
struct fuse_init_out {
__u32 max_write;
};
__u32 max_write;
};
+struct fuse_interrupt_in {
+ __u64 unique;
+};
+
struct fuse_in_header {
__u32 len;
__u32 opcode;
struct fuse_in_header {
__u32 len;
__u32 opcode;