[TCP]: NewReno must count every skb while marking losses

[linux-2.6-omap-h63xx.git] / fs / gfs2 / util.c

diff --git a/fs/gfs2/util.c b/fs/gfs2/util.c
index e5707a9f78c2091901813acee8d4db23a1e06029..424a0774eda81268b1daf3eff28ae82a636c6ad8 100644 (file)
--- a/fs/gfs2/util.c
+++ b/fs/gfs2/util.c
@@ -7,7 +7,6 @@
  * of the GNU General Public License version 2.
  */
 
-#include <linux/sched.h>
 #include <linux/slab.h>
 #include <linux/spinlock.h>
 #include <linux/completion.h>
@@ -116,8 +115,8 @@ int gfs2_consist_inode_i(struct gfs2_inode *ip, int cluster_wide,
                "GFS2: fsid=%s:   inode = %llu %llu\n"
                "GFS2: fsid=%s:   function = %s, file = %s, line = %u\n",
                sdp->sd_fsname,
-               sdp->sd_fsname, (unsigned long long)ip->i_num.no_formal_ino,
-               (unsigned long long)ip->i_num.no_addr,
+               sdp->sd_fsname, (unsigned long long)ip->i_no_formal_ino,
+               (unsigned long long)ip->i_no_addr,
                sdp->sd_fsname, function, file, line);
        return rv;
 }
@@ -138,7 +137,7 @@ int gfs2_consist_rgrpd_i(struct gfs2_rgrpd *rgd, int cluster_wide,
                "GFS2: fsid=%s:   RG = %llu\n"
                "GFS2: fsid=%s:   function = %s, file = %s, line = %u\n",
                sdp->sd_fsname,
-               sdp->sd_fsname, (unsigned long long)rgd->rd_ri.ri_addr,
+               sdp->sd_fsname, (unsigned long long)rgd->rd_addr,
                sdp->sd_fsname, function, file, line);
        return rv;
 }