On Mon, Jan 13, 2014 at 04:48:19PM +0100, Oleg Nesterov wrote:
> Apart from FMODE_PATH check fget() and fget_raw() are identical,
> shift the code into the new simple helper, __fget(fd, mask). Saves
> 160 bytes.
>
> Signed-off-by: Oleg Nesterov <o...@redhat.com>
Not sure why local variable "file" was moved, but regardless:
Reviewed-by: Paul E. McKenney <paul...@linux.vnet.ibm.com>
> ---
> fs/file.c | 25 ++++++++-----------------
> 1 files changed, 8 insertions(+), 17 deletions(-)
>
> diff --git a/fs/file.c b/fs/file.c
> index d34e59e..4ed58a3 100644
> --- a/fs/file.c
> +++ b/fs/file.c
> @@ -637,16 +637,16 @@ void do_close_on_exec(struct files_struct *files)
> spin_unlock(&files->file_lock);
> }
>
> -struct file *fget(unsigned int fd)
> +static struct file *__fget(unsigned int fd, fmode_t mask)
> {
> - struct file *file;
> struct files_struct *files = current->files;
> + struct file *file;
>
> rcu_read_lock();
> file = fcheck_files(files, fd);
> if (file) {
> /* File object ref couldn't be taken */
> - if (file->f_mode & FMODE_PATH ||
> + if ((file->f_mode & mask) ||
> !atomic_long_inc_not_zero(&file->f_count))
> file = NULL;
> }
> @@ -655,25 +655,16 @@ struct file *fget(unsigned int fd)
> return file;
> }
>
> +struct file *fget(unsigned int fd)
> +{
> + return __fget(fd, FMODE_PATH);
> +}
> EXPORT_SYMBOL(fget);
>
> struct file *fget_raw(unsigned int fd)
> {
> - struct file *file;
> - struct files_struct *files = current->files;
> -
> - rcu_read_lock();
> - file = fcheck_files(files, fd);
> - if (file) {
> - /* File object ref couldn't be taken */
> - if (!atomic_long_inc_not_zero(&file->f_count))
> - file = NULL;
> - }
> - rcu_read_unlock();
> -
> - return file;
> + return __fget(fd, 0);
> }
> -
> EXPORT_SYMBOL(fget_raw);
>
> /*
> --
> 1.5.5.1
>
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
