lkml.org 
[lkml]   [2013]   [Jan]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH V6 16/30] fs: create file_readable() and file_writable() functions
    Date
    Create functions to simplify if file_ops contain either a read
    or aio_read op, or likewise write or aio_write. We will be adding
    read_iter and write_iter and don't need to be complicating the code
    in multiple places.

    Signed-off-by: Dave Kleikamp <dave.kleikamp@oracle.com>
    ---
    drivers/mtd/nand/nandsim.c | 4 ++--
    drivers/staging/ccg/storage_common.c | 4 ++--
    drivers/usb/gadget/storage_common.c | 4 ++--
    fs/compat.c | 4 ++--
    fs/read_write.c | 8 ++++----
    include/linux/fs.h | 10 ++++++++++
    6 files changed, 22 insertions(+), 12 deletions(-)

    diff --git a/drivers/mtd/nand/nandsim.c b/drivers/mtd/nand/nandsim.c
    index 818b65c..cb47bdd 100644
    --- a/drivers/mtd/nand/nandsim.c
    +++ b/drivers/mtd/nand/nandsim.c
    @@ -580,12 +580,12 @@ static int alloc_device(struct nandsim *ns)
    cfile = filp_open(cache_file, O_CREAT | O_RDWR | O_LARGEFILE, 0600);
    if (IS_ERR(cfile))
    return PTR_ERR(cfile);
    - if (!cfile->f_op || (!cfile->f_op->read && !cfile->f_op->aio_read)) {
    + if (!file_readable(cfile)) {
    NS_ERR("alloc_device: cache file not readable\n");
    err = -EINVAL;
    goto err_close;
    }
    - if (!cfile->f_op->write && !cfile->f_op->aio_write) {
    + if (!file_writable(cfile)) {
    NS_ERR("alloc_device: cache file not writeable\n");
    err = -EINVAL;
    goto err_close;
    diff --git a/drivers/staging/ccg/storage_common.c b/drivers/staging/ccg/storage_common.c
    index 8d9bcd8..d431eff 100644
    --- a/drivers/staging/ccg/storage_common.c
    +++ b/drivers/staging/ccg/storage_common.c
    @@ -666,11 +666,11 @@ static int fsg_lun_open(struct fsg_lun *curlun, const char *filename)
    * If we can't read the file, it's no good.
    * If we can't write the file, use it read-only.
    */
    - if (!(filp->f_op->read || filp->f_op->aio_read)) {
    + if (!file_readable(filp)) {
    LINFO(curlun, "file not readable: %s\n", filename);
    goto out;
    }
    - if (!(filp->f_op->write || filp->f_op->aio_write))
    + if (!file_writable(filp))
    ro = 1;

    size = i_size_read(inode->i_mapping->host);
    diff --git a/drivers/usb/gadget/storage_common.c b/drivers/usb/gadget/storage_common.c
    index 0e3ae43..c9eaa50 100644
    --- a/drivers/usb/gadget/storage_common.c
    +++ b/drivers/usb/gadget/storage_common.c
    @@ -511,11 +511,11 @@ static int fsg_lun_open(struct fsg_lun *curlun, const char *filename)
    * If we can't read the file, it's no good.
    * If we can't write the file, use it read-only.
    */
    - if (!(filp->f_op->read || filp->f_op->aio_read)) {
    + if (!file_readable(filp)) {
    LINFO(curlun, "file not readable: %s\n", filename);
    goto out;
    }
    - if (!(filp->f_op->write || filp->f_op->aio_write))
    + if (!file_writable(filp))
    ro = 1;

    size = i_size_read(inode->i_mapping->host);
    diff --git a/fs/compat.c b/fs/compat.c
    index 015e1e1..7411d66 100644
    --- a/fs/compat.c
    +++ b/fs/compat.c
    @@ -1132,7 +1132,7 @@ static size_t compat_readv(struct file *file,
    goto out;

    ret = -EINVAL;
    - if (!file->f_op || (!file->f_op->aio_read && !file->f_op->read))
    + if (!file_readable(file))
    goto out;

    ret = compat_do_readv_writev(READ, file, vec, vlen, pos);
    @@ -1198,7 +1198,7 @@ static size_t compat_writev(struct file *file,
    goto out;

    ret = -EINVAL;
    - if (!file->f_op || (!file->f_op->aio_write && !file->f_op->write))
    + if (!file_writable(file))
    goto out;

    ret = compat_do_readv_writev(WRITE, file, vec, vlen, pos);
    diff --git a/fs/read_write.c b/fs/read_write.c
    index bb34af3..b5d0bff 100644
    --- a/fs/read_write.c
    +++ b/fs/read_write.c
    @@ -360,7 +360,7 @@ ssize_t vfs_read(struct file *file, char __user *buf, size_t count, loff_t *pos)

    if (!(file->f_mode & FMODE_READ))
    return -EBADF;
    - if (!file->f_op || (!file->f_op->read && !file->f_op->aio_read))
    + if (!file_readable(file))
    return -EINVAL;
    if (unlikely(!access_ok(VERIFY_WRITE, buf, count)))
    return -EFAULT;
    @@ -416,7 +416,7 @@ ssize_t vfs_write(struct file *file, const char __user *buf, size_t count, loff_

    if (!(file->f_mode & FMODE_WRITE))
    return -EBADF;
    - if (!file->f_op || (!file->f_op->write && !file->f_op->aio_write))
    + if (!file_writable(file))
    return -EINVAL;
    if (unlikely(!access_ok(VERIFY_READ, buf, count)))
    return -EFAULT;
    @@ -749,7 +749,7 @@ ssize_t vfs_readv(struct file *file, const struct iovec __user *vec,
    {
    if (!(file->f_mode & FMODE_READ))
    return -EBADF;
    - if (!file->f_op || (!file->f_op->aio_read && !file->f_op->read))
    + if (!file_readable(file))
    return -EINVAL;

    return do_readv_writev(READ, file, vec, vlen, pos);
    @@ -762,7 +762,7 @@ ssize_t vfs_writev(struct file *file, const struct iovec __user *vec,
    {
    if (!(file->f_mode & FMODE_WRITE))
    return -EBADF;
    - if (!file->f_op || (!file->f_op->aio_write && !file->f_op->write))
    + if (!file_writable(file))
    return -EINVAL;

    return do_readv_writev(WRITE, file, vec, vlen, pos);
    diff --git a/include/linux/fs.h b/include/linux/fs.h
    index ee9184e..b893a4f 100644
    --- a/include/linux/fs.h
    +++ b/include/linux/fs.h
    @@ -1634,6 +1634,16 @@ struct file_operations {
    int (*show_fdinfo)(struct seq_file *m, struct file *f);
    };

    +static inline int file_readable(struct file *filp)
    +{
    + return filp && (filp->f_op->read || filp->f_op->aio_read);
    +}
    +
    +static inline int file_writable(struct file *filp)
    +{
    + return filp && (filp->f_op->write || filp->f_op->aio_write);
    +}
    +
    struct inode_operations {
    struct dentry * (*lookup) (struct inode *,struct dentry *, unsigned int);
    void * (*follow_link) (struct dentry *, struct nameidata *);
    --
    1.8.1.1


    \
     
     \ /
      Last update: 2013-01-29 18:21    [W:2.580 / U:0.188 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site