diff --git a/[refs] b/[refs] index 611dcc5bd9d2..db7e7c024746 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b4d1d99fdd8b98fb03dfd6ef9b0ece220de38640 +refs/heads/master: 0c6aa2639ea83bfb7f91d72118bad70b3f60012a diff --git a/trunk/mm/filemap.c b/trunk/mm/filemap.c index 876bc595d0f8..bf8f9c0c7a83 100644 --- a/trunk/mm/filemap.c +++ b/trunk/mm/filemap.c @@ -1186,8 +1186,7 @@ static void do_generic_file_read(struct file *filp, loff_t *ppos, 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,