From: Miklos Szeredi <[email protected]>
...so remove bogus "if (filp)".
Signed-off-by: Miklos Szeredi <[email protected]>
---
mm/filemap.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
Index: linux-2.6/mm/filemap.c
===================================================================
--- linux-2.6.orig/mm/filemap.c 2008-07-30 13:52:36.000000000 +0200
+++ linux-2.6/mm/filemap.c 2008-07-30 13:52:39.000000000 +0200
@@ -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,
--
> *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,
if filp is never NULL, BUG_ON is better?
KOSAKI Motohiro wrote:
>> *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,
>
> if filp is never NULL, BUG_ON is better?
>
static inline void file_accessed(struct file *file)
{
if (!(file->f_flags & O_NOATIME))
...
}
So if filp is NULL, we'll get a noisy NULL dereference bug immediately,
so BUG_ON() is not needed.