patch-2.4.0-test9 linux/include/linux/hfs_sysdep.h

Next file: linux/include/linux/highmem.h
Previous file: linux/include/linux/hfs_fs.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.0-test8/linux/include/linux/hfs_sysdep.h linux/include/linux/hfs_sysdep.h
@@ -52,7 +52,7 @@
 extern long int hfs_alloc;
 #endif
 
-extern inline void *hfs_malloc(unsigned int size) {
+static inline void *hfs_malloc(unsigned int size) {
 #if defined(DEBUG_ALL) || defined(DEBUG_MEM)
 	hfs_warn("%ld bytes allocation at %s:%u\n",
 		 (hfs_alloc += size), __FILE__, __LINE__);
@@ -60,7 +60,7 @@
 	return kmalloc(size, GFP_KERNEL);
 }
 
-extern inline void hfs_free(void *ptr, unsigned int size) {
+static inline void hfs_free(void *ptr, unsigned int size) {
 	kfree(ptr);
 #if defined(DEBUG_ALL) || defined(DEBUG_MEM)
 	hfs_warn("%ld bytes allocation at %s:%u\n",
@@ -75,17 +75,17 @@
  *       not a good thing to do. instead, we depend upon tz_minuteswest
  *       having the correct daylight savings correction. 
  */
-extern inline hfs_u32 hfs_from_utc(hfs_s32 time)
+static inline hfs_u32 hfs_from_utc(hfs_s32 time)
 {
 	return time - sys_tz.tz_minuteswest*60; 
 }
 
-extern inline hfs_s32 hfs_to_utc(hfs_u32 time)
+static inline hfs_s32 hfs_to_utc(hfs_u32 time)
 {
 	return time + sys_tz.tz_minuteswest*60;
 }
 
-extern inline hfs_u32 hfs_time(void) {
+static inline hfs_u32 hfs_time(void) {
 	return htonl(hfs_from_utc(CURRENT_TIME)+2082844800U);
 }
 
@@ -95,19 +95,19 @@
  */
 typedef wait_queue_head_t hfs_wait_queue;
 
-extern inline void hfs_init_waitqueue(hfs_wait_queue *queue) {
+static inline void hfs_init_waitqueue(hfs_wait_queue *queue) {
         init_waitqueue_head(queue);
 }
 
-extern inline void hfs_sleep_on(hfs_wait_queue *queue) {
+static inline void hfs_sleep_on(hfs_wait_queue *queue) {
 	sleep_on(queue);
 }
 
-extern inline void hfs_wake_up(hfs_wait_queue *queue) {
+static inline void hfs_wake_up(hfs_wait_queue *queue) {
 	wake_up(queue);
 }
 
-extern inline void hfs_relinquish(void) {
+static inline void hfs_relinquish(void) {
 	schedule();
 }
 
@@ -117,11 +117,11 @@
  */
 typedef struct super_block *hfs_sysmdb;
 
-extern inline void hfs_mdb_dirty(hfs_sysmdb sys_mdb) {
+static inline void hfs_mdb_dirty(hfs_sysmdb sys_mdb) {
 	sys_mdb->s_dirt = 1;
 }
 
-extern inline const char *hfs_mdb_name(hfs_sysmdb sys_mdb) {
+static inline const char *hfs_mdb_name(hfs_sysmdb sys_mdb) {
 	return kdevname(sys_mdb->s_dev);
 }
 
@@ -141,19 +141,19 @@
 /* In sysdep.c, since it needs HFS_SECTOR_SIZE */
 extern hfs_buffer hfs_buffer_get(hfs_sysmdb, int, int);
 
-extern inline int hfs_buffer_ok(hfs_buffer buffer) {
+static inline int hfs_buffer_ok(hfs_buffer buffer) {
 	return (buffer != NULL);
 }
 
-extern inline void hfs_buffer_put(hfs_buffer buffer) {
+static inline void hfs_buffer_put(hfs_buffer buffer) {
 	brelse(buffer);
 }
 
-extern inline void hfs_buffer_dirty(hfs_buffer buffer) {
+static inline void hfs_buffer_dirty(hfs_buffer buffer) {
 	mark_buffer_dirty(buffer);
 }
 
-extern inline void hfs_buffer_sync(hfs_buffer buffer) {
+static inline void hfs_buffer_sync(hfs_buffer buffer) {
 	while (buffer_locked(buffer)) {
 		wait_on_buffer(buffer);
 	}
@@ -163,7 +163,7 @@
 	}
 }
 
-extern inline void *hfs_buffer_data(const hfs_buffer buffer) {
+static inline void *hfs_buffer_data(const hfs_buffer buffer) {
 	return buffer->b_data;
 }
 
@@ -199,15 +199,15 @@
 #	error "Don't know if bytes are big- or little-endian!"
 #endif
 
-extern inline int hfs_clear_bit(int bitnr, hfs_u32 *lword) {
+static inline int hfs_clear_bit(int bitnr, hfs_u32 *lword) {
 	return test_and_clear_bit(BITNR(bitnr), lword);
 }
 
-extern inline int hfs_set_bit(int bitnr, hfs_u32 *lword) {
+static inline int hfs_set_bit(int bitnr, hfs_u32 *lword) {
 	return test_and_set_bit(BITNR(bitnr), lword);
 }
 
-extern inline int hfs_test_bit(int bitnr, const hfs_u32 *lword) {
+static inline int hfs_test_bit(int bitnr, const hfs_u32 *lword) {
 	/* the kernel should declare the second arg of test_bit as const */
 	return test_bit(BITNR(bitnr), (void *)lword);
 }

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)