git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
fs
/
read_write.c
diff --git
a/fs/read_write.c
b/fs/read_write.c
index
c5b80d9
..
3f7a1a6
100644
(file)
--- a/
fs/read_write.c
+++ b/
fs/read_write.c
@@
-19,7
+19,7
@@
#include <asm/uaccess.h>
#include <asm/unistd.h>
#include <asm/uaccess.h>
#include <asm/unistd.h>
-
const
struct file_operations generic_ro_fops = {
+struct file_operations generic_ro_fops = {
.llseek = generic_file_llseek,
.read = generic_file_read,
.mmap = generic_file_readonly_mmap,
.llseek = generic_file_llseek,
.read = generic_file_read,
.mmap = generic_file_readonly_mmap,
@@
-202,7
+202,7
@@
int rw_verify_area(int read_write, struct file *file, loff_t *ppos, size_t count
goto Einval;
inode = file->f_dentry->d_inode;
goto Einval;
inode = file->f_dentry->d_inode;
- if (
unlikely(inode->i_flock && MANDATORY_LOCK(inode)
)) {
+ if (
inode->i_flock && MANDATORY_LOCK(inode
)) {
int retval = locks_mandatory_area(
read_write == READ ? FLOCK_VERIFY_READ : FLOCK_VERIFY_WRITE,
inode, file, pos, count);
int retval = locks_mandatory_area(
read_write == READ ? FLOCK_VERIFY_READ : FLOCK_VERIFY_WRITE,
inode, file, pos, count);
@@
-374,8
+374,6
@@
asmlinkage ssize_t sys_write(unsigned int fd, const char __user * buf, size_t co
return ret;
}
return ret;
}
-EXPORT_SYMBOL_GPL(sys_write);
-
asmlinkage ssize_t sys_pread64(unsigned int fd, char __user *buf,
size_t count, loff_t pos)
{
asmlinkage ssize_t sys_pread64(unsigned int fd, char __user *buf,
size_t count, loff_t pos)
{
@@
-438,7
+436,7
@@
unsigned long iov_shorten(struct iovec *iov, unsigned long nr_segs, size_t to)
return seg;
}
return seg;
}
-EXPORT_
UNUSED_SYMBOL(iov_shorten); /* June 2006 */
+EXPORT_
SYMBOL(iov_shorten);
/* A write operation does a read from user space and vice versa */
#define vrfy_dir(type) ((type) == READ ? VERIFY_WRITE : VERIFY_READ)
/* A write operation does a read from user space and vice versa */
#define vrfy_dir(type) ((type) == READ ? VERIFY_WRITE : VERIFY_READ)
@@
-472,7
+470,7
@@
static ssize_t do_readv_writev(int type, struct file *file,
* verify all the pointers
*/
ret = -EINVAL;
* verify all the pointers
*/
ret = -EINVAL;
- if (
nr_segs > UIO_MAXIOV
)
+ if (
(nr_segs > UIO_MAXIOV) || (nr_segs <= 0)
)
goto out;
if (!file->f_op)
goto out;
goto out;
if (!file->f_op)
goto out;