Merge git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-next
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 13 Jan 2012 18:34:57 +0000 (10:34 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 13 Jan 2012 18:34:57 +0000 (10:34 -0800)
* git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-next:
  Squashfs: fix i_blocks calculation with extended regular files
  Squashfs: fix mount time sanity check for corrupted superblock
  Squashfs: optimise squashfs_cache_get entry search
  Squashfs: Update documentation to include xattrs
  Squashfs: add missing block release on error condition

1  2 
fs/squashfs/super.c

diff --combined fs/squashfs/super.c
index d0858c2d9a47f7d4d38f131b14a1be7bf4c5f406,4619247d74ed85dbd69b557cfccdf325242c6e0d..ecaa2f7bdb8f16ebac1a00896cc9d1a870351788
@@@ -290,7 -290,7 +290,7 @@@ handle_fragments
  
  check_directory_table:
        /* Sanity check directory_table */
-       if (msblk->directory_table >= next_table) {
+       if (msblk->directory_table > next_table) {
                err = -EINVAL;
                goto failed_mount;
        }
@@@ -464,6 -464,7 +464,6 @@@ static struct inode *squashfs_alloc_ino
  static void squashfs_i_callback(struct rcu_head *head)
  {
        struct inode *inode = container_of(head, struct inode, i_rcu);
 -      INIT_LIST_HEAD(&inode->i_dentry);
        kmem_cache_free(squashfs_inode_cachep, squashfs_i(inode));
  }