diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2010-04-27 05:11:07 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2010-04-27 05:11:07 -0400 |
commit | 846bcf3923056965c3fc0c9ba811c10d25af75e5 (patch) | |
tree | c39bd4273a006da2fb1f727ebb7eb1108f5526c8 /mm | |
parent | 863c3ad87b10617464fc52c21fc7e31987910559 (diff) | |
parent | 3e7ad8ed979ce9e3ad897dd87c50bf577966f89c (diff) |
Merge branch 'master' of
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.33.y
into rt/2.6.33
Conflicts:
Makefile
arch/x86/include/asm/rwsem.h
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'mm')
-rw-r--r-- | mm/readahead.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/readahead.c b/mm/readahead.c index 337b20e946f6..fe1a069fb595 100644 --- a/mm/readahead.c +++ b/mm/readahead.c | |||
@@ -502,7 +502,7 @@ void page_cache_sync_readahead(struct address_space *mapping, | |||
502 | return; | 502 | return; |
503 | 503 | ||
504 | /* be dumb */ | 504 | /* be dumb */ |
505 | if (filp->f_mode & FMODE_RANDOM) { | 505 | if (filp && (filp->f_mode & FMODE_RANDOM)) { |
506 | force_page_cache_readahead(mapping, filp, offset, req_size); | 506 | force_page_cache_readahead(mapping, filp, offset, req_size); |
507 | return; | 507 | return; |
508 | } | 508 | } |