Merge branch 'omap-clock-fixes' of git://git.pwsan.com/linux-2.6

[linux-2.6-omap-h63xx.git] / fs / ext2 / ialloc.c

diff --git a/fs/ext2/ialloc.c b/fs/ext2/ialloc.c
index 66321a877e7458795616e0568c58fac83e0437fd..15387c9c17d8f77f36c7eeb053a9fcb779f15598 100644 (file)
--- a/fs/ext2/ialloc.c
+++ b/fs/ext2/ialloc.c
@@ -121,8 +121,8 @@ void ext2_free_inode (struct inode * inode)
        if (!is_bad_inode(inode)) {
                /* Quota is already initialized in iput() */
                ext2_xattr_delete_inode(inode);
-               DQUOT_FREE_INODE(inode);
-               DQUOT_DROP(inode);
+               vfs_dq_free_inode(inode);
+               vfs_dq_drop(inode);
        }
 
        es = EXT2_SB(sb)->s_es;
@@ -586,7 +586,7 @@ got:
                goto fail_drop;
        }
 
-       if (DQUOT_ALLOC_INODE(inode)) {
+       if (vfs_dq_alloc_inode(inode)) {
                err = -EDQUOT;
                goto fail_drop;
        }
@@ -605,10 +605,10 @@ got:
        return inode;
 
 fail_free_drop:
-       DQUOT_FREE_INODE(inode);
+       vfs_dq_free_inode(inode);
 
 fail_drop:
-       DQUOT_DROP(inode);
+       vfs_dq_drop(inode);
        inode->i_flags |= S_NOQUOTA;
        inode->i_nlink = 0;
        unlock_new_inode(inode);