dquot: cleanup inode allocation / freeing routines

[linux-2.6-block.git] / fs / ufs / ialloc.c

diff --git a/fs/ufs/ialloc.c b/fs/ufs/ialloc.c
index 3527c00fef0d7ebfc8a3df39a96618073ff6d883..02f77882c5732c8f9afd733a35d4f59d1c3e1f87 100644 (file)
--- a/fs/ufs/ialloc.c
+++ b/fs/ufs/ialloc.c
@@ -95,7 +95,7 @@ void ufs_free_inode (struct inode * inode)
 
        is_directory = S_ISDIR(inode->i_mode);
 
-       vfs_dq_free_inode(inode);
+       dquot_free_inode(inode);
        vfs_dq_drop(inode);
 
        clear_inode (inode);
@@ -355,9 +355,10 @@ cg_found:
 
        unlock_super (sb);
 
-       if (vfs_dq_alloc_inode(inode)) {
+       vfs_dq_init(inode);
+       err = dquot_alloc_inode(inode);
+       if (err) {
                vfs_dq_drop(inode);
-               err = -EDQUOT;
                goto fail_without_unlock;
        }