[PATCH] move truncate_inode_pages() into ->delete_inode()

[sfrench/cifs-2.6.git] / fs / inode.c

diff --git a/fs/inode.c b/fs/inode.c
index 71df1b1e8f75a87910357025048b38ba7d382df6..f80a79ff156b5c4feafe54d17fee693fdec6b71c 100644 (file)
--- a/fs/inode.c
+++ b/fs/inode.c
@@ -1034,19 +1034,21 @@ void generic_delete_inode(struct inode *inode)
        inodes_stat.nr_inodes--;
        spin_unlock(&inode_lock);
 
        inodes_stat.nr_inodes--;
        spin_unlock(&inode_lock);
 

-       if (inode->i_data.nrpages)
-               truncate_inode_pages(&inode->i_data, 0);
-

        security_inode_delete(inode);
 
        if (op->delete_inode) {
                void (*delete)(struct inode *) = op->delete_inode;
                if (!is_bad_inode(inode))
                        DQUOT_INIT(inode);
        security_inode_delete(inode);
 
        if (op->delete_inode) {
                void (*delete)(struct inode *) = op->delete_inode;
                if (!is_bad_inode(inode))
                        DQUOT_INIT(inode);

-               /* s_op->delete_inode internally recalls clear_inode() */
+               /* Filesystems implementing their own
+                * s_op->delete_inode are required to call
+                * truncate_inode_pages and clear_inode()
+                * internally */

                delete(inode);
                delete(inode);

-       } else
+       } else {
+               truncate_inode_pages(&inode->i_data, 0);

                clear_inode(inode);
                clear_inode(inode);

+       }

        spin_lock(&inode_lock);
        hlist_del_init(&inode->i_hash);
        spin_unlock(&inode_lock);
        spin_lock(&inode_lock);
        hlist_del_init(&inode->i_hash);
        spin_unlock(&inode_lock);