add metadata_readahead ioctl in vfs
Subsystems (3)
RFC 3/5 add metadata_readahead ioctl in vfs
Add metadata readahead ioctl in vfs. Filesystem can hook to super_operations.metadata_readahead to handle filesystem specific task. Next patch will give an example how btrfs implements it.
Signed-off-by Shaohua Li <[email protected]>
--- fs/compat_ioctl.c | 1 + fs/ioctl.c | 21 +++++++++++++++++++++ include/linux/fs.h | 8 ++++++++ 3 files changed, 30 insertions(+)
fs/ioctl.c +21 -0
@@ -605,6 +605,24 @@ static int ioctl_metadata_incore(structreturn entries; } +static int ioctl_metadata_readahead (struct file *filp,void __user *argp) +{ +struct super_block *sb = filp->f_path.dentry->d_inode->i_sb; +struct metadata_readahead_args args; + +if (!sb->s_op->metadata_readahead) +return -EOPNOTSUPP ; + +if (copy_from_user (&args, (struct metadata_readahead_args __user *)argp, +sizeof (args))) +return -EFAULT ; + +if ((args.offset & ~PAGE_CACHE_MASK ) || (args.size & ~PAGE_CACHE_MASK )) +return -EINVAL ; + +return sb->s_op->metadata_readahead (sb, args.offset, args.size); +} +/* * When you add any new common ioctls to the switches above and below * please update compat_sys_ioctl() too.
@@ -668,6 +686,9 @@ int do_vfs_ioctl(struct file *filp, unsicase FIMETADATA_INCORE :return ioctl_metadata_incore (filp, argp); +case FIMETADATA_READAHEAD : +return ioctl_metadata_readahead (filp, argp); +default :if (S_ISREG (filp->f_path.dentry->d_inode->i_mode)) error =file_ioctl (filp, cmd, arg);
include/linux/fs.h +8 -0
@@ -65,6 +65,11 @@ struct metadata_incore_args {__u32 unused; }; +struct metadata_readahead_args { +__u64 offset; +__u64 size; +}; +#define NR_FILE 8192/* this can well be larger on a larger system */ #define MAY_EXEC 1
@@ -338,6 +343,7 @@ struct metadata_incore_args {#define FITHAW _IOWR('X', 120, int)/* Thaw */ #define FITRIM _IOWR('X', 121, struct fstrim_range)/* Trim */ #define FIMETADATA_INCORE _IOWR('X', 122, struct metadata_incore_args) +#define FIMETADATA_READAHEAD _IOR('X', 123, struct metadata_readahead_args)#define FS_IOC_GETFLAGS _IOR('f', 1, long)#define FS_IOC_SETFLAGS _IOW('f', 2, long)
@@ -1627,6 +1633,8 @@ struct super_operations {int (*bdev_try_to_free_page)(struct super_block *,struct page *,gfp_t );int (*metadata_incore)(struct super_block *,loff_t *offset,ssize_t *size); +int (*metadata_readahead)(struct super_block *,loff_t offset, +ssize_t size); };/*
fs/compat_ioctl.c +1 -0
@@ -883,6 +883,7 @@ COMPATIBLE_IOCTL(FIGETBSZ) COMPATIBLE_IOCTL(FIFREEZE) COMPATIBLE_IOCTL(FITHAW) COMPATIBLE_IOCTL(FIMETADATA_INCORE) +COMPATIBLE_IOCTL(FIMETADATA_READAHEAD) COMPATIBLE_IOCTL(KDGETKEYCODE) COMPATIBLE_IOCTL(KDSETKEYCODE) COMPATIBLE_IOCTL(KDGKBTYPE)
Quoted 17 lines · On Mon, 13 Dec 2010 15:22:14 +0800 Shaohua Li <[email protected]> wrote:
Add metadata readahead ioctl in vfs. Filesystem can hook to super_operations.metadata_readahead to handle filesystem specific task. Next patch will give an example how btrfs implements it.
Signed-off-by Shaohua Li <[email protected]>--- fs/compat_ioctl.c | 1 + fs/ioctl.c | 21 +++++++++++++++++++++ include/linux/fs.h | 8 ++++++++ 3 files changed, 30 insertions(+)Index:
linux/fs/ioctl.c
===================================================================
fs/ioctl.c static int ioctl_metadata_incore(struct · line 614
Quoted 10 lines
fs/ioctl.c +7
-0@@ -605,6 +605,24 @@ static int ioctl_metadata_incore(structreturn entries; } +static int ioctl_metadata_readahead (struct file *filp,void __user *argp) +{ +struct super_block *sb = filp->f_path.dentry->d_inode->i_sb; +struct metadata_readahead_args args; + +if (!sb->s_op->metadata_readahead) +return -EOPNOTSUPP ;
-ENOTNETWORKING
fs/ioctl.c static int ioctl_metadata_incore(struct · line 616
Quoted 1 line
fs/ioctl.c +1
-0+ if (copy_from_user(&args, (struct metadata_readahead_args __user *)argp,
Unneeded cast.
fs/ioctl.c static int ioctl_metadata_incore(struct · line 620
Quoted 4 lines
fs/ioctl.c +4
-0+ sizeof(args))) +return -EFAULT ; + +if ((args.offset & ~PAGE_CACHE_MASK ) || (args.size & ~PAGE_CACHE_MASK ))
Why?
Quoted 5 lines
fs/ioctl.c +5
-0+return -EINVAL ; + +return sb->s_op->metadata_readahead (sb, args.offset, args.size); +} +