From: Krishna Kumar <krkumar2@in.ibm.com>
Date: Thu, 16 Oct 2008 05:01:13 +0000 (-0700)
Subject: mm: do_generic_file_read() never gets a NULL 'filp' argument
X-Git-Tag: v2.6.28-rc1~558
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=0c6aa2639ea83bfb7f91d72118bad70b3f60012a;p=linux-2.6-omap-h63xx.git

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>
---

diff --git a/mm/filemap.c b/mm/filemap.c
index 876bc595d0f..bf8f9c0c7a8 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -1186,8 +1186,7 @@ out:
 	ra->prev_pos |= prev_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,