aboutsummaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorKrishna Kumar <krkumar2@in.ibm.com>2008-10-16 01:01:13 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-10-16 14:21:29 -0400
commit0c6aa2639ea83bfb7f91d72118bad70b3f60012a (patch)
tree7ed277716200bdd949491aad355a2edf6d0864f3 /mm
parentb4d1d99fdd8b98fb03dfd6ef9b0ece220de38640 (diff)
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: Krishna Kumar <krkumar2@in.ibm.com> Reviewed-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com> Cc: Christoph Hellwig <hch@lst.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm')
-rw-r--r--mm/filemap.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/mm/filemap.c b/mm/filemap.c
index 876bc595d0f8..bf8f9c0c7a83 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -1186,8 +1186,7 @@ out:
1186 ra->prev_pos |= prev_offset; 1186 ra->prev_pos |= prev_offset;
1187 1187
1188 *ppos = ((loff_t)index << PAGE_CACHE_SHIFT) + offset; 1188 *ppos = ((loff_t)index << PAGE_CACHE_SHIFT) + offset;
1189 if (filp) 1189 file_accessed(filp);
1190 file_accessed(filp);
1191} 1190}
1192 1191
1193int file_read_actor(read_descriptor_t *desc, struct page *page, 1192int file_read_actor(read_descriptor_t *desc, struct page *page,