This is an automated email from the git hooks/post-receive script.
andyp pushed a commit to branch master
in repository gfs2-utils.
commit a797986402143020ab974081ce1236e3912604e7
Author: Andrew Price <anprice(a)redhat.com>
AuthorDate: Wed May 20 02:34:56 2020 +0100
libgfs2: Remove gfs2_buffer_head from gfs_dinode_in()
Signed-off-by: Andrew Price <anprice(a)redhat.com>
---
gfs2/edit/hexedit.h | 1 -
gfs2/libgfs2/gfs1.c | 11 ++++-------
2 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/gfs2/edit/hexedit.h b/gfs2/edit/hexedit.h
index d2992d8..ab2d44d 100644
--- a/gfs2/edit/hexedit.h
+++ b/gfs2/edit/hexedit.h
@@ -227,7 +227,6 @@ extern void gfs_jindex_in(struct gfs_jindex *jindex, char *buf);
extern void gfs_log_header_in(struct gfs_log_header *head,
struct gfs2_buffer_head *bh);
extern void gfs_log_header_print(struct gfs_log_header *lh);
-extern void gfs_dinode_in(struct gfs_dinode *di, struct gfs2_buffer_head *bh);
extern void savemeta(char *out_fn, int saveoption, int gziplevel);
extern void restoremeta(const char *in_fn, const char *out_device,
uint64_t printblocksonly);
diff --git a/gfs2/libgfs2/gfs1.c b/gfs2/libgfs2/gfs1.c
index 16c183b..7da2316 100644
--- a/gfs2/libgfs2/gfs1.c
+++ b/gfs2/libgfs2/gfs1.c
@@ -248,14 +248,11 @@ int gfs1_writei(struct gfs2_inode *ip, char *buf, uint64_t offset,
return copied;
}
-/* ------------------------------------------------------------------------ */
-/* gfs_dinode_in */
-/* ------------------------------------------------------------------------ */
-static void gfs_dinode_in(struct gfs_dinode *di, struct gfs2_buffer_head *bh)
+static void gfs_dinode_in(struct gfs_dinode *di, char *buf)
{
- struct gfs_dinode *str = (struct gfs_dinode *)bh->b_data;
+ struct gfs_dinode *str = (struct gfs_dinode *)buf;
- gfs2_meta_header_in(&di->di_header, bh->b_data);
+ 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);
@@ -297,7 +294,7 @@ static struct gfs2_inode *__gfs_inode_get(struct gfs2_sbd *sdp,
bh = bread(sdp, di_addr);
ip->bh_owned = 1;
}
- gfs_dinode_in(&gfs1_dinode, bh);
+ gfs_dinode_in(&gfs1_dinode, bh->b_data);
memcpy(&ip->i_di.di_header, &gfs1_dinode.di_header,
sizeof(struct gfs2_meta_header));
memcpy(&ip->i_di.di_num, &gfs1_dinode.di_num,
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.