diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-02-15 02:15:32 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-02-15 02:15:32 +0000 |
| commit | 86464aed71025541805e7b1515541aee89879e33 (patch) | |
| tree | e01a457a4912a8553bc65524aa3125d51f29f810 /fs/read_write.c | |
| parent | 88f99939ecc6a95a79614574cb7d95ffccfc3466 (diff) | |
Merge with Linux 2.2.1.
Diffstat (limited to 'fs/read_write.c')
| -rw-r--r-- | fs/read_write.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/read_write.c b/fs/read_write.c index 00fa17ed6..7b9bf0bf7 100644 --- a/fs/read_write.c +++ b/fs/read_write.c @@ -215,7 +215,8 @@ static ssize_t do_readv_writev(int type, struct file *file, tot_len += iov[i].iov_len; inode = file->f_dentry->d_inode; - ret = locks_verify_area((type == VERIFY_READ + /* VERIFY_WRITE actually means a read, as we write to user space */ + ret = locks_verify_area((type == VERIFY_WRITE ? FLOCK_VERIFY_READ : FLOCK_VERIFY_WRITE), inode, file, file->f_pos, tot_len); if (ret) goto out; |