forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

replace checking for ->read/->aio_read presence with check in ->f_mode

Browse source 
Since we are about to introduce new methods (read_iter/write_iter), the
tests in a bunch of places would have to grow inconveniently.  Check
once (at open() time) and store results in ->f_mode as FMODE_CAN_READ
and FMODE_CAN_WRITE resp.  It might end up being a temporary measure -
once everything switches from ->aio_{read,write} to ->{read,write}_iter
it might make sense to return to open-coded checks.  We'll see...

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2014-02-11 17:49:24 -05:00
commit 7f7f25e82d
6 changed files with 23 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
drivers/mtd/nand/nandsim.c
View file

@ -575,12 +575,12 @@ static int alloc_device(struct nandsim *ns)
cfile = filp_open(cache_file, O_CREAT | O_RDWR | O_LARGEFILE, 0600); cfile = filp_open(cache_file, O_CREAT | O_RDWR | O_LARGEFILE, 0600);
if (IS_ERR(cfile)) if (IS_ERR(cfile))
return PTR_ERR(cfile); return PTR_ERR(cfile);
if (!cfile->f_op->read && !cfile->f_op->aio_read) { if (!(cfile->f_mode & FMODE_CAN_READ)) {
NS_ERR("alloc_device: cache file not readable\n"); NS_ERR("alloc_device: cache file not readable\n");
err = -EINVAL; err = -EINVAL;
goto err_close; goto err_close;
} }
if (!cfile->f_op->write && !cfile->f_op->aio_write) { if (!(cfile->f_mode & FMODE_CAN_WRITE)) {
NS_ERR("alloc_device: cache file not writeable\n"); NS_ERR("alloc_device: cache file not writeable\n");
err = -EINVAL; err = -EINVAL;
goto err_close; goto err_close;

4
drivers/usb/gadget/storage_common.c
View file

@ -220,11 +220,11 @@ 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 read the file, it's no good.
* If we can't write the file, use it read-only. * If we can't write the file, use it read-only.
*/ */
if (!(filp->f_op->read || filp->f_op->aio_read)) { if (!(filp->f_mode & FMODE_CAN_READ)) {
LINFO(curlun, "file not readable: %s\n", filename); LINFO(curlun, "file not readable: %s\n", filename);
goto out; goto out;
} }
if (!(filp->f_op->write || filp->f_op->aio_write)) if (!(filp->f_mode & FMODE_CAN_WRITE))
ro = 1; ro = 1;
size = i_size_read(inode->i_mapping->host); size = i_size_read(inode->i_mapping->host);

4
fs/file_table.c
View file

@ -175,6 +175,10 @@ struct file *alloc_file(struct path *path, fmode_t mode,
file->f_path = *path; file->f_path = *path;
file->f_inode = path->dentry->d_inode; file->f_inode = path->dentry->d_inode;
file->f_mapping = path->dentry->d_inode->i_mapping; file->f_mapping = path->dentry->d_inode->i_mapping;
if ((mode & FMODE_READ) && likely(fop->read || fop->aio_read))
mode |= FMODE_CAN_READ;
if ((mode & FMODE_WRITE) && likely(fop->write || fop->aio_write))
mode |= FMODE_CAN_WRITE;
file->f_mode = mode; file->f_mode = mode;
file->f_op = fop; file->f_op = fop;
if ((mode & (FMODE_READ | FMODE_WRITE)) == FMODE_READ) if ((mode & (FMODE_READ | FMODE_WRITE)) == FMODE_READ)

4
fs/open.c
View file

@ -725,6 +725,10 @@ static int do_dentry_open(struct file *f,
} }
if ((f->f_mode & (FMODE_READ | FMODE_WRITE)) == FMODE_READ) if ((f->f_mode & (FMODE_READ | FMODE_WRITE)) == FMODE_READ)
i_readcount_inc(inode); i_readcount_inc(inode);
if ((f->f_mode & FMODE_READ) && likely(f->f_op->read || f->f_op->aio_read))
f->f_mode |= FMODE_CAN_READ;
if ((f->f_mode & FMODE_WRITE) && likely(f->f_op->write || f->f_op->aio_write))
f->f_mode |= FMODE_CAN_WRITE;
f->f_flags &= ~(O_CREAT | O_EXCL | O_NOCTTY | O_TRUNC); f->f_flags &= ~(O_CREAT | O_EXCL | O_NOCTTY | O_TRUNC);

14
fs/read_write.c
View file

@ -396,7 +396,7 @@ ssize_t vfs_read(struct file *file, char __user *buf, size_t count, loff_t *pos)
if (!(file->f_mode & FMODE_READ)) if (!(file->f_mode & FMODE_READ))
return -EBADF; return -EBADF;
if (!file->f_op->read && !file->f_op->aio_read) if (!(file->f_mode & FMODE_CAN_READ))
return -EINVAL; return -EINVAL;
if (unlikely(!access_ok(VERIFY_WRITE, buf, count))) if (unlikely(!access_ok(VERIFY_WRITE, buf, count)))
return -EFAULT; return -EFAULT;
@ -445,7 +445,7 @@ ssize_t __kernel_write(struct file *file, const char *buf, size_t count, loff_t
const char __user *p; const char __user *p;
ssize_t ret; ssize_t ret;
if (!file->f_op->write && !file->f_op->aio_write) if (!(file->f_mode & FMODE_CAN_WRITE))
return -EINVAL; return -EINVAL;
old_fs = get_fs(); old_fs = get_fs();
@ -472,7 +472,7 @@ ssize_t vfs_write(struct file *file, const char __user *buf, size_t count, loff_
if (!(file->f_mode & FMODE_WRITE)) if (!(file->f_mode & FMODE_WRITE))
return -EBADF; return -EBADF;
if (!file->f_op->write && !file->f_op->aio_write) if (!(file->f_mode & FMODE_CAN_WRITE))
return -EINVAL; return -EINVAL;
if (unlikely(!access_ok(VERIFY_READ, buf, count))) if (unlikely(!access_ok(VERIFY_READ, buf, count)))
return -EFAULT; return -EFAULT;
@ -785,7 +785,7 @@ ssize_t vfs_readv(struct file *file, const struct iovec __user *vec,
{ {
if (!(file->f_mode & FMODE_READ)) if (!(file->f_mode & FMODE_READ))
return -EBADF; return -EBADF;
if (!file->f_op->aio_read && !file->f_op->read) if (!(file->f_mode & FMODE_CAN_READ))
return -EINVAL; return -EINVAL;
return do_readv_writev(READ, file, vec, vlen, pos); return do_readv_writev(READ, file, vec, vlen, pos);
@ -798,7 +798,7 @@ ssize_t vfs_writev(struct file *file, const struct iovec __user *vec,
{ {
if (!(file->f_mode & FMODE_WRITE)) if (!(file->f_mode & FMODE_WRITE))
return -EBADF; return -EBADF;
if (!file->f_op->aio_write && !file->f_op->write) if (!(file->f_mode & FMODE_CAN_WRITE))
return -EINVAL; return -EINVAL;
return do_readv_writev(WRITE, file, vec, vlen, pos); return do_readv_writev(WRITE, file, vec, vlen, pos);
@ -964,7 +964,7 @@ static size_t compat_readv(struct file *file,
goto out; goto out;
ret = -EINVAL; ret = -EINVAL;
if (!file->f_op->aio_read && !file->f_op->read) if (!(file->f_mode & FMODE_CAN_READ))
goto out; goto out;
ret = compat_do_readv_writev(READ, file, vec, vlen, pos); ret = compat_do_readv_writev(READ, file, vec, vlen, pos);
@ -1041,7 +1041,7 @@ static size_t compat_writev(struct file *file,
goto out; goto out;
ret = -EINVAL; ret = -EINVAL;
if (!file->f_op->aio_write && !file->f_op->write) if (!(file->f_mode & FMODE_CAN_WRITE))
goto out; goto out;
ret = compat_do_readv_writev(WRITE, file, vec, vlen, pos); ret = compat_do_readv_writev(WRITE, file, vec, vlen, pos);

4
include/linux/fs.h
View file

@ -128,6 +128,10 @@ typedef void (dio_iodone_t)(struct kiocb *iocb, loff_t offset,
#define FMODE_ATOMIC_POS ((__force fmode_t)0x8000) #define FMODE_ATOMIC_POS ((__force fmode_t)0x8000)
/* Write access to underlying fs */ /* Write access to underlying fs */
#define FMODE_WRITER ((__force fmode_t)0x10000) #define FMODE_WRITER ((__force fmode_t)0x10000)
/* Has read method(s) */
#define FMODE_CAN_READ ((__force fmode_t)0x20000)
/* Has write method(s) */
#define FMODE_CAN_WRITE ((__force fmode_t)0x40000)
/* File was opened by fanotify and shouldn't generate fanotify events */ /* File was opened by fanotify and shouldn't generate fanotify events */
#define FMODE_NONOTIFY ((__force fmode_t)0x1000000) #define FMODE_NONOTIFY ((__force fmode_t)0x1000000)