Branch HEAD

b=14948
i=green
i=shadow

2.6.18 calls truncate_inode_pages() only if op->delete_inode() is
not installed, whereas 2.6.9 calls it in both cases.

diff --git a/lustre/llite/llite_lib.c b/lustre/llite/llite_lib.c
index 43651c6..0fd008c 100644 (file)
--- a/lustre/llite/llite_lib.c
+++ b/lustre/llite/llite_lib.c
@@ -1818,6 +1818,7 @@ void ll_delete_inode(struct inode *inode)
         if (rc) {
                 CERROR("fid_delete() failed, rc %d\n", rc);
         }
+        truncate_inode_pages(&inode->i_data, 0);
         clear_inode(inode);
 
         EXIT;