diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-05-24 00:18:40 +0200 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-05-24 00:18:40 +0200 |
commit | fc05505b77f7900a1bb74fb3f3a4343dee4265a4 (patch) | |
tree | 6517919cb60bd9465078512cacbefd8c77f94b76 /fs/squashfs/cache.c | |
parent | Merge branch 'for-rmk-devel' of git://git.pengutronix.de/git/imx/linux-2.6 in... (diff) | |
parent | IXP4xx: support for Goramo MultiLink router platform. (diff) | |
download | linux-fc05505b77f7900a1bb74fb3f3a4343dee4265a4.tar.xz linux-fc05505b77f7900a1bb74fb3f3a4343dee4265a4.zip |
Merge branch 'ixp4xx' of git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6 into devel
Diffstat (limited to 'fs/squashfs/cache.c')
-rw-r--r-- | fs/squashfs/cache.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/squashfs/cache.c b/fs/squashfs/cache.c index 1c4739e33af6..40c98fa6b5d6 100644 --- a/fs/squashfs/cache.c +++ b/fs/squashfs/cache.c @@ -252,6 +252,7 @@ struct squashfs_cache *squashfs_cache_init(char *name, int entries, cache->entries = entries; cache->block_size = block_size; cache->pages = block_size >> PAGE_CACHE_SHIFT; + cache->pages = cache->pages ? cache->pages : 1; cache->name = name; cache->num_waiters = 0; spin_lock_init(&cache->lock); |