Merge branch 'for-linus' from kernel.org:/.../shaggy/jfs-2.6 manually

Clash due to new delete_inode behavior (the filesystem now needs to do
the truncate_inode_pages() call itself).

Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 13 insertions, 13 deletions

diff --git a/fs/jfs/inode.c b/fs/jfs/inode.c
index cff352f4ec18..0ec62d5310db 100644
--- a/fs/jfs/inode.c
+++ b/fs/jfs/inode.c
@@ -128,23 +128,23 @@ void jfs_delete_inode(struct inode *inode)
 {
         jfs_info("In jfs_delete_inode, inode = 0x%p", inode);
 
-        if (is_bad_inode(inode) ||
-            (JFS_IP(inode)->fileset != cpu_to_le32(FILESYSTEM_I)))
-                        return;
+        if (!is_bad_inode(inode) &&
+            (JFS_IP(inode)->fileset == cpu_to_le32(FILESYSTEM_I))) {
 
-        truncate_inode_pages(&inode->i_data, 0);
+                truncate_inode_pages(&inode->i_data, 0);
 
-        if (test_cflag(COMMIT_Freewmap, inode))
-                jfs_free_zero_link(inode);
+                if (test_cflag(COMMIT_Freewmap, inode))
+                        jfs_free_zero_link(inode);
 
-        diFree(inode);
+                diFree(inode);
 
-        /*
-         * Free the inode from the quota allocation.
-         */
-        DQUOT_INIT(inode);
-        DQUOT_FREE_INODE(inode);
-        DQUOT_DROP(inode);
+                /*
+                 * Free the inode from the quota allocation.
+                 */
+                DQUOT_INIT(inode);
+                DQUOT_FREE_INODE(inode);
+                DQUOT_DROP(inode);
+        }
 
         clear_inode(inode);
 }