Merge commit 'v2.6.34-rc1' into for-2.6.35

[cascardo/linux.git] / fs / ufs / ialloc.c

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