patch-2.4.11-dontuse linux/fs/reiserfs/objectid.c

• Lines: 48
• Date: Mon Oct 8 11:52:58 2001
• Orig file: v2.4.10/linux/fs/reiserfs/objectid.c
• Orig date: Sun Sep 23 11:41:00 2001

diff -u --recursive --new-file v2.4.10/linux/fs/reiserfs/objectid.c linux/fs/reiserfs/objectid.c
@@ -26,6 +26,9 @@
     // FIXME: add something else here
 }
 
+#else
+static void check_objectid_map (struct super_block * s, __u32 * map)
+{;}
 #endif
 
 
@@ -53,9 +56,7 @@
     __u32 unused_objectid;
 
 
-#ifdef CONFIG_REISERFS_CHECK
     check_objectid_map (s, map);
-#endif
 
     reiserfs_prepare_for_journal(s, SB_BUFFER_WITH_SB(s), 1) ;
                                 /* comment needed -Hans */
@@ -101,9 +102,7 @@
     int i = 0;
 
     //return;
-#ifdef CONFIG_REISERFS_CHECK
     check_objectid_map (s, map);
-#endif
 
     reiserfs_prepare_for_journal(s, SB_BUFFER_WITH_SB(s), 1) ;
     journal_mark_dirty(th, s, SB_BUFFER_WITH_SB (s)); 
@@ -129,13 +128,10 @@
 		//disk_sb->s_oid_cursize -= 2;
 		rs->s_oid_cursize = cpu_to_le16 (le16_to_cpu (rs->s_oid_cursize) - 2);
 
-#ifdef CONFIG_REISERFS_CHECK
-		if (le16_to_cpu (rs->s_oid_cursize) < 2 || 
-		    le16_to_cpu (rs->s_oid_cursize) > le16_to_cpu (rs->s_oid_maxsize))
-		    reiserfs_panic (s, "vs-15005: reiserfs_release_objectid: "
-				    "objectid map corrupted cur_size == %d (max == %d)",
-				    le16_to_cpu (rs->s_oid_cursize), le16_to_cpu (rs->s_oid_maxsize));
-#endif
+		RFALSE( le16_to_cpu (rs->s_oid_cursize) < 2 || 
+			le16_to_cpu (rs->s_oid_cursize) > le16_to_cpu (rs->s_oid_maxsize),
+			"vs-15005: objectid map corrupted cur_size == %d (max == %d)",
+			le16_to_cpu (rs->s_oid_cursize), le16_to_cpu (rs->s_oid_maxsize));
 	    }
 	    return;
 	}