aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMiklos Szeredi <mszeredi@suse.cz>2011-12-05 15:21:28 +0100
committerMiklos Szeredi <mszeredi@suse.cz>2011-12-05 15:21:28 +0100
commite3f95263a703d45f091dcf9655806978d2577797 (patch)
treee08304ea520ec59e9a2b86b2d04b9b09ba152da8 /include
parent6b12905b10b15c046b825c48eb8b9e677952d607 (diff)
downloadandroid_external_fuse-e3f95263a703d45f091dcf9655806978d2577797.tar.gz
android_external_fuse-e3f95263a703d45f091dcf9655806978d2577797.tar.bz2
android_external_fuse-e3f95263a703d45f091dcf9655806978d2577797.zip
Add support for ioctl on directories
Reported by Antonio SJ Musumeci
Diffstat (limited to 'include')
-rw-r--r--include/fuse_common.h4
-rw-r--r--include/fuse_kernel.h7
2 files changed, 10 insertions, 1 deletions
diff --git a/include/fuse_common.h b/include/fuse_common.h
index 76f7200..a4d980d 100644
--- a/include/fuse_common.h
+++ b/include/fuse_common.h
@@ -99,6 +99,7 @@ struct fuse_file_info {
* FUSE_CAP_SPLICE_WRITE: ability to use splice() to write to the fuse device
* FUSE_CAP_SPLICE_MOVE: ability to move data to the fuse device with splice()
* FUSE_CAP_SPLICE_READ: ability to use splice() to read from the fuse device
+ * FUSE_CAP_IOCTL_DIR: ioctl support on directories
*/
#define FUSE_CAP_ASYNC_READ (1 << 0)
#define FUSE_CAP_POSIX_LOCKS (1 << 1)
@@ -110,6 +111,7 @@ struct fuse_file_info {
#define FUSE_CAP_SPLICE_MOVE (1 << 8)
#define FUSE_CAP_SPLICE_READ (1 << 9)
#define FUSE_CAP_FLOCK_LOCKS (1 << 10)
+#define FUSE_CAP_IOCTL_DIR (1 << 11)
/**
* Ioctl flags
@@ -117,12 +119,14 @@ struct fuse_file_info {
* FUSE_IOCTL_COMPAT: 32bit compat ioctl on 64bit machine
* FUSE_IOCTL_UNRESTRICTED: not restricted to well-formed ioctls, retry allowed
* FUSE_IOCTL_RETRY: retry with new iovecs
+ * FUSE_IOCTL_DIR: is a directory
*
* FUSE_IOCTL_MAX_IOV: maximum of in_iovecs + out_iovecs
*/
#define FUSE_IOCTL_COMPAT (1 << 0)
#define FUSE_IOCTL_UNRESTRICTED (1 << 1)
#define FUSE_IOCTL_RETRY (1 << 2)
+#define FUSE_IOCTL_DIR (1 << 4)
#define FUSE_IOCTL_MAX_IOV 256
diff --git a/include/fuse_kernel.h b/include/fuse_kernel.h
index 8b65f46..eb8c790 100644
--- a/include/fuse_kernel.h
+++ b/include/fuse_kernel.h
@@ -76,6 +76,9 @@
*
* 7.17
* - add FUSE_FLOCK_LOCKS and FUSE_RELEASE_FLOCK_UNLOCK
+ *
+ * 7.18
+ * - add FUSE_IOCTL_DIR flag
*/
#ifndef _LINUX_FUSE_H
@@ -112,7 +115,7 @@
#define FUSE_KERNEL_VERSION 7
/** Minor version number of this interface */
-#define FUSE_KERNEL_MINOR_VERSION 17
+#define FUSE_KERNEL_MINOR_VERSION 18
/** The node ID of the root inode */
#define FUSE_ROOT_ID 1
@@ -245,6 +248,7 @@ struct fuse_file_lock {
* FUSE_IOCTL_UNRESTRICTED: not restricted to well-formed ioctls, retry allowed
* FUSE_IOCTL_RETRY: retry with new iovecs
* FUSE_IOCTL_32BIT: 32bit ioctl
+ * FUSE_IOCTL_DIR: is a directory
*
* FUSE_IOCTL_MAX_IOV: maximum of in_iovecs + out_iovecs
*/
@@ -252,6 +256,7 @@ struct fuse_file_lock {
#define FUSE_IOCTL_UNRESTRICTED (1 << 1)
#define FUSE_IOCTL_RETRY (1 << 2)
#define FUSE_IOCTL_32BIT (1 << 3)
+#define FUSE_IOCTL_DIR (1 << 4)
#define FUSE_IOCTL_MAX_IOV 256