summaryrefslogtreecommitdiff
path: root/fs/read_write.c
diff options
context:
space:
mode:
authorJens Axboe <axboe@suse.de>2006-04-11 13:56:09 +0200
committerJens Axboe <axboe@suse.de>2006-04-11 13:56:09 +0200
commit49570e9b29a3d78950b5eba6b73bdcca955f0877 (patch)
tree65ffdeb8062824b3370abbca5572782f440501e8 /fs/read_write.c
parent6f767b0425f5902e4817648632230b512e81c963 (diff)
downloadlinux-3.10-49570e9b29a3d78950b5eba6b73bdcca955f0877.tar.gz
linux-3.10-49570e9b29a3d78950b5eba6b73bdcca955f0877.tar.bz2
linux-3.10-49570e9b29a3d78950b5eba6b73bdcca955f0877.zip
[PATCH] splice: unlikely() optimizations
Also corrects a few comments. Patch mainly from Ingo, changes by me. Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Jens Axboe <axboe@suse.de>
Diffstat (limited to 'fs/read_write.c')
-rw-r--r--fs/read_write.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/read_write.c b/fs/read_write.c
index 6256ca81a71..5bc0e9234f9 100644
--- a/fs/read_write.c
+++ b/fs/read_write.c
@@ -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;
- if (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);