summaryrefslogtreecommitdiffstats
path: root/fs/file.c
diff options
context:
space:
mode:
authorOleg Nesterov <oleg@redhat.com>2014-01-13 16:49:06 +0100
committerAl Viro <viro@zeniv.linux.org.uk>2014-01-25 09:14:38 +0100
commite6ff9a9fa4e05c1c03dec63cdc6a87d6dea02755 (patch)
tree2c2227443f90e38581b8bc5f30cd3949301f7d0d /fs/file.c
parentfs: factor out common code in fget_light() and fget_raw_light() (diff)
downloadlinux-e6ff9a9fa4e05c1c03dec63cdc6a87d6dea02755.tar.xz
linux-e6ff9a9fa4e05c1c03dec63cdc6a87d6dea02755.zip
fs: __fget_light() can use __fget() in slow path
The slow path in __fget_light() can use __fget() to avoid the code duplication. Saves 232 bytes. Signed-off-by: Oleg Nesterov <oleg@redhat.com> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to '')
-rw-r--r--fs/file.c14
1 files changed, 3 insertions, 11 deletions
diff --git a/fs/file.c b/fs/file.c
index 50c1208f6450..771578b33fb6 100644
--- a/fs/file.c
+++ b/fs/file.c
@@ -694,17 +694,9 @@ struct file *__fget_light(unsigned int fd, fmode_t mask, int *fput_needed)
if (file && (file->f_mode & mask))
file = NULL;
} else {
- rcu_read_lock();
- file = fcheck_files(files, fd);
- if (file) {
- if (!(file->f_mode & mask) &&
- atomic_long_inc_not_zero(&file->f_count))
- *fput_needed = 1;
- else
- /* Didn't get the reference, someone's freed */
- file = NULL;
- }
- rcu_read_unlock();
+ file = __fget(fd, mask);
+ if (file)
+ *fput_needed = 1;
}
return file;