Commit b60623c2 authored by Steven Whitehouse's avatar Steven Whitehouse
Browse files

[GFS2] Shrink gfs2_inode (3) - di_mode 



This removes the duplicate di_mode field in favour of using the
inode->i_mode field. This saves 4 bytes.

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

fs/gfs2/acl.c

+8 −8
Original line number Diff line number Diff line
@@ -76,9 +76,9 @@ int gfs2_acl_validate_remove(struct gfs2_inode *ip, int access) 
		return -EOPNOTSUPP;

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

		return -EPERM;

	if (S_ISLNK(ip->i_di.di_mode))

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

		return -EOPNOTSUPP;

	if (!access && !S_ISDIR(ip->i_di.di_mode))

	if (!access && !S_ISDIR(ip->i_inode.i_mode))

		return -EACCES;



	return 0;
@@ -198,8 +198,8 @@ static int munge_mode(struct gfs2_inode *ip, mode_t mode) 
	error = gfs2_meta_inode_buffer(ip, &dibh);

	if (!error) {

		gfs2_assert_withdraw(sdp,

				(ip->i_di.di_mode & S_IFMT) == (mode & S_IFMT));

		ip->i_di.di_mode = mode;

				(ip->i_inode.i_mode & S_IFMT) == (mode & S_IFMT));

		ip->i_inode.i_mode = mode;

		gfs2_trans_add_bh(ip->i_gl, dibh, 1);

		gfs2_dinode_out(ip, dibh->b_data);

		brelse(dibh);
@@ -215,12 +215,12 @@ int gfs2_acl_create(struct gfs2_inode *dip, struct gfs2_inode *ip) 
	struct gfs2_sbd *sdp = GFS2_SB(&dip->i_inode);

	struct posix_acl *acl = NULL, *clone;

	struct gfs2_ea_request er;

	mode_t mode = ip->i_di.di_mode;

	mode_t mode = ip->i_inode.i_mode;

	int error;



	if (!sdp->sd_args.ar_posix_acl)

		return 0;

	if (S_ISLNK(ip->i_di.di_mode))

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

		return 0;



	memset(&er, 0, sizeof(struct gfs2_ea_request));
@@ -232,7 +232,7 @@ int gfs2_acl_create(struct gfs2_inode *dip, struct gfs2_inode *ip) 
		return error;

	if (!acl) {

		mode &= ~current->fs->umask;

		if (mode != ip->i_di.di_mode)

		if (mode != ip->i_inode.i_mode)

			error = munge_mode(ip, mode);

		return error;

	}
@@ -244,7 +244,7 @@ int gfs2_acl_create(struct gfs2_inode *dip, struct gfs2_inode *ip) 
	posix_acl_release(acl);

	acl = clone;



	if (S_ISDIR(ip->i_di.di_mode)) {

	if (S_ISDIR(ip->i_inode.i_mode)) {

		er.er_name = GFS2_POSIX_ACL_DEFAULT;

		er.er_name_len = GFS2_POSIX_ACL_DEFAULT_LEN;

		error = gfs2_system_eaops.eo_set(ip, &er);

fs/gfs2/bmap.c

+1 −1
Original line number Diff line number Diff line
@@ -1109,7 +1109,7 @@ int gfs2_truncatei(struct gfs2_inode *ip, u64 size) 
{

	int error;



	if (gfs2_assert_warn(GFS2_SB(&ip->i_inode), S_ISREG(ip->i_di.di_mode)))

	if (gfs2_assert_warn(GFS2_SB(&ip->i_inode), S_ISREG(ip->i_inode.i_mode)))

		return -EINVAL;



	if (size > ip->i_di.di_size)

fs/gfs2/eaops.c

+1 −1
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ static int system_eo_set(struct gfs2_inode *ip, struct gfs2_ea_request *er) 


	if (GFS2_ACL_IS_ACCESS(er->er_name, er->er_name_len)) {

		if (!(er->er_flags & GFS2_ERF_MODE)) {

			er->er_mode = ip->i_di.di_mode;

			er->er_mode = ip->i_inode.i_mode;

			er->er_flags |= GFS2_ERF_MODE;

		}

		error = gfs2_acl_validate_set(ip, 1, er,

fs/gfs2/eattr.c

+4 −4
Original line number Diff line number Diff line
@@ -711,9 +711,9 @@ static int ea_alloc_skeleton(struct gfs2_inode *ip, struct gfs2_ea_request *er, 
	if (!error) {

		if (er->er_flags & GFS2_ERF_MODE) {

			gfs2_assert_withdraw(GFS2_SB(&ip->i_inode),

					    (ip->i_di.di_mode & S_IFMT) ==

					    (ip->i_inode.i_mode & S_IFMT) ==

					    (er->er_mode & S_IFMT));

			ip->i_di.di_mode = er->er_mode;

			ip->i_inode.i_mode = er->er_mode;

		}

		ip->i_di.di_ctime = get_seconds();

		gfs2_trans_add_bh(ip->i_gl, dibh, 1);
@@ -847,8 +847,8 @@ static int ea_set_simple_noalloc(struct gfs2_inode *ip, struct buffer_head *bh, 


	if (er->er_flags & GFS2_ERF_MODE) {

		gfs2_assert_withdraw(GFS2_SB(&ip->i_inode),

			(ip->i_di.di_mode & S_IFMT) == (er->er_mode & S_IFMT));

		ip->i_di.di_mode = er->er_mode;

			(ip->i_inode.i_mode & S_IFMT) == (er->er_mode & S_IFMT));

		ip->i_inode.i_mode = er->er_mode;

	}

	ip->i_di.di_ctime = get_seconds();

	gfs2_trans_add_bh(ip->i_gl, dibh, 1);

fs/gfs2/glock.c

+1 −1
Original line number Diff line number Diff line
@@ -2078,7 +2078,7 @@ static int dump_inode(struct gfs2_inode *ip) 
	printk(KERN_INFO "    num = %llu %llu\n",

		    (unsigned long long)ip->i_num.no_formal_ino,

		    (unsigned long long)ip->i_num.no_addr);

	printk(KERN_INFO "    type = %u\n", IF2DT(ip->i_di.di_mode));

	printk(KERN_INFO "    type = %u\n", IF2DT(ip->i_inode.i_mode));

	printk(KERN_INFO "    i_flags =");

	for (x = 0; x < 32; x++)

		if (test_bit(x, &ip->i_flags))