tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus

* git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus:
Squashfs: cody tidying, remove commented out line in Makefile
Squashfs: check page size is not larger than the filesystem block size
Squashfs: fix breakage when page size > metadata block size

Linus Torvalds 210af919 a6aeeebf

+11 -1
-1
fs/squashfs/Makefile
··· 5 5 obj-$(CONFIG_SQUASHFS) += squashfs.o 6 6 squashfs-y += block.o cache.o dir.o export.o file.o fragment.o id.o inode.o 7 7 squashfs-y += namei.o super.o symlink.o 8 - #squashfs-y += squashfs2_0.o
+1
fs/squashfs/cache.c
··· 252 252 cache->entries = entries; 253 253 cache->block_size = block_size; 254 254 cache->pages = block_size >> PAGE_CACHE_SHIFT; 255 + cache->pages = cache->pages ? cache->pages : 1; 255 256 cache->name = name; 256 257 cache->num_waiters = 0; 257 258 spin_lock_init(&cache->lock);
+10
fs/squashfs/super.c
··· 157 157 if (msblk->block_size > SQUASHFS_FILE_MAX_SIZE) 158 158 goto failed_mount; 159 159 160 + /* 161 + * Check the system page size is not larger than the filesystem 162 + * block size (by default 128K). This is currently not supported. 163 + */ 164 + if (PAGE_CACHE_SIZE > msblk->block_size) { 165 + ERROR("Page size > filesystem block size (%d). This is " 166 + "currently not supported!\n", msblk->block_size); 167 + goto failed_mount; 168 + } 169 + 160 170 msblk->block_log = le16_to_cpu(sblk->block_log); 161 171 if (msblk->block_log > SQUASHFS_FILE_MAX_LOG) 162 172 goto failed_mount;