On Tuesday 04 January 2011 06:40:37 Shaohua Li wrote:
> /*
> * When you add any new common ioctls to the switches above and below
> * please update compat_sys_ioctl() too.
> @@ -664,6 +682,9 @@ int do_vfs_ioctl(struct file *filp, unsi
> case 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);
Did you notice the comment above the function? ;-)
You should really add the new ioctls to compat_sys_ioctl, not
to the COMPATIBLE_IOCTL() list, in order to make the behavior
consistent between 32 and 64 bit user space. The main difference
is that all ioctl commands that are hardcoded in the functions
get called before trying to call the file system specific
.ioctl method.
> +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)
This should be _IOW, not _IOR.
Otherwise looks good.
Arnd
--
To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
