diff options
| author | Miklos Szeredi <mszeredi@suse.cz> | 2011-12-13 11:58:49 +0100 |
|---|---|---|
| committer | Miklos Szeredi <mszeredi@suse.cz> | 2011-12-13 11:58:49 +0100 |
| commit | b18da0c56e9ff43a007b6c8e302c62e720964151 (patch) | |
| tree | dca57bc1042c576474529768533d6efb88716f35 /fs/fuse/dir.c | |
| parent | c411cc88d873b3f68635a04691f7f115c46bc39e (diff) | |
| download | kernel_goldelico_gta04-b18da0c56e9ff43a007b6c8e302c62e720964151.zip kernel_goldelico_gta04-b18da0c56e9ff43a007b6c8e302c62e720964151.tar.gz kernel_goldelico_gta04-b18da0c56e9ff43a007b6c8e302c62e720964151.tar.bz2 | |
fuse: support ioctl on directories
Multiplexing filesystems may want to support ioctls on the underlying
files and directores (e.g. FS_IOC_{GET,SET}FLAGS).
Ioctl support on directories was missing so add it now.
Reported-by: Antonio SJ Musumeci <bile@landofbile.com>
Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
Diffstat (limited to 'fs/fuse/dir.c')
| -rw-r--r-- | fs/fuse/dir.c | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c index 9f63e49..3445779 100644 --- a/fs/fuse/dir.c +++ b/fs/fuse/dir.c @@ -1182,6 +1182,30 @@ static int fuse_dir_fsync(struct file *file, loff_t start, loff_t end, return fuse_fsync_common(file, start, end, datasync, 1); } +static long fuse_dir_ioctl(struct file *file, unsigned int cmd, + unsigned long arg) +{ + struct fuse_conn *fc = get_fuse_conn(file->f_mapping->host); + + /* FUSE_IOCTL_DIR only supported for API version >= 7.18 */ + if (fc->minor < 18) + return -ENOTTY; + + return fuse_ioctl_common(file, cmd, arg, FUSE_IOCTL_DIR); +} + +static long fuse_dir_compat_ioctl(struct file *file, unsigned int cmd, + unsigned long arg) +{ + struct fuse_conn *fc = get_fuse_conn(file->f_mapping->host); + + if (fc->minor < 18) + return -ENOTTY; + + return fuse_ioctl_common(file, cmd, arg, + FUSE_IOCTL_COMPAT | FUSE_IOCTL_DIR); +} + static bool update_mtime(unsigned ivalid) { /* Always update if mtime is explicitly set */ @@ -1596,6 +1620,8 @@ static const struct file_operations fuse_dir_operations = { .open = fuse_dir_open, .release = fuse_dir_release, .fsync = fuse_dir_fsync, + .unlocked_ioctl = fuse_dir_ioctl, + .compat_ioctl = fuse_dir_compat_ioctl, }; static const struct inode_operations fuse_common_inode_operations = { |