diff options
author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-07-02 08:39:09 -0400 |
---|---|---|
committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-07-02 08:39:09 -0400 |
commit | d2f6409584e2c62ffad81690562330ff3bf4a458 (patch) | |
tree | 3bdfb97d0b51be2f7f414f2107e97603c1206abb /fs/xfs/xfs_log_priv.h | |
parent | e1b09eba2686eca94a3a188042b518df6044a3c1 (diff) | |
parent | 4a89a04f1ee21a7c1f4413f1ad7dcfac50ff9b63 (diff) |
Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'fs/xfs/xfs_log_priv.h')
-rw-r--r-- | fs/xfs/xfs_log_priv.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/xfs/xfs_log_priv.h b/fs/xfs/xfs_log_priv.h index c31e3ce3be66..1a1d452f15f9 100644 --- a/fs/xfs/xfs_log_priv.h +++ b/fs/xfs/xfs_log_priv.h | |||
@@ -535,7 +535,6 @@ typedef struct log { | |||
535 | 535 | ||
536 | /* common routines */ | 536 | /* common routines */ |
537 | extern xfs_lsn_t xlog_assign_tail_lsn(struct xfs_mount *mp); | 537 | extern xfs_lsn_t xlog_assign_tail_lsn(struct xfs_mount *mp); |
538 | extern int xlog_find_head(xlog_t *log, xfs_daddr_t *head_blk); | ||
539 | extern int xlog_find_tail(xlog_t *log, | 538 | extern int xlog_find_tail(xlog_t *log, |
540 | xfs_daddr_t *head_blk, | 539 | xfs_daddr_t *head_blk, |
541 | xfs_daddr_t *tail_blk, | 540 | xfs_daddr_t *tail_blk, |
@@ -548,7 +547,6 @@ extern void xlog_recover_process_iunlinks(xlog_t *log); | |||
548 | extern struct xfs_buf *xlog_get_bp(xlog_t *, int); | 547 | extern struct xfs_buf *xlog_get_bp(xlog_t *, int); |
549 | extern void xlog_put_bp(struct xfs_buf *); | 548 | extern void xlog_put_bp(struct xfs_buf *); |
550 | extern int xlog_bread(xlog_t *, xfs_daddr_t, int, struct xfs_buf *); | 549 | extern int xlog_bread(xlog_t *, xfs_daddr_t, int, struct xfs_buf *); |
551 | extern xfs_caddr_t xlog_align(xlog_t *, xfs_daddr_t, int, struct xfs_buf *); | ||
552 | 550 | ||
553 | /* iclog tracing */ | 551 | /* iclog tracing */ |
554 | #define XLOG_TRACE_GRAB_FLUSH 1 | 552 | #define XLOG_TRACE_GRAB_FLUSH 1 |