dquot: move dquot initialization responsibility into the filesystem

[safe/jmp/linux-2.6] / fs / jfs / inode.c

diff --git a/fs/jfs/inode.c b/fs/jfs/inode.c
index 2562d18..1aa2dda 100644 (file)
--- a/fs/jfs/inode.c
+++ b/fs/jfs/inode.c
@@ -146,6 +146,9 @@ void jfs_delete_inode(struct inode *inode)
 {
        jfs_info("In jfs_delete_inode, inode = 0x%p", inode);
 
+       if (!is_bad_inode(inode))
+               vfs_dq_init(inode);
+
        if (!is_bad_inode(inode) &&
            (JFS_IP(inode)->fileset == FILESYSTEM_I)) {
                truncate_inode_pages(&inode->i_data, 0);
@@ -160,7 +163,7 @@ void jfs_delete_inode(struct inode *inode)
                 */
                vfs_dq_init(inode);
                dquot_free_inode(inode);
-               vfs_dq_drop(inode);
+               dquot_drop(inode);
        }
 
        clear_inode(inode);