summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathan Scott <nathans@sgi.com>2003-05-20 01:20:49 +0200
committerChristoph Hellwig <hch@sgi.com>2003-05-20 01:20:49 +0200
commitef2ead69001ddb538271639150cffb04e5f5d61b (patch)
treeb4e3cf616ae74107bfca618dee27ee0d073d9c66
parente6963ec272bc3edb7595828625822c9a03c5b9a0 (diff)
[XFS] Remove some dead code.
SGI Modid: 2.5.x-xfs:slinx:149409a
-rw-r--r--fs/xfs/xfs_log.c13
-rw-r--r--fs/xfs/xfs_log.h3
-rw-r--r--fs/xfs/xfs_log_priv.h6
3 files changed, 4 insertions, 18 deletions
diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c
index 38f951f3fcf0..7cde4a20e03a 100644
--- a/fs/xfs/xfs_log.c
+++ b/fs/xfs/xfs_log.c
@@ -414,19 +414,6 @@ xfs_log_release_iclog(xfs_mount_t *mp,
}
/*
- * Initialize log manager data. This routine is intended to be called when
- * a system boots up. It is not a per filesystem initialization.
- *
- * As you can see, we currently do nothing.
- */
-int
-xfs_log_init(void)
-{
- return( 0 );
-}
-
-
-/*
* 1. Reserve an amount of on-disk log space and return a ticket corresponding
* to the reservation.
* 2. Potentially, push buffers at tail of log to disk.
diff --git a/fs/xfs/xfs_log.h b/fs/xfs/xfs_log.h
index 7b280da83a4d..1bb2452296b5 100644
--- a/fs/xfs/xfs_log.h
+++ b/fs/xfs/xfs_log.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000-2002 Silicon Graphics, Inc. All Rights Reserved.
+ * Copyright (c) 2000-2003 Silicon Graphics, Inc. All Rights Reserved.
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of version 2 of the GNU General Public License as
@@ -153,7 +153,6 @@ xfs_lsn_t xfs_log_done(struct xfs_mount *mp,
int xfs_log_force(struct xfs_mount *mp,
xfs_lsn_t lsn,
uint flags);
-int xfs_log_init(void);
int xfs_log_mount(struct xfs_mount *mp,
dev_t log_dev,
xfs_daddr_t start_block,
diff --git a/fs/xfs/xfs_log_priv.h b/fs/xfs/xfs_log_priv.h
index 17ea58509b66..bc36172162bf 100644
--- a/fs/xfs/xfs_log_priv.h
+++ b/fs/xfs/xfs_log_priv.h
@@ -205,9 +205,9 @@ void xlog_grant_add_space(struct log *log, int bytes, int type);
#define LOG_LOCK(log) mutex_spinlock(&(log)->l_icloglock)
#define LOG_UNLOCK(log, s) mutex_spinunlock(&(log)->l_icloglock, s)
-#define xlog_panic(s) {cmn_err(CE_PANIC, s); }
-#define xlog_exit(s) {cmn_err(CE_PANIC, s); }
-#define xlog_warn(s) {cmn_err(CE_WARN, s); }
+#define xlog_panic(args...) cmn_err(CE_PANIC, ## args)
+#define xlog_exit(args...) cmn_err(CE_PANIC, ## args)
+#define xlog_warn(args...) cmn_err(CE_WARN, ## args)
/*
* In core log state