[PATCH] Fix for shmem_truncate_range() BUG_ON()

[net-next-2.6.git] / mm / shmem.c

diff --git a/mm/shmem.c b/mm/shmem.c
index 4bb28d218eb5caf064026e479873cc994e282a88..70da7a0981bfbad9683b5e9b0747277256a678ff 100644 (file)
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -515,7 +515,12 @@ static void shmem_truncate_range(struct inode *inode, loff_t start, loff_t end)
                        size = SHMEM_NR_DIRECT;
                nr_swaps_freed = shmem_free_swp(ptr+idx, ptr+size);
        }
-       if (!topdir)
+
+       /*
+        * If there are no indirect blocks or we are punching a hole
+        * below indirect blocks, nothing to be done.
+        */
+       if (!topdir || (punch_hole && (limit <= SHMEM_NR_DIRECT)))
                goto done2;
 
        BUG_ON(limit <= SHMEM_NR_DIRECT);