Commit 0c6aa263 authored by Krishna Kumar's avatar Krishna Kumar Committed by Linus Torvalds

mm: do_generic_file_read() never gets a NULL 'filp' argument

The 'filp' argument to do_generic_file_read() is never NULL.
Signed-off-by: default avatarKrishna Kumar <krkumar2@in.ibm.com>
Reviewed-by: default avatarKOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Cc: Christoph Hellwig <hch@lst.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent b4d1d99f
...@@ -1186,8 +1186,7 @@ static void do_generic_file_read(struct file *filp, loff_t *ppos, ...@@ -1186,8 +1186,7 @@ static void do_generic_file_read(struct file *filp, loff_t *ppos,
ra->prev_pos |= prev_offset; ra->prev_pos |= prev_offset;
*ppos = ((loff_t)index << PAGE_CACHE_SHIFT) + offset; *ppos = ((loff_t)index << PAGE_CACHE_SHIFT) + offset;
if (filp) file_accessed(filp);
file_accessed(filp);
} }
int file_read_actor(read_descriptor_t *desc, struct page *page, int file_read_actor(read_descriptor_t *desc, struct page *page,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment