[Cluster-devel] [PATCH 13/20] libgfs2: Remove gfs2_dinode_out_bh
Andrew Price
anprice at redhat.com
Mon Mar 5 18:25:42 UTC 2018
Signed-off-by: Andrew Price <anprice at redhat.com>
---
gfs2/convert/gfs2_convert.c | 2 +-
gfs2/fsck/lost_n_found.c | 2 +-
gfs2/fsck/rgrepair.c | 3 +--
gfs2/libgfs2/fs_ops.c | 13 ++++++-------
gfs2/libgfs2/gfs1.c | 5 ++---
gfs2/libgfs2/libgfs2.h | 1 -
gfs2/libgfs2/ondisk.c | 6 ------
gfs2/libgfs2/structures.c | 8 ++++----
8 files changed, 15 insertions(+), 25 deletions(-)
diff --git a/gfs2/convert/gfs2_convert.c b/gfs2/convert/gfs2_convert.c
index e664022e..d2b29f34 100644
--- a/gfs2/convert/gfs2_convert.c
+++ b/gfs2/convert/gfs2_convert.c
@@ -2323,7 +2323,7 @@ int main(int argc, char **argv)
{
struct gfs2_inode *ip = sb2.master_dir;
if (ip->i_bh->b_modified)
- gfs2_dinode_out_bh(&ip->i_di, ip->i_bh);
+ gfs2_dinode_out(&ip->i_di, ip->i_bh->b_data);
}
/* Copy old quotas */
copy_quotas(&sb2);
diff --git a/gfs2/fsck/lost_n_found.c b/gfs2/fsck/lost_n_found.c
index 2722b29d..4d5d52c8 100644
--- a/gfs2/fsck/lost_n_found.c
+++ b/gfs2/fsck/lost_n_found.c
@@ -253,7 +253,7 @@ int add_inode_to_lf(struct gfs2_inode *ip){
log_notice( _("Added inode #%llu (0x%llx) to lost+found\n"),
(unsigned long long)ip->i_di.di_num.no_addr,
(unsigned long long)ip->i_di.di_num.no_addr);
- gfs2_dinode_out_bh(&lf_dip->i_di, lf_dip->i_bh);
+ gfs2_dinode_out(&lf_dip->i_di, lf_dip->i_bh->b_data);
bwrite(lf_dip->i_bh);
return 0;
}
diff --git a/gfs2/fsck/rgrepair.c b/gfs2/fsck/rgrepair.c
index b772ec65..e64f70df 100644
--- a/gfs2/fsck/rgrepair.c
+++ b/gfs2/fsck/rgrepair.c
@@ -1237,8 +1237,7 @@ int rg_repair(struct gfs2_sbd *sdp, int trust_lvl, int *rg_count, int *sane)
permission. */
if (sdp->md.riinode->i_bh->b_modified) {
log_debug("Syncing rindex inode changes to disk.\n");
- gfs2_dinode_out_bh(&sdp->md.riinode->i_di,
- sdp->md.riinode->i_bh);
+ gfs2_dinode_out(&sdp->md.riinode->i_di, sdp->md.riinode->i_bh->b_data);
bwrite(sdp->md.riinode->i_bh);
}
return 0;
diff --git a/gfs2/libgfs2/fs_ops.c b/gfs2/libgfs2/fs_ops.c
index 6f7c422a..7e87e435 100644
--- a/gfs2/libgfs2/fs_ops.c
+++ b/gfs2/libgfs2/fs_ops.c
@@ -95,7 +95,7 @@ void inode_put(struct gfs2_inode **ip_in)
struct gfs2_sbd *sdp = ip->i_sbd;
if (ip->i_bh->b_modified) {
- gfs2_dinode_out_bh(&ip->i_di, ip->i_bh);
+ gfs2_dinode_out(&ip->i_di, ip->i_bh->b_data);
if (!ip->bh_owned && is_system_inode(sdp, block))
fprintf(stderr, "Warning: Change made to inode "
"were discarded.\n");
@@ -1324,7 +1324,7 @@ static void dir_make_exhash(struct gfs2_inode *dip)
for (x = sdp->sd_hash_ptrs, y = -1; x; x >>= 1, y++) ;
dip->i_di.di_depth = y;
- gfs2_dinode_out_bh(&dip->i_di, dip->i_bh);
+ gfs2_dinode_out(&dip->i_di, dip->i_bh->b_data);
bwrite(dip->i_bh);
}
@@ -1430,9 +1430,8 @@ static int __init_dinode(struct gfs2_sbd *sdp, struct gfs2_buffer_head **bhp, st
di.di_payload_format = GFS2_FORMAT_DE;
di.di_entries = 2;
}
-
- gfs2_dinode_out_bh(&di, bh);
-
+ gfs2_dinode_out(&di, bh->b_data);
+ bmodified(bh);
return 0;
}
@@ -1494,13 +1493,13 @@ int lgfs2_write_filemeta(struct gfs2_inode *ip)
char *start = bh->b_data;
if (height == 0) {
start += sizeof(struct gfs2_dinode);
- gfs2_dinode_out_bh(&ip->i_di, bh);
+ gfs2_dinode_out(&ip->i_di, bh->b_data);
} else {
start += sizeof(struct gfs2_meta_header);
gfs2_meta_header_out(&mh, bh->b_data);
}
lgfs2_fill_indir(start, bh->b_data + sdp->bsize, ptr0, ptrs, &p);
- if(bwrite(bh)) {
+ if (bwrite(bh)) {
free(bh);
return 1;
}
diff --git a/gfs2/libgfs2/gfs1.c b/gfs2/libgfs2/gfs1.c
index 00d32238..b91cce5e 100644
--- a/gfs2/libgfs2/gfs1.c
+++ b/gfs2/libgfs2/gfs1.c
@@ -243,9 +243,8 @@ int gfs1_writei(struct gfs2_inode *ip, char *buf, uint64_t offset,
ip->i_di.di_size = start + copied;
}
ip->i_di.di_mtime = ip->i_di.di_ctime = time(NULL);
-
- gfs2_dinode_out_bh(&ip->i_di, ip->i_bh);
-
+ gfs2_dinode_out(&ip->i_di, ip->i_bh->b_data);
+ bmodified(ip->i_bh);
return copied;
}
diff --git a/gfs2/libgfs2/libgfs2.h b/gfs2/libgfs2/libgfs2.h
index 5fe1154f..7b2671b5 100644
--- a/gfs2/libgfs2/libgfs2.h
+++ b/gfs2/libgfs2/libgfs2.h
@@ -733,7 +733,6 @@ extern void gfs2_quota_in(struct gfs2_quota *qu, char *buf);
extern void gfs2_quota_out(struct gfs2_quota *qu, char *buf);
extern void gfs2_dinode_in(struct gfs2_dinode *di, char *buf);
extern void gfs2_dinode_out(struct gfs2_dinode *di, char *buf);
-extern void gfs2_dinode_out_bh(struct gfs2_dinode *di, struct gfs2_buffer_head *bh);
extern void gfs2_dirent_in(struct gfs2_dirent *de, char *buf);
extern void gfs2_dirent_out(struct gfs2_dirent *de, char *buf);
extern void gfs2_leaf_in(struct gfs2_leaf *lf, struct gfs2_buffer_head *bh);
diff --git a/gfs2/libgfs2/ondisk.c b/gfs2/libgfs2/ondisk.c
index b54a6389..51dc004f 100644
--- a/gfs2/libgfs2/ondisk.c
+++ b/gfs2/libgfs2/ondisk.c
@@ -378,12 +378,6 @@ void gfs2_dinode_out(struct gfs2_dinode *di, char *buf)
CPOUT_08(di, str, di_reserved, 32);
}
-void gfs2_dinode_out_bh(struct gfs2_dinode *di, struct gfs2_buffer_head *bh)
-{
- gfs2_dinode_out(di, bh->iov.iov_base);
- bmodified(bh);
-}
-
void gfs2_dinode_print(const struct gfs2_dinode *di)
{
gfs2_meta_header_print(&di->di_header);
diff --git a/gfs2/libgfs2/structures.c b/gfs2/libgfs2/structures.c
index aaa76994..51e7d077 100644
--- a/gfs2/libgfs2/structures.c
+++ b/gfs2/libgfs2/structures.c
@@ -347,8 +347,8 @@ int build_inum_range(struct gfs2_inode *per_node, unsigned int j)
return errno;
}
ip->i_di.di_size = sizeof(struct gfs2_inum_range);
- gfs2_dinode_out_bh(&ip->i_di, ip->i_bh);
-
+ gfs2_dinode_out(&ip->i_di, ip->i_bh->b_data);
+ bmodified(ip->i_bh);
if (cfg_debug) {
printf("\nInum Range %u:\n", j);
gfs2_dinode_print(&ip->i_di);
@@ -370,8 +370,8 @@ int build_statfs_change(struct gfs2_inode *per_node, unsigned int j)
return errno;
}
ip->i_di.di_size = sizeof(struct gfs2_statfs_change);
- gfs2_dinode_out_bh(&ip->i_di, ip->i_bh);
-
+ gfs2_dinode_out(&ip->i_di, ip->i_bh->b_data);
+ bmodified(ip->i_bh);
if (cfg_debug) {
printf("\nStatFS Change %u:\n", j);
gfs2_dinode_print(&ip->i_di);
--
2.14.3
More information about the Cluster-devel
mailing list