[GFS2] split and annotate gfs2_meta_header [9/70]

From e928a76f959e89884f6186bb6f846c533847d5df Mon Sep 17 00:00:00 2001
From: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
Date: Fri, 13 Oct 2006 21:57:23 -0400
Subject: [PATCH] [GFS2] split and annotate gfs2_meta_header

Signed-off-by: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Steven Whitehouse <swhiteho@xxxxxxxxxx>
---
fs/gfs2/ondisk.c | 6 +++---
include/linux/gfs2_ondisk.h | 14 ++++++++++----
2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/fs/gfs2/ondisk.c b/fs/gfs2/ondisk.c
index 84b1ebc..b5aa7ab 100644
--- a/fs/gfs2/ondisk.c
+++ b/fs/gfs2/ondisk.c
@@ -54,7 +54,7 @@ static void gfs2_inum_print(const struct
printk(KERN_INFO " no_addr = %llu\n", (unsigned long long)no->no_addr);
}

-static void gfs2_meta_header_in(struct gfs2_meta_header *mh, const void *buf)
+static void gfs2_meta_header_in(struct gfs2_meta_header_host *mh, const void *buf)
{
const struct gfs2_meta_header *str = buf;

@@ -63,7 +63,7 @@ static void gfs2_meta_header_in(struct g
mh->mh_format = be32_to_cpu(str->mh_format);
}

-static void gfs2_meta_header_out(const struct gfs2_meta_header *mh, void *buf)
+static void gfs2_meta_header_out(const struct gfs2_meta_header_host *mh, void *buf)
{
struct gfs2_meta_header *str = buf;

@@ -72,7 +72,7 @@ static void gfs2_meta_header_out(const s
str->mh_format = cpu_to_be32(mh->mh_format);
}

-static void gfs2_meta_header_print(const struct gfs2_meta_header *mh)
+static void gfs2_meta_header_print(const struct gfs2_meta_header_host *mh)
{
pv(mh, mh_magic, "0x%.8X");
pv(mh, mh_type, "%u");
diff --git a/include/linux/gfs2_ondisk.h b/include/linux/gfs2_ondisk.h
index fb69a64..76eb9e1 100644
--- a/include/linux/gfs2_ondisk.h
+++ b/include/linux/gfs2_ondisk.h
@@ -89,6 +89,12 @@ struct gfs2_meta_header {
__be32 __pad1; /* Was incarnation number in gfs1 */
};

+struct gfs2_meta_header_host {
+ __u32 mh_magic;
+ __u32 mh_type;
+ __u32 mh_format;
+};
+
/*
* super-block structure
*
@@ -129,7 +135,7 @@ struct gfs2_sb {
};

struct gfs2_sb_host {
- struct gfs2_meta_header sb_header;
+ struct gfs2_meta_header_host sb_header;

__u32 sb_fs_format;
__u32 sb_multihost_format;
@@ -194,7 +200,7 @@ struct gfs2_rgrp {
};

struct gfs2_rgrp_host {
- struct gfs2_meta_header rg_header;
+ struct gfs2_meta_header_host rg_header;

__u32 rg_flags;
__u32 rg_free;
@@ -297,7 +303,7 @@ struct gfs2_dinode {
};

struct gfs2_dinode_host {
- struct gfs2_meta_header di_header;
+ struct gfs2_meta_header_host di_header;

struct gfs2_inum di_num;

@@ -406,7 +412,7 @@ struct gfs2_log_header {
};

struct gfs2_log_header_host {
- struct gfs2_meta_header lh_header;
+ struct gfs2_meta_header_host lh_header;

__u64 lh_sequence; /* Sequence number of this transaction */
__u32 lh_flags; /* GFS2_LOG_HEAD_... */
--
1.4.1



-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

Relevant Pages

  • [GFS2] Red Hat bz 228540: owner references [11/34]
    ... Subject: [PATCH] Red Hat bz 228540: owner references ... I uncovered some gfs2 badness. ... static inline struct gfs2_holder * ...
    (Linux-Kernel)
  • Re: [PATCH][RFC] fast file mapping for loop
    ... Here is a modified version of Jens' patch. ... Change loop to use fast mapping only when the new address_space op is ... The extent_map struct passed in will be inserted into ... * Add bio to back of pending list and wakeup thread ...
    (Linux-Kernel)
  • [PATCH i386] Live Patching Function on 2.6.11.7
    ... The patch was over 50k, so I separate it to each architecture and in line.. ... Live patch command loads the patch modules to target process's memory ... * param:regs register struct ...
    (Linux-Kernel)
  • Re: [PATCH] SCSI: Add the SGPIO support for sata_nv.c
    ... Modified and resent out the patch as attachment. ... Add SGPIO support in sata_nv.c. ... +struct nv_sgpio_cb +{ ... In this case, pcb needs to be an __iomem pointer, ...
    (Linux-Kernel)
  • Re: [PATCH] lockfs patch for 2.6
    ... here's a new patch that basically moves all the XFS freezing ... extern struct vnodeops xfs_vnodeops; ... +STATIC void ...
    (Linux-Kernel)