This is an automated email from the git hooks/post-receive script.
andyp pushed a commit to branch andyp-lhv2
in repository gfs2-utils.
commit e8bd6f2ae603475ca330b94702485318b3694bfb
Author: Andrew Price <anprice(a)redhat.com>
Date: Mon Jan 22 21:03:14 2018 +0000
libgfs2: Remove references to .lh_log_origin and .__pad
Updates to match the latest patch version, plus fix a build failure
caused by a typo.
Signed-off-by: Andrew Price <anprice(a)redhat.com>
---
gfs2/libgfs2/meta.c | 2 --
gfs2/libgfs2/ondisk.c | 6 ------
gfs2/libgfs2/structures.c | 3 +--
3 files changed, 1 insertion(+), 10 deletions(-)
diff --git a/gfs2/libgfs2/meta.c b/gfs2/libgfs2/meta.c
index be79428..a828946 100644
--- a/gfs2/libgfs2/meta.c
+++ b/gfs2/libgfs2/meta.c
@@ -373,8 +373,6 @@ FP(lh_quota_addr, .points_to = (1 << LGFS2_MT_GFS2_DINODE))
F(lh_local_total, .flags = LGFS2_MFF_FSBLOCKS)
F(lh_local_free, .flags = LGFS2_MFF_FSBLOCKS)
F(lh_local_dinodes, .flags = LGFS2_MFF_FSBLOCKS)
-F(lh_log_origin)
-RF(__pad)
#endif
};
diff --git a/gfs2/libgfs2/ondisk.c b/gfs2/libgfs2/ondisk.c
index ec52be3..d529a0b 100644
--- a/gfs2/libgfs2/ondisk.c
+++ b/gfs2/libgfs2/ondisk.c
@@ -584,8 +584,6 @@ void gfs2_log_header_in(struct gfs2_log_header *lh, struct
gfs2_buffer_head *bh)
CPIN_64(lh, str, lh_local_total);
CPIN_64(lh, str, lh_local_free);
CPIN_64(lh, str, lh_local_dinodes);
- CPIN_32(lh, str, lh_log_origin);
- CPIN_32(lh, str, __pad);
#endif
}
@@ -617,8 +615,6 @@ void gfs2_log_header_out(struct gfs2_log_header *lh, char *buf)
CPOUT_64(lh, str, lh_local_total);
CPOUT_64(lh, str, lh_local_free);
CPOUT_64(lh, str, lh_local_dinodes);
- CPOUT_32(lh, str, lh_log_origin);
- CPOUT_32(lh, str, __pad);
#endif
}
@@ -651,8 +647,6 @@ void gfs2_log_header_print(const struct gfs2_log_header *lh)
pv(lh, lh_local_total, "%lld", "0x%llx");
pv(lh, lh_local_free, "%lld", "0x%llx");
pv(lh, lh_local_dinodes, "%lld", "0x%llx");
- pv(lh, lh_log_origin, "0x%.8X", NULL);
- pv(lh, __pad, "0x%.8X", NULL);
}
void gfs2_log_descriptor_in(struct gfs2_log_descriptor *ld,
diff --git a/gfs2/libgfs2/structures.c b/gfs2/libgfs2/structures.c
index 9631df1..0c5133a 100644
--- a/gfs2/libgfs2/structures.c
+++ b/gfs2/libgfs2/structures.c
@@ -138,7 +138,7 @@ int lgfs2_write_journal_data(struct gfs2_inode *ip)
.lh_header.mh_magic = GFS2_MAGIC,
.lh_header.mh_type = GFS2_METATYPE_LH,
.lh_header.mh_format = GFS2_FORMAT_LH,
- .lh_flags = GFS2_LOG_HEAD_UNMOUNT | GFS2_LOG_HEAD_USERSPACE;
+ .lh_flags = GFS2_LOG_HEAD_UNMOUNT | GFS2_LOG_HEAD_USERSPACE,
.lh_tail = 0,
.lh_blkno = 0,
.lh_hash = 0,
@@ -152,7 +152,6 @@ int lgfs2_write_journal_data(struct gfs2_inode *ip)
.lh_local_total = 0,
.lh_local_free = 0,
.lh_local_dinodes = 0,
- .lh_log_origin = 0;
#endif
};
struct gfs2_buffer_head *bh;
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.