vserver 1.9.5.x5

[linux-2.6.git] / fs / reiserfs / objectid.c

diff --git a/fs/reiserfs/objectid.c b/fs/reiserfs/objectid.c
index f6a289f..0785c43 100644 (file)
--- a/fs/reiserfs/objectid.c
+++ b/fs/reiserfs/objectid.c
@@ -55,6 +55,7 @@ __u32 reiserfs_get_unused_objectid (struct reiserfs_transaction_handle *th)
     __u32 * map = objectid_map (s, rs);
     __u32 unused_objectid;
 
+    BUG_ON (!th->t_trans_id);
 
     check_objectid_map (s, map);
 
@@ -62,7 +63,7 @@ __u32 reiserfs_get_unused_objectid (struct reiserfs_transaction_handle *th)
                                 /* comment needed -Hans */
     unused_objectid = le32_to_cpu (map[1]);
     if (unused_objectid == U32_MAX) {
-       printk ("REISERFS: get_objectid: no more object ids\n");
+       reiserfs_warning (s, "%s: no more object ids", __FUNCTION__);
        reiserfs_restore_prepared_buffer(s, SB_BUFFER_WITH_SB(s)) ;
        return 0;
     }
@@ -99,6 +100,7 @@ void reiserfs_release_objectid (struct reiserfs_transaction_handle *th,
     __u32 * map = objectid_map (s, rs);
     int i = 0;
 
+    BUG_ON (!th->t_trans_id);
     //return;
     check_objectid_map (s, map);
 
@@ -159,7 +161,7 @@ void reiserfs_release_objectid (struct reiserfs_transaction_handle *th,
        i += 2;
     }
 
-    reiserfs_warning ("vs-15011: reiserfs_release_objectid: tried to free free object id (%lu)\n", 
+    reiserfs_warning (s, "vs-15011: reiserfs_release_objectid: tried to free free object id (%lu)",
                      ( long unsigned ) objectid_to_release);
 }