vserver 2.0 rc7

[linux-2.6.git] / include / linux / ext3_jbd.h

diff --git a/include/linux/ext3_jbd.h b/include/linux/ext3_jbd.h
index 47445f9..e8292af 100644 (file)
--- a/include/linux/ext3_jbd.h
+++ b/include/linux/ext3_jbd.h
@@ -111,9 +111,9 @@ void ext3_journal_abort_handle(const char *caller, const char *err_fn,
 
 static inline int
 __ext3_journal_get_undo_access(const char *where, handle_t *handle,
-                               struct buffer_head *bh, int *credits)
+                               struct buffer_head *bh)
 {
-       int err = journal_get_undo_access(handle, bh, credits);
+       int err = journal_get_undo_access(handle, bh);
        if (err)
                ext3_journal_abort_handle(where, __FUNCTION__, bh, handle,err);
        return err;
@@ -121,19 +121,18 @@ __ext3_journal_get_undo_access(const char *where, handle_t *handle,
 
 static inline int
 __ext3_journal_get_write_access(const char *where, handle_t *handle,
-                               struct buffer_head *bh, int *credits)
+                               struct buffer_head *bh)
 {
-       int err = journal_get_write_access(handle, bh, credits);
+       int err = journal_get_write_access(handle, bh);
        if (err)
                ext3_journal_abort_handle(where, __FUNCTION__, bh, handle,err);
        return err;
 }
 
 static inline void
-ext3_journal_release_buffer(handle_t *handle, struct buffer_head *bh,
-                               int credits)
+ext3_journal_release_buffer(handle_t *handle, struct buffer_head *bh)
 {
-       journal_release_buffer(handle, bh, credits);
+       journal_release_buffer(handle, bh);
 }
 
 static inline int
@@ -176,12 +175,10 @@ __ext3_journal_dirty_metadata(const char *where,
 }
 
 
-#define ext3_journal_get_undo_access(handle, bh, credits) \
-       __ext3_journal_get_undo_access(__FUNCTION__, (handle), (bh), (credits))
+#define ext3_journal_get_undo_access(handle, bh) \
+       __ext3_journal_get_undo_access(__FUNCTION__, (handle), (bh))
 #define ext3_journal_get_write_access(handle, bh) \
-       __ext3_journal_get_write_access(__FUNCTION__, (handle), (bh), NULL)
-#define ext3_journal_get_write_access_credits(handle, bh, credits) \
-       __ext3_journal_get_write_access(__FUNCTION__, (handle), (bh), (credits))
+       __ext3_journal_get_write_access(__FUNCTION__, (handle), (bh))
 #define ext3_journal_revoke(handle, blocknr, bh) \
        __ext3_journal_revoke(__FUNCTION__, (handle), (blocknr), (bh))
 #define ext3_journal_get_create_access(handle, bh) \