evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fs: factor out common code in fget_light() and fget_raw_light()

Browse source 
Apart from FMODE_PATH check fget_light() and fget_raw_light() are
identical, shift the code into the new helper, __fget_light(fd, mask).
Saves 208 bytes.

Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Oleg Nesterov 2014-01-13 16:48:40 +01:00 • committed by Al Viro
parent 1deb46e256
commit ad46183445
1 changed files with 9 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
fs/file.c
View file

@ -683,21 +683,21 @@ EXPORT_SYMBOL(fget_raw);
* The fput_needed flag returned by fget_light should be passed to the * The fput_needed flag returned by fget_light should be passed to the
* corresponding fput_light. * corresponding fput_light.
*/ */
struct file *fget_light(unsigned int fd, int *fput_needed) struct file *__fget_light(unsigned int fd, fmode_t mask, int *fput_needed)
{ {
struct file *file;
struct files_struct *files = current->files; struct files_struct *files = current->files;
struct file *file;
*fput_needed = 0; *fput_needed = 0;
if (atomic_read(&files->count) == 1) { if (atomic_read(&files->count) == 1) {
file = __fcheck_files(files, fd); file = __fcheck_files(files, fd);
if (file && (file->f_mode & FMODE_PATH)) if (file && (file->f_mode & mask))
file = NULL; file = NULL;
} else { } else {
rcu_read_lock(); rcu_read_lock();
file = fcheck_files(files, fd); file = fcheck_files(files, fd);
if (file) { if (file) {
if (!(file->f_mode & FMODE_PATH) && if (!(file->f_mode & mask) &&
atomic_long_inc_not_zero(&file->f_count)) atomic_long_inc_not_zero(&file->f_count))
*fput_needed = 1; *fput_needed = 1;
else else
@ -709,30 +709,15 @@ struct file *fget_light(unsigned int fd, int *fput_needed)
return file; return file;
} }
struct file *fget_light(unsigned int fd, int *fput_needed)
{
return __fget_light(fd, FMODE_PATH, fput_needed);
}
EXPORT_SYMBOL(fget_light); EXPORT_SYMBOL(fget_light);
struct file *fget_raw_light(unsigned int fd, int *fput_needed) struct file *fget_raw_light(unsigned int fd, int *fput_needed)
{ {
struct file *file; return __fget_light(fd, 0, fput_needed);
struct files_struct *files = current->files;
*fput_needed = 0;
if (atomic_read(&files->count) == 1) {
file = __fcheck_files(files, fd);
} else {
rcu_read_lock();
file = fcheck_files(files, fd);
if (file) {
if (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();
}
return file;
} }
void set_close_on_exec(unsigned int fd, int flag) void set_close_on_exec(unsigned int fd, int flag)