/*
* 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
- * of the GNU General Public License v.2.
+ * of the GNU General Public License version 2.
*/
#include <linux/sched.h>
#include <linux/spinlock.h>
#include <linux/completion.h>
#include <linux/buffer_head.h>
-#include <asm/semaphore.h>
#include "gfs2.h"
#include <linux/gfs2_ondisk.h>
+#include <linux/lm_interface.h>
+#include "incore.h"
-#define pv(struct, member, fmt) printk(KERN_INFO " "#member" = "fmt"\n", struct->member);
-#define pa(struct, member, count) print_array(#member, struct->member, count);
-
-/**
- * print_array - Print out an array of bytes
- * @title: what to print before the array
- * @buf: the array
- * @count: the number of bytes
- *
- */
-
-static void print_array(char *title, char *buf, int count)
-{
- int x;
-
- printk(KERN_INFO " %s =\n" KERN_INFO, title);
- for (x = 0; x < count; x++) {
- printk("%.2X ", (unsigned char)buf[x]);
- if (x % 16 == 15)
- printk("\n" KERN_INFO);
- }
- if (x % 16)
- printk("\n");
-}
+#define pv(struct, member, fmt) printk(KERN_INFO " "#member" = "fmt"\n", \
+ struct->member);
/*
* gfs2_xxx_in - read in an xxx struct
* first arg: the cpu-order structure
*/
-void gfs2_inum_in(struct gfs2_inum *no, char *buf)
+void gfs2_inum_in(struct gfs2_inum_host *no, const void *buf)
{
- struct gfs2_inum *str = (struct gfs2_inum *)buf;
+ const struct gfs2_inum *str = buf;
no->no_formal_ino = be64_to_cpu(str->no_formal_ino);
no->no_addr = be64_to_cpu(str->no_addr);
}
-void gfs2_inum_out(struct gfs2_inum *no, char *buf)
+void gfs2_inum_out(const struct gfs2_inum_host *no, void *buf)
{
- struct gfs2_inum *str = (struct gfs2_inum *)buf;
+ struct gfs2_inum *str = buf;
str->no_formal_ino = cpu_to_be64(no->no_formal_ino);
str->no_addr = cpu_to_be64(no->no_addr);
}
-void gfs2_inum_print(struct gfs2_inum *no)
+static void gfs2_inum_print(const struct gfs2_inum_host *no)
{
- pv(no, no_formal_ino, "%llu");
- pv(no, no_addr, "%llu");
+ printk(KERN_INFO " no_formal_ino = %llu\n", (unsigned long long)no->no_formal_ino);
+ printk(KERN_INFO " no_addr = %llu\n", (unsigned long long)no->no_addr);
}
-static void gfs2_meta_header_in(struct gfs2_meta_header *mh, char *buf)
+static void gfs2_meta_header_in(struct gfs2_meta_header_host *mh, const void *buf)
{
- struct gfs2_meta_header *str = (struct gfs2_meta_header *)buf;
+ const struct gfs2_meta_header *str = buf;
mh->mh_magic = be32_to_cpu(str->mh_magic);
- mh->mh_type = be16_to_cpu(str->mh_type);
- mh->mh_format = be16_to_cpu(str->mh_format);
+ mh->mh_type = be32_to_cpu(str->mh_type);
+ mh->mh_format = be32_to_cpu(str->mh_format);
}
-static void gfs2_meta_header_out(struct gfs2_meta_header *mh, char *buf)
+static void gfs2_meta_header_out(const struct gfs2_meta_header_host *mh, void *buf)
{
- struct gfs2_meta_header *str = (struct gfs2_meta_header *)buf;
+ struct gfs2_meta_header *str = buf;
str->mh_magic = cpu_to_be32(mh->mh_magic);
- str->mh_type = cpu_to_be16(mh->mh_type);
- str->mh_format = cpu_to_be16(mh->mh_format);
+ str->mh_type = cpu_to_be32(mh->mh_type);
+ str->mh_format = cpu_to_be32(mh->mh_format);
}
-void gfs2_meta_header_print(struct gfs2_meta_header *mh)
+void gfs2_sb_in(struct gfs2_sb_host *sb, const void *buf)
{
- pv(mh, mh_magic, "0x%.8X");
- pv(mh, mh_type, "%u");
- pv(mh, mh_format, "%u");
-}
-
-void gfs2_sb_in(struct gfs2_sb *sb, char *buf)
-{
- struct gfs2_sb *str = (struct gfs2_sb *)buf;
+ const struct gfs2_sb *str = buf;
gfs2_meta_header_in(&sb->sb_header, buf);
memcpy(sb->sb_locktable, str->sb_locktable, GFS2_LOCKNAME_LEN);
}
-void gfs2_sb_print(struct gfs2_sb *sb)
-{
- gfs2_meta_header_print(&sb->sb_header);
-
- pv(sb, sb_fs_format, "%u");
- pv(sb, sb_multihost_format, "%u");
-
- pv(sb, sb_bsize, "%u");
- pv(sb, sb_bsize_shift, "%u");
-
- gfs2_inum_print(&sb->sb_master_dir);
-
- pv(sb, sb_lockproto, "%s");
- pv(sb, sb_locktable, "%s");
-}
-
-void gfs2_rindex_in(struct gfs2_rindex *ri, char *buf)
+void gfs2_rindex_in(struct gfs2_rindex_host *ri, const void *buf)
{
- struct gfs2_rindex *str = (struct gfs2_rindex *)buf;
+ const struct gfs2_rindex *str = buf;
ri->ri_addr = be64_to_cpu(str->ri_addr);
ri->ri_length = be32_to_cpu(str->ri_length);
}
-void gfs2_rindex_out(struct gfs2_rindex *ri, char *buf)
-{
- struct gfs2_rindex *str = (struct gfs2_rindex *)buf;
-
- str->ri_addr = cpu_to_be64(ri->ri_addr);
- str->ri_length = cpu_to_be32(ri->ri_length);
- str->__pad = 0;
-
- str->ri_data0 = cpu_to_be64(ri->ri_data0);
- str->ri_data = cpu_to_be32(ri->ri_data);
- str->ri_bitbytes = cpu_to_be32(ri->ri_bitbytes);
- memset(str->ri_reserved, 0, sizeof(str->ri_reserved));
-}
-
-void gfs2_rindex_print(struct gfs2_rindex *ri)
+void gfs2_rindex_print(const struct gfs2_rindex_host *ri)
{
- pv(ri, ri_addr, "%llu");
+ printk(KERN_INFO " ri_addr = %llu\n", (unsigned long long)ri->ri_addr);
pv(ri, ri_length, "%u");
- pv(ri, ri_data0, "%llu");
+ printk(KERN_INFO " ri_data0 = %llu\n", (unsigned long long)ri->ri_data0);
pv(ri, ri_data, "%u");
pv(ri, ri_bitbytes, "%u");
}
-void gfs2_rgrp_in(struct gfs2_rgrp *rg, char *buf)
+void gfs2_rgrp_in(struct gfs2_rgrp_host *rg, const void *buf)
{
- struct gfs2_rgrp *str = (struct gfs2_rgrp *)buf;
+ const struct gfs2_rgrp *str = buf;
gfs2_meta_header_in(&rg->rg_header, buf);
rg->rg_flags = be32_to_cpu(str->rg_flags);
rg->rg_free = be32_to_cpu(str->rg_free);
rg->rg_dinodes = be32_to_cpu(str->rg_dinodes);
+ rg->rg_igeneration = be64_to_cpu(str->rg_igeneration);
}
-void gfs2_rgrp_out(struct gfs2_rgrp *rg, char *buf)
+void gfs2_rgrp_out(const struct gfs2_rgrp_host *rg, void *buf)
{
- struct gfs2_rgrp *str = (struct gfs2_rgrp *)buf;
+ struct gfs2_rgrp *str = buf;
gfs2_meta_header_out(&rg->rg_header, buf);
str->rg_flags = cpu_to_be32(rg->rg_flags);
str->rg_free = cpu_to_be32(rg->rg_free);
str->rg_dinodes = cpu_to_be32(rg->rg_dinodes);
-
+ str->__pad = cpu_to_be32(0);
+ str->rg_igeneration = cpu_to_be64(rg->rg_igeneration);
memset(&str->rg_reserved, 0, sizeof(str->rg_reserved));
}
-void gfs2_rgrp_print(struct gfs2_rgrp *rg)
-{
- gfs2_meta_header_print(&rg->rg_header);
- pv(rg, rg_flags, "%u");
- pv(rg, rg_free, "%u");
- pv(rg, rg_dinodes, "%u");
-
- pa(rg, rg_reserved, 36);
-}
-
-void gfs2_quota_in(struct gfs2_quota *qu, char *buf)
+void gfs2_quota_in(struct gfs2_quota_host *qu, const void *buf)
{
- struct gfs2_quota *str = (struct gfs2_quota *)buf;
+ const struct gfs2_quota *str = buf;
qu->qu_limit = be64_to_cpu(str->qu_limit);
qu->qu_warn = be64_to_cpu(str->qu_warn);
qu->qu_value = be64_to_cpu(str->qu_value);
}
-void gfs2_quota_out(struct gfs2_quota *qu, char *buf)
-{
- struct gfs2_quota *str = (struct gfs2_quota *)buf;
-
- str->qu_limit = cpu_to_be64(qu->qu_limit);
- str->qu_warn = cpu_to_be64(qu->qu_warn);
- str->qu_value = cpu_to_be64(qu->qu_value);
-}
-
-void gfs2_quota_print(struct gfs2_quota *qu)
+void gfs2_dinode_out(const struct gfs2_inode *ip, void *buf)
{
- pv(qu, qu_limit, "%llu");
- pv(qu, qu_warn, "%llu");
- pv(qu, qu_value, "%lld");
-}
-
-void gfs2_dinode_in(struct gfs2_dinode *di, char *buf)
-{
- struct gfs2_dinode *str = (struct gfs2_dinode *)buf;
-
- gfs2_meta_header_in(&di->di_header, buf);
- gfs2_inum_in(&di->di_num, (char *)&str->di_num);
-
- di->di_mode = be32_to_cpu(str->di_mode);
- di->di_uid = be32_to_cpu(str->di_uid);
- di->di_gid = be32_to_cpu(str->di_gid);
- di->di_nlink = be32_to_cpu(str->di_nlink);
- di->di_size = be64_to_cpu(str->di_size);
- di->di_blocks = be64_to_cpu(str->di_blocks);
- di->di_atime = be64_to_cpu(str->di_atime);
- di->di_mtime = be64_to_cpu(str->di_mtime);
- di->di_ctime = be64_to_cpu(str->di_ctime);
- di->di_major = be32_to_cpu(str->di_major);
- di->di_minor = be32_to_cpu(str->di_minor);
-
- di->di_goal_meta = be64_to_cpu(str->di_goal_meta);
- di->di_goal_data = be64_to_cpu(str->di_goal_data);
+ const struct gfs2_dinode_host *di = &ip->i_di;
+ struct gfs2_dinode *str = buf;
- di->di_flags = be32_to_cpu(str->di_flags);
- di->di_payload_format = be32_to_cpu(str->di_payload_format);
- di->di_height = be16_to_cpu(str->di_height);
+ str->di_header.mh_magic = cpu_to_be32(GFS2_MAGIC);
+ str->di_header.mh_type = cpu_to_be32(GFS2_METATYPE_DI);
+ str->di_header.__pad0 = 0;
+ str->di_header.mh_format = cpu_to_be32(GFS2_FORMAT_DI);
+ str->di_header.__pad1 = 0;
- di->di_depth = be16_to_cpu(str->di_depth);
- di->di_entries = be32_to_cpu(str->di_entries);
+ gfs2_inum_out(&ip->i_num, &str->di_num);
- di->di_eattr = be64_to_cpu(str->di_eattr);
-
-}
-
-void gfs2_dinode_out(struct gfs2_dinode *di, char *buf)
-{
- struct gfs2_dinode *str = (struct gfs2_dinode *)buf;
-
- gfs2_meta_header_out(&di->di_header, buf);
- gfs2_inum_out(&di->di_num, (char *)&str->di_num);
-
- str->di_mode = cpu_to_be32(di->di_mode);
- str->di_uid = cpu_to_be32(di->di_uid);
- str->di_gid = cpu_to_be32(di->di_gid);
- str->di_nlink = cpu_to_be32(di->di_nlink);
+ str->di_mode = cpu_to_be32(ip->i_inode.i_mode);
+ str->di_uid = cpu_to_be32(ip->i_inode.i_uid);
+ str->di_gid = cpu_to_be32(ip->i_inode.i_gid);
+ str->di_nlink = cpu_to_be32(ip->i_inode.i_nlink);
str->di_size = cpu_to_be64(di->di_size);
str->di_blocks = cpu_to_be64(di->di_blocks);
- str->di_atime = cpu_to_be64(di->di_atime);
- str->di_mtime = cpu_to_be64(di->di_mtime);
- str->di_ctime = cpu_to_be64(di->di_ctime);
- str->di_major = cpu_to_be32(di->di_major);
- str->di_minor = cpu_to_be32(di->di_minor);
+ str->di_atime = cpu_to_be64(ip->i_inode.i_atime.tv_sec);
+ str->di_mtime = cpu_to_be64(ip->i_inode.i_mtime.tv_sec);
+ str->di_ctime = cpu_to_be64(ip->i_inode.i_ctime.tv_sec);
str->di_goal_meta = cpu_to_be64(di->di_goal_meta);
str->di_goal_data = cpu_to_be64(di->di_goal_data);
+ str->di_generation = cpu_to_be64(di->di_generation);
str->di_flags = cpu_to_be32(di->di_flags);
str->di_payload_format = cpu_to_be32(di->di_payload_format);
str->di_entries = cpu_to_be32(di->di_entries);
str->di_eattr = cpu_to_be64(di->di_eattr);
-
}
-void gfs2_dinode_print(struct gfs2_dinode *di)
+void gfs2_dinode_print(const struct gfs2_inode *ip)
{
- gfs2_meta_header_print(&di->di_header);
- gfs2_inum_print(&di->di_num);
-
- pv(di, di_mode, "0%o");
- pv(di, di_uid, "%u");
- pv(di, di_gid, "%u");
- pv(di, di_nlink, "%u");
- pv(di, di_size, "%llu");
- pv(di, di_blocks, "%llu");
- pv(di, di_atime, "%lld");
- pv(di, di_mtime, "%lld");
- pv(di, di_ctime, "%lld");
- pv(di, di_major, "%u");
- pv(di, di_minor, "%u");
-
- pv(di, di_goal_meta, "%llu");
- pv(di, di_goal_data, "%llu");
+ const struct gfs2_dinode_host *di = &ip->i_di;
+
+ gfs2_inum_print(&ip->i_num);
+
+ printk(KERN_INFO " di_size = %llu\n", (unsigned long long)di->di_size);
+ printk(KERN_INFO " di_blocks = %llu\n", (unsigned long long)di->di_blocks);
+ printk(KERN_INFO " di_goal_meta = %llu\n", (unsigned long long)di->di_goal_meta);
+ printk(KERN_INFO " di_goal_data = %llu\n", (unsigned long long)di->di_goal_data);
pv(di, di_flags, "0x%.8X");
pv(di, di_payload_format, "%u");
pv(di, di_depth, "%u");
pv(di, di_entries, "%u");
- pv(di, di_eattr, "%llu");
-}
-
-void gfs2_dirent_print(struct gfs2_dirent *de, char *name)
-{
- char buf[GFS2_FNAMESIZE + 1];
-
- gfs2_inum_print(&de->de_inum);
- pv(de, de_hash, "0x%.8X");
- pv(de, de_rec_len, "%u");
- pv(de, de_name_len, "%u");
- pv(de, de_type, "%u");
-
- memset(buf, 0, GFS2_FNAMESIZE + 1);
- memcpy(buf, name, de->de_name_len);
- printk(KERN_INFO " name = %s\n", buf);
-}
-
-void gfs2_leaf_in(struct gfs2_leaf *lf, char *buf)
-{
- struct gfs2_leaf *str = (struct gfs2_leaf *)buf;
-
- gfs2_meta_header_in(&lf->lf_header, buf);
- lf->lf_depth = be16_to_cpu(str->lf_depth);
- lf->lf_entries = be16_to_cpu(str->lf_entries);
- lf->lf_dirent_format = be32_to_cpu(str->lf_dirent_format);
- lf->lf_next = be64_to_cpu(str->lf_next);
-}
-
-void gfs2_leaf_print(struct gfs2_leaf *lf)
-{
- gfs2_meta_header_print(&lf->lf_header);
- pv(lf, lf_depth, "%u");
- pv(lf, lf_entries, "%u");
- pv(lf, lf_dirent_format, "%u");
- pv(lf, lf_next, "%llu");
-
- pa(lf, lf_reserved, 32);
-}
-
-void gfs2_ea_header_in(struct gfs2_ea_header *ea, char *buf)
-{
- struct gfs2_ea_header *str = (struct gfs2_ea_header *)buf;
-
- ea->ea_rec_len = be32_to_cpu(str->ea_rec_len);
- ea->ea_data_len = be32_to_cpu(str->ea_data_len);
- ea->ea_name_len = str->ea_name_len;
- ea->ea_type = str->ea_type;
- ea->ea_flags = str->ea_flags;
- ea->ea_num_ptrs = str->ea_num_ptrs;
-}
-
-void gfs2_ea_header_out(struct gfs2_ea_header *ea, char *buf)
-{
- struct gfs2_ea_header *str = (struct gfs2_ea_header *)buf;
-
- str->ea_rec_len = cpu_to_be32(ea->ea_rec_len);
- str->ea_data_len = cpu_to_be32(ea->ea_data_len);
- str->ea_name_len = ea->ea_name_len;
- str->ea_type = ea->ea_type;
- str->ea_flags = ea->ea_flags;
- str->ea_num_ptrs = ea->ea_num_ptrs;
- str->__pad = 0;
-}
-
-void gfs2_ea_header_print(struct gfs2_ea_header *ea, char *name)
-{
- char buf[GFS2_EA_MAX_NAME_LEN + 1];
-
- pv(ea, ea_rec_len, "%u");
- pv(ea, ea_data_len, "%u");
- pv(ea, ea_name_len, "%u");
- pv(ea, ea_type, "%u");
- pv(ea, ea_flags, "%u");
- pv(ea, ea_num_ptrs, "%u");
-
- memset(buf, 0, GFS2_EA_MAX_NAME_LEN + 1);
- memcpy(buf, name, ea->ea_name_len);
- printk(KERN_INFO " name = %s\n", buf);
+ printk(KERN_INFO " di_eattr = %llu\n", (unsigned long long)di->di_eattr);
}
-void gfs2_log_header_in(struct gfs2_log_header *lh, char *buf)
+void gfs2_log_header_in(struct gfs2_log_header_host *lh, const void *buf)
{
- struct gfs2_log_header *str = (struct gfs2_log_header *)buf;
+ const struct gfs2_log_header *str = buf;
gfs2_meta_header_in(&lh->lh_header, buf);
lh->lh_sequence = be64_to_cpu(str->lh_sequence);
lh->lh_hash = be32_to_cpu(str->lh_hash);
}
-void gfs2_log_header_print(struct gfs2_log_header *lh)
-{
- gfs2_meta_header_print(&lh->lh_header);
- pv(lh, lh_sequence, "%llu");
- pv(lh, lh_flags, "0x%.8X");
- pv(lh, lh_tail, "%u");
- pv(lh, lh_blkno, "%u");
- pv(lh, lh_hash, "0x%.8X");
-}
-
-void gfs2_log_descriptor_print(struct gfs2_log_descriptor *ld)
-{
- gfs2_meta_header_print(&ld->ld_header);
- pv(ld, ld_type, "%u");
- pv(ld, ld_length, "%u");
- pv(ld, ld_data1, "%u");
- pv(ld, ld_data2, "%u");
-
- pa(ld, ld_reserved, 32);
-}
-
-void gfs2_inum_range_in(struct gfs2_inum_range *ir, char *buf)
+void gfs2_inum_range_in(struct gfs2_inum_range_host *ir, const void *buf)
{
- struct gfs2_inum_range *str = (struct gfs2_inum_range *)buf;
+ const struct gfs2_inum_range *str = buf;
ir->ir_start = be64_to_cpu(str->ir_start);
ir->ir_length = be64_to_cpu(str->ir_length);
}
-void gfs2_inum_range_out(struct gfs2_inum_range *ir, char *buf)
+void gfs2_inum_range_out(const struct gfs2_inum_range_host *ir, void *buf)
{
- struct gfs2_inum_range *str = (struct gfs2_inum_range *)buf;
+ struct gfs2_inum_range *str = buf;
str->ir_start = cpu_to_be64(ir->ir_start);
str->ir_length = cpu_to_be64(ir->ir_length);
}
-void gfs2_inum_range_print(struct gfs2_inum_range *ir)
-{
- pv(ir, ir_start, "%llu");
- pv(ir, ir_length, "%llu");
-}
-
-void gfs2_statfs_change_in(struct gfs2_statfs_change *sc, char *buf)
+void gfs2_statfs_change_in(struct gfs2_statfs_change_host *sc, const void *buf)
{
- struct gfs2_statfs_change *str = (struct gfs2_statfs_change *)buf;
+ const struct gfs2_statfs_change *str = buf;
sc->sc_total = be64_to_cpu(str->sc_total);
sc->sc_free = be64_to_cpu(str->sc_free);
sc->sc_dinodes = be64_to_cpu(str->sc_dinodes);
}
-void gfs2_statfs_change_out(struct gfs2_statfs_change *sc, char *buf)
+void gfs2_statfs_change_out(const struct gfs2_statfs_change_host *sc, void *buf)
{
- struct gfs2_statfs_change *str = (struct gfs2_statfs_change *)buf;
+ struct gfs2_statfs_change *str = buf;
str->sc_total = cpu_to_be64(sc->sc_total);
str->sc_free = cpu_to_be64(sc->sc_free);
str->sc_dinodes = cpu_to_be64(sc->sc_dinodes);
}
-void gfs2_statfs_change_print(struct gfs2_statfs_change *sc)
-{
- pv(sc, sc_total, "%lld");
- pv(sc, sc_free, "%lld");
- pv(sc, sc_dinodes, "%lld");
-}
-
-void gfs2_unlinked_tag_in(struct gfs2_unlinked_tag *ut, char *buf)
-{
- struct gfs2_unlinked_tag *str = (struct gfs2_unlinked_tag *)buf;
-
- gfs2_inum_in(&ut->ut_inum, buf);
- ut->ut_flags = be32_to_cpu(str->ut_flags);
-}
-
-void gfs2_unlinked_tag_out(struct gfs2_unlinked_tag *ut, char *buf)
+void gfs2_quota_change_in(struct gfs2_quota_change_host *qc, const void *buf)
{
- struct gfs2_unlinked_tag *str = (struct gfs2_unlinked_tag *)buf;
-
- gfs2_inum_out(&ut->ut_inum, buf);
- str->ut_flags = cpu_to_be32(ut->ut_flags);
- str->__pad = 0;
-}
-
-void gfs2_unlinked_tag_print(struct gfs2_unlinked_tag *ut)
-{
- gfs2_inum_print(&ut->ut_inum);
- pv(ut, ut_flags, "%u");
-}
-
-void gfs2_quota_change_in(struct gfs2_quota_change *qc, char *buf)
-{
- struct gfs2_quota_change *str = (struct gfs2_quota_change *)buf;
+ const struct gfs2_quota_change *str = buf;
qc->qc_change = be64_to_cpu(str->qc_change);
qc->qc_flags = be32_to_cpu(str->qc_flags);
qc->qc_id = be32_to_cpu(str->qc_id);
}
-void gfs2_quota_change_print(struct gfs2_quota_change *qc)
-{
- pv(qc, qc_change, "%lld");
- pv(qc, qc_flags, "0x%.8X");
- pv(qc, qc_id, "%u");
-}
-
-
-
git://ftp.safe.ca / safe / jmp / linux-2.6 / blobdiff