projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux...
[powerpc.git]
/
fs
/
read_write.c
diff --git
a/fs/read_write.c
b/fs/read_write.c
index
507ddff
..
ea1f94c
100644
(file)
--- a/
fs/read_write.c
+++ b/
fs/read_write.c
@@
-205,7
+205,7
@@
int rw_verify_area(int read_write, struct file *file, loff_t *ppos, size_t count
if (unlikely((pos < 0) || (loff_t) (pos + count) < 0))
goto Einval;
if (unlikely((pos < 0) || (loff_t) (pos + count) < 0))
goto Einval;
- if (unlikely(inode->i_flock &&
MANDATORY_LOCK
(inode))) {
+ if (unlikely(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);
@@
-370,7
+370,7
@@
asmlinkage ssize_t sys_read(unsigned int fd, char __user * buf, size_t count)
return ret;
}
return ret;
}
-EXPORT_
SYMBOL_GPL(sys_read);
+EXPORT_
UNUSED_SYMBOL_GPL(sys_read); /* to be deleted for 2.6.25 */
asmlinkage ssize_t sys_write(unsigned int fd, const char __user * buf, size_t count)
{
asmlinkage ssize_t sys_write(unsigned int fd, const char __user * buf, size_t count)
{