Commit 7db35444 authored by Andreas Gruenbacher's avatar Andreas Gruenbacher
Browse files

gfs2: Cosmetic gfs2_dinode_{in,out} cleanup 



In each of the two functions, add an inode variable that points to
&ip->i_inode and use that throughout the rest of the function.

Signed-off-by: default avatarAndreas Gruenbacher <agruenba@redhat.com>
parent 4ec3c19d

fs/gfs2/glops.c

+21 −20
Original line number Diff line number Diff line
@@ -397,38 +397,39 @@ static int gfs2_dinode_in(struct gfs2_inode *ip, const void *buf) 
	struct timespec64 atime;

	u16 height, depth;

	umode_t mode = be32_to_cpu(str->di_mode);

	bool is_new = ip->i_inode.i_state & I_NEW;

	struct inode *inode = &ip->i_inode;

	bool is_new = inode->i_state & I_NEW;



	if (unlikely(ip->i_no_addr != be64_to_cpu(str->di_num.no_addr)))

		goto corrupt;

	if (unlikely(!is_new && inode_wrong_type(&ip->i_inode, mode)))

	if (unlikely(!is_new && inode_wrong_type(inode, mode)))

		goto corrupt;

	ip->i_no_formal_ino = be64_to_cpu(str->di_num.no_formal_ino);

	ip->i_inode.i_mode = mode;

	inode->i_mode = mode;

	if (is_new) {

		ip->i_inode.i_rdev = 0;

		inode->i_rdev = 0;

		switch (mode & S_IFMT) {

		case S_IFBLK:

		case S_IFCHR:

			ip->i_inode.i_rdev = MKDEV(be32_to_cpu(str->di_major),

			inode->i_rdev = MKDEV(be32_to_cpu(str->di_major),

					      be32_to_cpu(str->di_minor));

			break;

		}

	}



	i_uid_write(&ip->i_inode, be32_to_cpu(str->di_uid));

	i_gid_write(&ip->i_inode, be32_to_cpu(str->di_gid));

	set_nlink(&ip->i_inode, be32_to_cpu(str->di_nlink));

	i_size_write(&ip->i_inode, be64_to_cpu(str->di_size));

	gfs2_set_inode_blocks(&ip->i_inode, be64_to_cpu(str->di_blocks));

	i_uid_write(inode, be32_to_cpu(str->di_uid));

	i_gid_write(inode, be32_to_cpu(str->di_gid));

	set_nlink(inode, be32_to_cpu(str->di_nlink));

	i_size_write(inode, be64_to_cpu(str->di_size));

	gfs2_set_inode_blocks(inode, be64_to_cpu(str->di_blocks));

	atime.tv_sec = be64_to_cpu(str->di_atime);

	atime.tv_nsec = be32_to_cpu(str->di_atime_nsec);

	if (timespec64_compare(&ip->i_inode.i_atime, &atime) < 0)

		ip->i_inode.i_atime = atime;

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

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

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

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

	if (timespec64_compare(&inode->i_atime, &atime) < 0)

		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);



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

	ip->i_generation = be64_to_cpu(str->di_generation);
@@ -436,7 +437,7 @@ static int gfs2_dinode_in(struct gfs2_inode *ip, const void *buf) 
	ip->i_diskflags = be32_to_cpu(str->di_flags);

	ip->i_eattr = be64_to_cpu(str->di_eattr);

	/* i_diskflags and i_eattr must be set before gfs2_set_inode_flags() */

	gfs2_set_inode_flags(&ip->i_inode);

	gfs2_set_inode_flags(inode);

	height = be16_to_cpu(str->di_height);

	if (unlikely(height > GFS2_MAX_META_HEIGHT))

		goto corrupt;
@@ -448,8 +449,8 @@ static int gfs2_dinode_in(struct gfs2_inode *ip, const void *buf) 
	ip->i_depth = (u8)depth;

	ip->i_entries = be32_to_cpu(str->di_entries);



	if (S_ISREG(ip->i_inode.i_mode))

		gfs2_set_aops(&ip->i_inode);

	if (S_ISREG(inode->i_mode))

		gfs2_set_aops(inode);



	return 0;

corrupt:

fs/gfs2/super.c

+14 −13
Original line number Diff line number Diff line
@@ -379,6 +379,7 @@ static int gfs2_lock_fs_check_clean(struct gfs2_sbd *sdp) 


void gfs2_dinode_out(const struct gfs2_inode *ip, void *buf)

{

	const struct inode *inode = &ip->i_inode;

	struct gfs2_dinode *str = buf;



	str->di_header.mh_magic = cpu_to_be32(GFS2_MAGIC);
@@ -386,15 +387,15 @@ void gfs2_dinode_out(const struct gfs2_inode *ip, void *buf) 
	str->di_header.mh_format = cpu_to_be32(GFS2_FORMAT_DI);

	str->di_num.no_addr = cpu_to_be64(ip->i_no_addr);

	str->di_num.no_formal_ino = cpu_to_be64(ip->i_no_formal_ino);

	str->di_mode = cpu_to_be32(ip->i_inode.i_mode);

	str->di_uid = cpu_to_be32(i_uid_read(&ip->i_inode));

	str->di_gid = cpu_to_be32(i_gid_read(&ip->i_inode));

	str->di_nlink = cpu_to_be32(ip->i_inode.i_nlink);

	str->di_size = cpu_to_be64(i_size_read(&ip->i_inode));

	str->di_blocks = cpu_to_be64(gfs2_get_inode_blocks(&ip->i_inode));

	str->di_atime = cpu_to_be64(ip->i_inode.i_atime.tv_sec);

	str->di_mtime = cpu_to_be64(ip->i_inode.i_mtime.tv_sec);

	str->di_ctime = cpu_to_be64(ip->i_inode.i_ctime.tv_sec);

	str->di_mode = cpu_to_be32(inode->i_mode);

	str->di_uid = cpu_to_be32(i_uid_read(inode));

	str->di_gid = cpu_to_be32(i_gid_read(inode));

	str->di_nlink = cpu_to_be32(inode->i_nlink);

	str->di_size = cpu_to_be64(i_size_read(inode));

	str->di_blocks = cpu_to_be64(gfs2_get_inode_blocks(inode));

	str->di_atime = cpu_to_be64(inode->i_atime.tv_sec);

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

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



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

	str->di_goal_data = cpu_to_be64(ip->i_goal);
@@ -402,16 +403,16 @@ void gfs2_dinode_out(const struct gfs2_inode *ip, void *buf) 


	str->di_flags = cpu_to_be32(ip->i_diskflags);

	str->di_height = cpu_to_be16(ip->i_height);

	str->di_payload_format = cpu_to_be32(S_ISDIR(ip->i_inode.i_mode) &&

	str->di_payload_format = cpu_to_be32(S_ISDIR(inode->i_mode) &&

					     !(ip->i_diskflags & GFS2_DIF_EXHASH) ?

					     GFS2_FORMAT_DE : 0);

	str->di_depth = cpu_to_be16(ip->i_depth);

	str->di_entries = cpu_to_be32(ip->i_entries);



	str->di_eattr = cpu_to_be64(ip->i_eattr);

	str->di_atime_nsec = cpu_to_be32(ip->i_inode.i_atime.tv_nsec);

	str->di_mtime_nsec = cpu_to_be32(ip->i_inode.i_mtime.tv_nsec);

	str->di_ctime_nsec = cpu_to_be32(ip->i_inode.i_ctime.tv_nsec);

	str->di_atime_nsec = cpu_to_be32(inode->i_atime.tv_nsec);

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

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

}



/**