diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2014-02-11 17:49:24 -0500 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2014-05-06 17:32:55 -0400 |
| commit | 7f7f25e82d54870df24d415a7007fbd327da027b (patch) | |
| tree | bac50bd31cd0582a873e1429271299536fb768bc /fs/file_table.c | |
| parent | b318891929c2750055a4002bee3e7636ca3684de (diff) | |
| download | linux-7f7f25e82d54870df24d415a7007fbd327da027b.tar.gz linux-7f7f25e82d54870df24d415a7007fbd327da027b.tar.bz2 linux-7f7f25e82d54870df24d415a7007fbd327da027b.zip | |
replace checking for ->read/->aio_read presence with check in ->f_mode
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>
Diffstat (limited to 'fs/file_table.c')
| -rw-r--r-- | fs/file_table.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/fs/file_table.c b/fs/file_table.c index a374f5033e97..be73cbc48c12 100644 --- a/fs/file_table.c +++ b/fs/file_table.c @@ -175,6 +175,10 @@ struct file *alloc_file(struct path *path, fmode_t mode, file->f_path = *path; file->f_inode = path->dentry->d_inode; 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_op = fop; if ((mode & (FMODE_READ | FMODE_WRITE)) == FMODE_READ) |