From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 13 Jan 2012 18:34:57 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-next
X-Git-Url: https://git.openfabrics.org/?p=~shefty%2Frdma-dev.git;a=commitdiff_plain;h=96e80a7851b44f3decaac0625665cd64e550b71d;hp=-c

Merge git://git./linux/kernel/git/pkl/squashfs-next

* 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
---

96e80a7851b44f3decaac0625665cd64e550b71d
diff --combined fs/squashfs/super.c
index d0858c2d9a4,4619247d74e..ecaa2f7bdb8
--- a/fs/squashfs/super.c
+++ b/fs/squashfs/super.c
@@@ -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));
  }