Commit 8a8b8d91 authored by Jeff Layton's avatar Jeff Layton Committed by Christian Brauner
Browse files

gfs2: convert to ctime accessor functions 



In later patches, we're going to change how the inode's ctime field is
used. Switch to using accessor functions instead of raw accesses of
inode->i_ctime.

Signed-off-by: default avatarJeff Layton <jlayton@kernel.org>
Reviewed-by: default avatarJan Kara <jack@suse.cz>
Message-Id: <20230705190309.579783-45-jlayton@kernel.org>
Signed-off-by: default avatarChristian Brauner <brauner@kernel.org>
parent ceb2d5e9

fs/gfs2/acl.c

+1 −1
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ int gfs2_set_acl(struct mnt_idmap *idmap, struct dentry *dentry, 


	ret = __gfs2_set_acl(inode, acl, type);

	if (!ret && mode != inode->i_mode) {

		inode->i_ctime = current_time(inode);

		inode_set_ctime_current(inode);

		inode->i_mode = mode;

		mark_inode_dirty(inode);

	}

fs/gfs2/bmap.c

+5 −6
Original line number Diff line number Diff line
@@ -1386,7 +1386,7 @@ static int trunc_start(struct inode *inode, u64 newsize) 
		ip->i_diskflags |= GFS2_DIF_TRUNC_IN_PROG;



	i_size_write(inode, newsize);

	ip->i_inode.i_mtime = ip->i_inode.i_ctime = current_time(&ip->i_inode);

	ip->i_inode.i_mtime = inode_set_ctime_current(&ip->i_inode);

	gfs2_dinode_out(ip, dibh->b_data);



	if (journaled)
@@ -1583,8 +1583,7 @@ static int sweep_bh_for_rgrps(struct gfs2_inode *ip, struct gfs2_holder *rd_gh, 


			/* Every transaction boundary, we rewrite the dinode

			   to keep its di_blocks current in case of failure. */

			ip->i_inode.i_mtime = ip->i_inode.i_ctime =

				current_time(&ip->i_inode);

			ip->i_inode.i_mtime = inode_set_ctime_current(&ip->i_inode);

			gfs2_trans_add_meta(ip->i_gl, dibh);

			gfs2_dinode_out(ip, dibh->b_data);

			brelse(dibh);
@@ -1950,7 +1949,7 @@ static int punch_hole(struct gfs2_inode *ip, u64 offset, u64 length) 
		gfs2_statfs_change(sdp, 0, +btotal, 0);

		gfs2_quota_change(ip, -(s64)btotal, ip->i_inode.i_uid,

				  ip->i_inode.i_gid);

		ip->i_inode.i_mtime = ip->i_inode.i_ctime = current_time(&ip->i_inode);

		ip->i_inode.i_mtime = inode_set_ctime_current(&ip->i_inode);

		gfs2_trans_add_meta(ip->i_gl, dibh);

		gfs2_dinode_out(ip, dibh->b_data);

		up_write(&ip->i_rw_mutex);
@@ -1993,7 +1992,7 @@ static int trunc_end(struct gfs2_inode *ip) 
		gfs2_buffer_clear_tail(dibh, sizeof(struct gfs2_dinode));

		gfs2_ordered_del_inode(ip);

	}

	ip->i_inode.i_mtime = ip->i_inode.i_ctime = current_time(&ip->i_inode);

	ip->i_inode.i_mtime = inode_set_ctime_current(&ip->i_inode);

	ip->i_diskflags &= ~GFS2_DIF_TRUNC_IN_PROG;



	gfs2_trans_add_meta(ip->i_gl, dibh);
@@ -2094,7 +2093,7 @@ static int do_grow(struct inode *inode, u64 size) 
		goto do_end_trans;



	truncate_setsize(inode, size);

	ip->i_inode.i_mtime = ip->i_inode.i_ctime = current_time(&ip->i_inode);

	ip->i_inode.i_mtime = inode_set_ctime_current(&ip->i_inode);

	gfs2_trans_add_meta(ip->i_gl, dibh);

	gfs2_dinode_out(ip, dibh->b_data);

	brelse(dibh);

fs/gfs2/dir.c

+8 −7
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ static int gfs2_dir_write_stuffed(struct gfs2_inode *ip, const char *buf, 
	memcpy(dibh->b_data + offset + sizeof(struct gfs2_dinode), buf, size);

	if (ip->i_inode.i_size < offset + size)

		i_size_write(&ip->i_inode, offset + size);

	ip->i_inode.i_mtime = ip->i_inode.i_ctime = current_time(&ip->i_inode);

	ip->i_inode.i_mtime = inode_set_ctime_current(&ip->i_inode);

	gfs2_dinode_out(ip, dibh->b_data);



	brelse(dibh);
@@ -227,7 +227,7 @@ static int gfs2_dir_write_data(struct gfs2_inode *ip, const char *buf, 


	if (ip->i_inode.i_size < offset + copied)

		i_size_write(&ip->i_inode, offset + copied);

	ip->i_inode.i_mtime = ip->i_inode.i_ctime = current_time(&ip->i_inode);

	ip->i_inode.i_mtime = inode_set_ctime_current(&ip->i_inode);



	gfs2_trans_add_meta(ip->i_gl, dibh);

	gfs2_dinode_out(ip, dibh->b_data);
@@ -1814,7 +1814,7 @@ int gfs2_dir_add(struct inode *inode, const struct qstr *name, 
			gfs2_inum_out(nip, dent);

			dent->de_type = cpu_to_be16(IF2DT(nip->i_inode.i_mode));

			dent->de_rahead = cpu_to_be16(gfs2_inode_ra_len(nip));

			tv = current_time(&ip->i_inode);

			tv = inode_set_ctime_current(&ip->i_inode);

			if (ip->i_diskflags & GFS2_DIF_EXHASH) {

				leaf = (struct gfs2_leaf *)bh->b_data;

				be16_add_cpu(&leaf->lf_entries, 1);
@@ -1825,7 +1825,7 @@ int gfs2_dir_add(struct inode *inode, const struct qstr *name, 
			da->bh = NULL;

			brelse(bh);

			ip->i_entries++;

			ip->i_inode.i_mtime = ip->i_inode.i_ctime = tv;

			ip->i_inode.i_mtime = tv;

			if (S_ISDIR(nip->i_inode.i_mode))

				inc_nlink(&ip->i_inode);

			mark_inode_dirty(inode);
@@ -1876,7 +1876,7 @@ int gfs2_dir_del(struct gfs2_inode *dip, const struct dentry *dentry) 
	const struct qstr *name = &dentry->d_name;

	struct gfs2_dirent *dent, *prev = NULL;

	struct buffer_head *bh;

	struct timespec64 tv = current_time(&dip->i_inode);

	struct timespec64 tv;



	/* Returns _either_ the entry (if its first in block) or the

	   previous entry otherwise */
@@ -1896,6 +1896,7 @@ int gfs2_dir_del(struct gfs2_inode *dip, const struct dentry *dentry) 
	}



	dirent_del(dip, bh, prev, dent);

	tv = inode_set_ctime_current(&dip->i_inode);

	if (dip->i_diskflags & GFS2_DIF_EXHASH) {

		struct gfs2_leaf *leaf = (struct gfs2_leaf *)bh->b_data;

		u16 entries = be16_to_cpu(leaf->lf_entries);
@@ -1910,7 +1911,7 @@ int gfs2_dir_del(struct gfs2_inode *dip, const struct dentry *dentry) 
	if (!dip->i_entries)

		gfs2_consist_inode(dip);

	dip->i_entries--;

	dip->i_inode.i_mtime = dip->i_inode.i_ctime = tv;

	dip->i_inode.i_mtime =  tv;

	if (d_is_dir(dentry))

		drop_nlink(&dip->i_inode);

	mark_inode_dirty(&dip->i_inode);
@@ -1951,7 +1952,7 @@ int gfs2_dir_mvino(struct gfs2_inode *dip, const struct qstr *filename, 
	dent->de_type = cpu_to_be16(new_type);

	brelse(bh);



	dip->i_inode.i_mtime = dip->i_inode.i_ctime = current_time(&dip->i_inode);

	dip->i_inode.i_mtime = inode_set_ctime_current(&dip->i_inode);

	mark_inode_dirty_sync(&dip->i_inode);

	return 0;

}

fs/gfs2/file.c

+1 −1
Original line number Diff line number Diff line
@@ -260,7 +260,7 @@ static int do_gfs2_set_flags(struct inode *inode, u32 reqflags, u32 mask) 
	error = gfs2_meta_inode_buffer(ip, &bh);

	if (error)

		goto out_trans_end;

	inode->i_ctime = current_time(inode);

	inode_set_ctime_current(inode);

	gfs2_trans_add_meta(ip->i_gl, bh);

	ip->i_diskflags = new_flags;

	gfs2_dinode_out(ip, bh->b_data);

fs/gfs2/glops.c

+2 −2
Original line number Diff line number Diff line
@@ -437,8 +437,8 @@ static int gfs2_dinode_in(struct gfs2_inode *ip, const void *buf) 
		inode->i_atime = atime;

	inode->i_mtime.tv_sec = be64_to_cpu(str->di_mtime);

	inode->i_mtime.tv_nsec = be32_to_cpu(str->di_mtime_nsec);

	inode->i_ctime.tv_sec = be64_to_cpu(str->di_ctime);

	inode->i_ctime.tv_nsec = be32_to_cpu(str->di_ctime_nsec);

	inode_set_ctime(inode, be64_to_cpu(str->di_ctime),

			be32_to_cpu(str->di_ctime_nsec));



	ip->i_goal = be64_to_cpu(str->di_goal_meta);

	ip->i_generation = be64_to_cpu(str->di_generation);