From: Dave Kleikamp <dave.kleikamp@oracle.com>
To: linux-fsdevel@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, Zach Brown <zab@zabbo.net>,
"Maxim V. Patlasov" <mpatlasov@parallels.com>,
Dave Kleikamp <dave.kleikamp@oracle.com>
Subject: [PATCH V5 16/30] fs: create file_readable() and file_writable() functions
Date: Wed, 9 Jan 2013 13:58:31 -0600 [thread overview]
Message-ID: <1357761525-22718-17-git-send-email-dave.kleikamp@oracle.com> (raw)
In-Reply-To: <1357761525-22718-1-git-send-email-dave.kleikamp@oracle.com>
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
next prev parent reply other threads:[~2013-01-09 19:58 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-09 19:58 [PATCH V5 00/30] loop: Issue O_DIRECT aio using bio_vec Dave Kleikamp
2013-01-09 19:58 ` [PATCH V5 01/30] iov_iter: move into its own file Dave Kleikamp
2013-01-09 19:58 ` [PATCH V5 02/30] iov_iter: iov_iter_copy_from_user() should use non-atomic copy Dave Kleikamp
2013-01-09 19:58 ` [PATCH V5 03/30] iov_iter: add copy_to_user support Dave Kleikamp
[not found] ` <1357761525-22718-1-git-send-email-dave.kleikamp-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org>
2013-01-09 19:58 ` [PATCH V5 04/30] fuse: convert fuse to use iov_iter_copy_[to|from]_user Dave Kleikamp
2013-01-09 19:58 ` [PATCH V5 22/30] nfs: simplify swap Dave Kleikamp
2013-01-09 20:01 ` Rik van Riel
2013-01-09 19:58 ` [PATCH V5 05/30] iov_iter: hide iovec details behind ops function pointers Dave Kleikamp
2013-01-09 19:58 ` [PATCH V5 06/30] iov_iter: add bvec support Dave Kleikamp
2013-01-09 19:58 ` [PATCH V5 07/30] iov_iter: add a shorten call Dave Kleikamp
2013-01-09 19:58 ` [PATCH V5 08/30] iov_iter: let callers extract iovecs and bio_vecs Dave Kleikamp
2013-01-09 19:58 ` [PATCH V5 09/30] dio: Convert direct_IO to use iov_iter Dave Kleikamp
2013-01-09 19:58 ` [PATCH V5 10/30] dio: add bio_vec support to __blockdev_direct_IO() Dave Kleikamp
2013-01-09 19:58 ` [PATCH V5 11/30] fs: pull iov_iter use higher up the stack Dave Kleikamp
2013-01-09 19:58 ` [PATCH V5 12/30] aio: add aio_kernel_() interface Dave Kleikamp
2013-01-09 19:58 ` [PATCH V5 13/30] aio: add aio support for iov_iter arguments Dave Kleikamp
2013-01-09 19:58 ` [PATCH V5 14/30] bio: add bvec_length(), like iov_length() Dave Kleikamp
2013-01-09 19:58 ` [PATCH V5 15/30] loop: use aio to perform io on the underlying file Dave Kleikamp
2013-01-09 19:58 ` Dave Kleikamp [this message]
2013-01-09 19:58 ` [PATCH V5 17/30] fs: use read_iter and write_iter rather than aio_read and aio_write Dave Kleikamp
2013-01-18 21:26 ` Jeff Moyer
2013-01-18 22:03 ` Dave Kleikamp
2013-01-09 19:58 ` [PATCH V5 18/30] fs: add read_iter and write_iter to several file systems Dave Kleikamp
2013-01-10 12:40 ` Boaz Harrosh
2013-01-09 19:58 ` [PATCH V5 19/30] ocfs2: add support for read_iter, write_iter, and direct_IO_bvec Dave Kleikamp
2013-01-09 19:58 ` [PATCH V5 20/30] ext4: add support for read_iter and write_iter Dave Kleikamp
2013-01-09 19:58 ` [PATCH V5 21/30] nfs: add support for read_iter, write_iter Dave Kleikamp
2013-01-09 19:58 ` [PATCH V5 23/30] btrfs: add support for read_iter and write_iter Dave Kleikamp
2013-01-09 19:58 ` [PATCH V5 24/30] block_dev: add support for read_iter, write_iter Dave Kleikamp
2013-01-09 19:58 ` [PATCH V5 25/30] xfs: add support for read_iter and write_iter Dave Kleikamp
2013-01-09 19:58 ` [PATCH V5 26/30] gfs2: Convert aio_read/write ops to read/write_iter Dave Kleikamp
2013-01-10 10:10 ` Steven Whitehouse
2013-01-10 14:34 ` Dave Kleikamp
2013-01-11 16:24 ` Steven Whitehouse
2013-01-09 19:58 ` [PATCH V5 27/30] udf: convert file ops from aio_read/write " Dave Kleikamp
2013-01-09 19:58 ` [PATCH V5 28/30] afs: add support for read_iter and write_iter Dave Kleikamp
2013-01-09 19:58 ` [PATCH V5 29/30] ecrpytfs: Convert aio_read/write ops to read/write_iter Dave Kleikamp
2013-01-09 19:58 ` [PATCH V5 30/30] ubifs: convert file ops from aio_read/write " Dave Kleikamp
2013-01-10 15:46 ` [PATCH V5 00/30] loop: Issue O_DIRECT aio using bio_vec Sedat Dilek
2013-01-11 21:51 ` Dave Kleikamp
2013-01-12 10:52 ` Sedat Dilek
2013-01-12 12:54 ` Sedat Dilek
2013-01-16 16:32 ` James Bottomley
2013-01-16 18:25 ` Sedat Dilek
2013-01-17 23:49 ` James Bottomley
2013-01-18 17:16 ` Jeff Moyer
2013-01-18 17:56 ` Jeff Moyer
2013-01-18 17:58 ` Dave Kleikamp
2013-01-18 21:48 ` Jeff Moyer
2013-01-18 22:33 ` Dave Kleikamp
2013-01-22 16:14 ` Jeff Moyer
2013-01-20 22:26 ` Dave Chinner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1357761525-22718-17-git-send-email-dave.kleikamp@oracle.com \
--to=dave.kleikamp@oracle.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mpatlasov@parallels.com \
--cc=zab@zabbo.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).