This is an automated email from the git hooks/post-receive script.
andyp pushed a commit to branch master
in repository gfs2-utils.
commit 9a09357b99da9649645374a4818b1a2a2b0146f0
Author: Andrew Price <anprice(a)redhat.com>
AuthorDate: Tue Dec 7 15:02:44 2021 +0000
libgfs2: Rename sdp->time to sdp->sd_time
Make it easier to grep and distinct from time(2)
Signed-off-by: Andrew Price <anprice(a)redhat.com>
---
gfs2/convert/gfs2_convert.c | 2 +-
gfs2/edit/hexedit.c | 2 +-
gfs2/libgfs2/fs_ops.c | 4 ++--
gfs2/libgfs2/libgfs2.h | 2 +-
gfs2/mkfs/main_mkfs.c | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/gfs2/convert/gfs2_convert.c b/gfs2/convert/gfs2_convert.c
index beb71af2..efceb972 100644
--- a/gfs2/convert/gfs2_convert.c
+++ b/gfs2/convert/gfs2_convert.c
@@ -1595,7 +1595,7 @@ static int init(struct gfs2_sbd *sbp, struct gfs2_options *opts)
sbp->jsize = GFS2_DEFAULT_JSIZE;
sbp->rgsize = GFS2_DEFAULT_RGSIZE;
sbp->qcsize = GFS2_DEFAULT_QCSIZE;
- sbp->time = time(NULL);
+ sbp->sd_time = time(NULL);
sbp->blks_total = 0; /* total blocks - total them up later */
sbp->blks_alloced = 0; /* blocks allocated - total them up later */
sbp->dinodes_alloced = 0; /* dinodes allocated - total them up later */
diff --git a/gfs2/edit/hexedit.c b/gfs2/edit/hexedit.c
index e3794290..f665d013 100644
--- a/gfs2/edit/hexedit.c
+++ b/gfs2/edit/hexedit.c
@@ -902,7 +902,7 @@ static void read_superblock(int fd)
sbd.jsize = GFS2_DEFAULT_JSIZE;
sbd.rgsize = GFS2_DEFAULT_RGSIZE;
sbd.qcsize = GFS2_DEFAULT_QCSIZE;
- sbd.time = time(NULL);
+ sbd.sd_time = time(NULL);
sbd.rgtree.osi_node = NULL;
lgfs2_sb_in(&sbd, bh->b_data);
/* Check to see if this is really gfs1 */
diff --git a/gfs2/libgfs2/fs_ops.c b/gfs2/libgfs2/fs_ops.c
index 886496f7..6b54a9fd 100644
--- a/gfs2/libgfs2/fs_ops.c
+++ b/gfs2/libgfs2/fs_ops.c
@@ -337,7 +337,7 @@ int lgfs2_file_alloc(lgfs2_rgrp_t rg, uint64_t di_size, struct
gfs2_inode *ip, u
ip->i_mode = mode;
ip->i_nlink = 1;
ip->i_blocks = blocks;
- ip->i_atime = ip->i_mtime = ip->i_ctime = sdp->time;
+ ip->i_atime = ip->i_mtime = ip->i_ctime = sdp->sd_time;
ip->i_goal_data = ip->i_num.in_addr + ip->i_blocks - 1;
ip->i_goal_meta = ip->i_goal_data - ((di_size + sdp->sd_bsize - 1) /
sdp->sd_bsize);
ip->i_height = calc_tree_height(ip, di_size);
@@ -1367,7 +1367,7 @@ static int __init_dinode(struct gfs2_sbd *sdp, struct
gfs2_buffer_head **bhp, st
di->di_mode = cpu_to_be32(mode);
di->di_nlink = cpu_to_be32(1);
di->di_blocks = cpu_to_be64(1);
- di->di_atime = di->di_mtime = di->di_ctime = cpu_to_be64(sdp->time);
+ di->di_atime = di->di_mtime = di->di_ctime = cpu_to_be64(sdp->sd_time);
di->di_goal_meta = di->di_goal_data = cpu_to_be64(bh->b_blocknr);
di->di_flags = cpu_to_be32(flags);
diff --git a/gfs2/libgfs2/libgfs2.h b/gfs2/libgfs2/libgfs2.h
index 9c26ea48..04e6ec0f 100644
--- a/gfs2/libgfs2/libgfs2.h
+++ b/gfs2/libgfs2/libgfs2.h
@@ -358,7 +358,7 @@ struct gfs2_sbd {
unsigned int rgsize; /* Size of resource groups (in MB) */
unsigned int qcsize; /* Size of quota change files (in MB) */
- int64_t time;
+ int64_t sd_time;
struct lgfs2_dev_info dinfo;
struct device device;
diff --git a/gfs2/mkfs/main_mkfs.c b/gfs2/mkfs/main_mkfs.c
index da82d462..47e18ba2 100644
--- a/gfs2/mkfs/main_mkfs.c
+++ b/gfs2/mkfs/main_mkfs.c
@@ -975,7 +975,7 @@ static int default_journal_size(unsigned bsize, uint64_t num_blocks)
static int sbd_init(struct gfs2_sbd *sdp, struct mkfs_opts *opts, unsigned bsize)
{
memset(sdp, 0, sizeof(struct gfs2_sbd));
- sdp->time = time(NULL);
+ sdp->sd_time = time(NULL);
sdp->rgtree.osi_node = NULL;
sdp->rgsize = opts->rgsize;
sdp->qcsize = opts->qcsize;
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.