Merge branch 'reiserfs-updates' from Jeff Mahoney

[pandora-kernel.git] / fs / reiserfs / stree.c

diff --git a/fs/reiserfs/stree.c b/fs/reiserfs/stree.c
index e23303d..d036ee5 100644 (file)
--- a/fs/reiserfs/stree.c
+++ b/fs/reiserfs/stree.c
@@ -1262,7 +1262,7 @@ int reiserfs_delete_item(struct reiserfs_transaction_handle *th,
                       "reiserquota delete_item(): freeing %u, id=%u type=%c",
                       quota_cut_bytes, inode->i_uid, head2type(&s_ih));
 #endif
-       DQUOT_FREE_SPACE_NODIRTY(inode, quota_cut_bytes);
+       vfs_dq_free_space_nodirty(inode, quota_cut_bytes);
 
        /* Return deleted body length */
        return ret_value;
@@ -1346,7 +1346,7 @@ void reiserfs_delete_solid_item(struct reiserfs_transaction_handle *th,
                                               quota_cut_bytes, inode->i_uid,
                                               key2type(key));
 #endif
-                               DQUOT_FREE_SPACE_NODIRTY(inode,
+                               vfs_dq_free_space_nodirty(inode,
                                                         quota_cut_bytes);
                        }
                        break;
@@ -1696,7 +1696,7 @@ int reiserfs_cut_from_item(struct reiserfs_transaction_handle *th,
                       "reiserquota cut_from_item(): freeing %u id=%u type=%c",
                       quota_cut_bytes, inode->i_uid, '?');
 #endif
-       DQUOT_FREE_SPACE_NODIRTY(inode, quota_cut_bytes);
+       vfs_dq_free_space_nodirty(inode, quota_cut_bytes);
        return ret_value;
 }
 
@@ -1931,7 +1931,7 @@ int reiserfs_paste_into_item(struct reiserfs_transaction_handle *th, struct tree
                       key2type(&(key->on_disk_key)));
 #endif
 
-       if (DQUOT_ALLOC_SPACE_NODIRTY(inode, pasted_size)) {
+       if (vfs_dq_alloc_space_nodirty(inode, pasted_size)) {
                pathrelse(search_path);
                return -EDQUOT;
        }
@@ -1987,7 +1987,7 @@ int reiserfs_paste_into_item(struct reiserfs_transaction_handle *th, struct tree
                       pasted_size, inode->i_uid,
                       key2type(&(key->on_disk_key)));
 #endif
-       DQUOT_FREE_SPACE_NODIRTY(inode, pasted_size);
+       vfs_dq_free_space_nodirty(inode, pasted_size);
        return retval;
 }
 
@@ -2025,7 +2025,7 @@ int reiserfs_insert_item(struct reiserfs_transaction_handle *th,
 #endif
                /* We can't dirty inode here. It would be immediately written but
                 * appropriate stat item isn't inserted yet... */
-               if (DQUOT_ALLOC_SPACE_NODIRTY(inode, quota_bytes)) {
+               if (vfs_dq_alloc_space_nodirty(inode, quota_bytes)) {
                        pathrelse(path);
                        return -EDQUOT;
                }
@@ -2076,6 +2076,6 @@ int reiserfs_insert_item(struct reiserfs_transaction_handle *th,
                       quota_bytes, inode->i_uid, head2type(ih));
 #endif
        if (inode)
-               DQUOT_FREE_SPACE_NODIRTY(inode, quota_bytes);
+               vfs_dq_free_space_nodirty(inode, quota_bytes);
        return retval;
 }