aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiklos Szeredi <mszeredi@suse.cz>2008-12-01 13:14:02 -0500
committerMiklos Szeredi <mszeredi@suse.de>2008-12-01 13:14:02 -0500
commit1f55ed06cf0c361b293b32e5947d35d173eff2aa (patch)
tree6296fe27bfacb63fcf16100888e19f69948ebaee
parent43901aabd7a043e62e24e9459dc4949b4cd69f07 (diff)
fuse: update interface version
Change interface version to 7.11 after adding the IOCTL and POLL messages. Also clean up the <linux/fuse.h> header a bit: - update copyright date to 2008 - fix checkpatch warning: WARNING: Use #include <linux/types.h> instead of <asm/types.h> - remove FUSE_MAJOR define, which is not being used any more Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
-rw-r--r--include/linux/fuse.h15
1 files changed, 8 insertions, 7 deletions
diff --git a/include/linux/fuse.h b/include/linux/fuse.h
index 5650cf033e73..162e5defe683 100644
--- a/include/linux/fuse.h
+++ b/include/linux/fuse.h
@@ -1,6 +1,6 @@
1/* 1/*
2 FUSE: Filesystem in Userspace 2 FUSE: Filesystem in Userspace
3 Copyright (C) 2001-2006 Miklos Szeredi <miklos@szeredi.hu> 3 Copyright (C) 2001-2008 Miklos Szeredi <miklos@szeredi.hu>
4 4
5 This program can be distributed under the terms of the GNU GPL. 5 This program can be distributed under the terms of the GNU GPL.
6 See the file COPYING. 6 See the file COPYING.
@@ -20,26 +20,27 @@
20 * 20 *
21 * 7.10 21 * 7.10
22 * - add nonseekable open flag 22 * - add nonseekable open flag
23 *
24 * 7.11
25 * - add IOCTL message
26 * - add unsolicited notification support
27 * - add POLL message and NOTIFY_POLL notification
23 */ 28 */
24 29
25#ifndef _LINUX_FUSE_H 30#ifndef _LINUX_FUSE_H
26#define _LINUX_FUSE_H 31#define _LINUX_FUSE_H
27 32
28#include <asm/types.h> 33#include <linux/types.h>
29#include <linux/major.h>
30 34
31/** Version number of this interface */ 35/** Version number of this interface */
32#define FUSE_KERNEL_VERSION 7 36#define FUSE_KERNEL_VERSION 7
33 37
34/** Minor version number of this interface */ 38/** Minor version number of this interface */
35#define FUSE_KERNEL_MINOR_VERSION 10 39#define FUSE_KERNEL_MINOR_VERSION 11
36 40
37/** The node ID of the root inode */ 41/** The node ID of the root inode */
38#define FUSE_ROOT_ID 1 42#define FUSE_ROOT_ID 1
39 43
40/** The major number of the fuse character device */
41#define FUSE_MAJOR MISC_MAJOR
42
43/* Make sure all structures are padded to 64bit boundary, so 32bit 44/* Make sure all structures are padded to 64bit boundary, so 32bit
44 userspace works under 64bit kernels */ 45 userspace works under 64bit kernels */
45 46