Commit 2933f925 authored by Steven Whitehouse's avatar Steven Whitehouse
Browse files

[GFS2] Shrink gfs2_inode (4) - di_uid/di_gid 



Remove duplicate di_uid/di_gid fields in favour of using
inode->i_uid/inode->i_gid instead. This saves 8 bytes.

Signed-off-by: default avatarSteven Whitehouse <swhiteho@redhat.com>
parent b60623c2

fs/gfs2/acl.c

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ int gfs2_acl_validate_remove(struct gfs2_inode *ip, int access) 
{

	if (!GFS2_SB(&ip->i_inode)->sd_args.ar_posix_acl)

		return -EOPNOTSUPP;

	if (current->fsuid != ip->i_di.di_uid && !capable(CAP_FOWNER))

	if (current->fsuid != ip->i_inode.i_uid && !capable(CAP_FOWNER))

		return -EPERM;

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

		return -EOPNOTSUPP;

fs/gfs2/bmap.c

+1 −1
Original line number Diff line number Diff line
@@ -819,7 +819,7 @@ static int do_grow(struct gfs2_inode *ip, u64 size) 
	if (error)

		goto out;



	error = gfs2_quota_check(ip, ip->i_di.di_uid, ip->i_di.di_gid);

	error = gfs2_quota_check(ip, ip->i_inode.i_uid, ip->i_inode.i_gid);

	if (error)

		goto out_gunlock_q;

fs/gfs2/eattr.c

+1 −1
Original line number Diff line number Diff line
@@ -687,7 +687,7 @@ static int ea_alloc_skeleton(struct gfs2_inode *ip, struct gfs2_ea_request *er, 
	if (error)

		goto out;



	error = gfs2_quota_check(ip, ip->i_di.di_uid, ip->i_di.di_gid);

	error = gfs2_quota_check(ip, ip->i_inode.i_uid, ip->i_inode.i_gid);

	if (error)

		goto out_gunlock_q;

fs/gfs2/inode.c

+9 −14
Original line number Diff line number Diff line
@@ -52,8 +52,6 @@ void gfs2_inode_attr_in(struct gfs2_inode *ip) 


	inode->i_ino = ip->i_num.no_addr;

	inode->i_nlink = di->di_nlink;

	inode->i_uid = di->di_uid;

	inode->i_gid = di->di_gid;

	i_size_write(inode, di->di_size);

	inode->i_atime.tv_sec = di->di_atime;

	inode->i_mtime.tv_sec = di->di_mtime;
@@ -87,8 +85,6 @@ void gfs2_inode_attr_out(struct gfs2_inode *ip) 
{

	struct inode *inode = &ip->i_inode;

	struct gfs2_dinode_host *di = &ip->i_di;

	di->di_uid = inode->i_uid;

	di->di_gid = inode->i_gid;

	di->di_atime = inode->i_atime.tv_sec;

	di->di_mtime = inode->i_mtime.tv_sec;

	di->di_ctime = inode->i_ctime.tv_sec;
@@ -216,8 +212,8 @@ static int gfs2_dinode_in(struct gfs2_inode *ip, const void *buf) 
		break;

	};



	di->di_uid = be32_to_cpu(str->di_uid);

	di->di_gid = be32_to_cpu(str->di_gid);

	ip->i_inode.i_uid = be32_to_cpu(str->di_uid);

	ip->i_inode.i_gid = be32_to_cpu(str->di_gid);

	di->di_nlink = be32_to_cpu(str->di_nlink);

	di->di_size = be64_to_cpu(str->di_size);

	di->di_blocks = be64_to_cpu(str->di_blocks);
@@ -616,19 +612,19 @@ static void munge_mode_uid_gid(struct gfs2_inode *dip, unsigned int *mode, 
			       unsigned int *uid, unsigned int *gid)

{

	if (GFS2_SB(&dip->i_inode)->sd_args.ar_suiddir &&

	    (dip->i_inode.i_mode & S_ISUID) && dip->i_di.di_uid) {

	    (dip->i_inode.i_mode & S_ISUID) && dip->i_inode.i_uid) {

		if (S_ISDIR(*mode))

			*mode |= S_ISUID;

		else if (dip->i_di.di_uid != current->fsuid)

		else if (dip->i_inode.i_uid != current->fsuid)

			*mode &= ~07111;

		*uid = dip->i_di.di_uid;

		*uid = dip->i_inode.i_uid;

	} else

		*uid = current->fsuid;



	if (dip->i_inode.i_mode & S_ISGID) {

		if (S_ISDIR(*mode))

			*mode |= S_ISGID;

		*gid = dip->i_di.di_gid;

		*gid = dip->i_inode.i_gid;

	} else

		*gid = current->fsgid;

}
@@ -783,8 +779,7 @@ static int link_dinode(struct gfs2_inode *dip, const struct qstr *name, 
	if (alloc_required < 0)

		goto fail;

	if (alloc_required) {

		error = gfs2_quota_check(dip, dip->i_di.di_uid,

					 dip->i_di.di_gid);

		error = gfs2_quota_check(dip, dip->i_inode.i_uid, dip->i_inode.i_gid);

		if (error)

			goto fail_quota_locks;
@@ -1050,8 +1045,8 @@ int gfs2_unlink_ok(struct gfs2_inode *dip, const struct qstr *name, 
		return -EPERM;



	if ((dip->i_inode.i_mode & S_ISVTX) &&

	    dip->i_di.di_uid != current->fsuid &&

	    ip->i_di.di_uid != current->fsuid && !capable(CAP_FOWNER))

	    dip->i_inode.i_uid != current->fsuid &&

	    ip->i_inode.i_uid != current->fsuid && !capable(CAP_FOWNER))

		return -EPERM;



	if (IS_APPEND(&dip->i_inode))

fs/gfs2/ondisk.c

+2 −4
Original line number Diff line number Diff line
@@ -162,8 +162,8 @@ void gfs2_dinode_out(const struct gfs2_inode *ip, void *buf) 
	gfs2_inum_out(&ip->i_num, &str->di_num);



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

	str->di_uid = cpu_to_be32(di->di_uid);

	str->di_gid = cpu_to_be32(di->di_gid);

	str->di_uid = cpu_to_be32(ip->i_inode.i_uid);

	str->di_gid = cpu_to_be32(ip->i_inode.i_gid);

	str->di_nlink = cpu_to_be32(di->di_nlink);

	str->di_size = cpu_to_be64(di->di_size);

	str->di_blocks = cpu_to_be64(di->di_blocks);
@@ -191,8 +191,6 @@ void gfs2_dinode_print(const struct gfs2_inode *ip) 


	gfs2_inum_print(&ip->i_num);



	pv(di, di_uid, "%u");

	pv(di, di_gid, "%u");

	pv(di, di_nlink, "%u");

	printk(KERN_INFO "  di_size = %llu\n", (unsigned long long)di->di_size);

	printk(KERN_INFO "  di_blocks = %llu\n", (unsigned long long)di->di_blocks);