[GFS2] Update copyright date to 2006

[mirror_ubuntu-jammy-kernel.git] / fs / gfs2 / log.c

diff --git a/fs/gfs2/log.c b/fs/gfs2/log.c
index 9e32e0faaf20ae3b1618a411fe72cf3a3a9641e1..2a8b4b71dd1fa1f06aae40112772224a3572284c 100644 (file)
--- a/fs/gfs2/log.c
+++ b/fs/gfs2/log.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) Sistina Software, Inc.  1997-2003 All rights reserved.
- * Copyright (C) 2004-2005 Red Hat, Inc.  All rights reserved.
+ * Copyright (C) 2004-2006 Red Hat, Inc.  All rights reserved.
  *
  * This copyrighted material is made available to anyone wishing to use,
  * modify, copy, or redistribute it subject to the terms and conditions
@@ -14,7 +14,6 @@
 #include <linux/buffer_head.h>
 #include <linux/gfs2_ondisk.h>
 #include <linux/crc32.h>
-#include <asm/semaphore.h>
 
 #include "gfs2.h"
 #include "lm_interface.h"
@@ -211,9 +210,9 @@ static uint64_t log_bmap(struct gfs2_sbd *sdp, unsigned int lbn)
        int new = 0;
        uint64_t dbn;
        int error;
+       int bdy;
 
-       error = gfs2_block_map(sdp->sd_jdesc->jd_inode->u.generic_ip,
-                              lbn, &new, &dbn, NULL);
+       error = gfs2_block_map(sdp->sd_jdesc->jd_inode, lbn, &new, &dbn, &bdy);
        gfs2_assert_withdraw(sdp, !error && dbn);
 
        return dbn;
@@ -587,10 +586,9 @@ void gfs2_log_shutdown(struct gfs2_sbd *sdp)
        log_write_header(sdp, GFS2_LOG_HEAD_UNMOUNT, 0);
 
        /* printk(KERN_INFO "sd_log_blks_free %u, sd_jdesc->jd_blocks %u\n", sdp->sd_log_blks_free, sdp->sd_jdesc->jd_blocks); */
-       gfs2_assert_withdraw(sdp, sdp->sd_log_blks_free ==
-                            sdp->sd_jdesc->jd_blocks);
-       gfs2_assert_withdraw(sdp, sdp->sd_log_head == sdp->sd_log_tail);
-       gfs2_assert_withdraw(sdp, list_empty(&sdp->sd_ail2_list));
+       gfs2_assert_warn(sdp, sdp->sd_log_blks_free == sdp->sd_jdesc->jd_blocks);
+       gfs2_assert_warn(sdp, sdp->sd_log_head == sdp->sd_log_tail);
+       gfs2_assert_warn(sdp, list_empty(&sdp->sd_ail2_list));
 
        sdp->sd_log_head = sdp->sd_log_flush_head;
        sdp->sd_log_tail = sdp->sd_log_head;