Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

GFS2: Remove i_disksize 



With the update of the truncate code, ip->i_disksize and
inode->i_size are merely copies of each other. This means
we can remove ip->i_disksize and use inode->i_size exclusively
reducing the size of a GFS2 inode by 8 bytes.

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

fs/gfs2/aops.c

+1 −5
Original line number Diff line number Diff line
@@ -800,10 +800,8 @@ static int gfs2_stuffed_write_end(struct inode *inode, struct buffer_head *dibh, 
	page_cache_release(page);



	if (copied) {

		if (inode->i_size < to) {

		if (inode->i_size < to)

			i_size_write(inode, to);

			ip->i_disksize = inode->i_size;

		}

		gfs2_dinode_out(ip, di);

		mark_inode_dirty(inode);

	}
@@ -874,8 +872,6 @@ static int gfs2_write_end(struct file *file, struct address_space *mapping, 


	ret = generic_write_end(file, mapping, pos, len, copied, page, fsdata);

	if (ret > 0) {

		if (inode->i_size > ip->i_disksize)

			ip->i_disksize = inode->i_size;

		gfs2_dinode_out(ip, dibh->b_data);

		mark_inode_dirty(inode);

	}

fs/gfs2/bmap.c

+5 −7
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ int gfs2_unstuff_dinode(struct gfs2_inode *ip, struct page *page) 
	if (error)

		goto out;



	if (ip->i_disksize) {

	if (i_size_read(&ip->i_inode)) {

		/* Get a free block, fill it with the stuffed data,

		   and write it out to disk */
@@ -160,7 +160,7 @@ int gfs2_unstuff_dinode(struct gfs2_inode *ip, struct page *page) 
	di = (struct gfs2_dinode *)dibh->b_data;

	gfs2_buffer_clear_tail(dibh, sizeof(struct gfs2_dinode));



	if (ip->i_disksize) {

	if (i_size_read(&ip->i_inode)) {

		*(__be64 *)(di + 1) = cpu_to_be64(block);

		gfs2_add_inode_blocks(&ip->i_inode, 1);

		di->di_blocks = cpu_to_be64(gfs2_get_inode_blocks(&ip->i_inode));
@@ -985,7 +985,6 @@ static int trunc_start(struct inode *inode, u64 oldsize, u64 newsize) 
	}



	i_size_write(inode, newsize);

	ip->i_disksize = newsize;

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

	gfs2_dinode_out(ip, dibh->b_data);
@@ -1051,7 +1050,7 @@ static int trunc_end(struct gfs2_inode *ip) 
	if (error)

		goto out;



	if (!ip->i_disksize) {

	if (!i_size_read(&ip->i_inode)) {

		ip->i_height = 0;

		ip->i_goal = ip->i_no_addr;

		gfs2_buffer_clear_tail(dibh, sizeof(struct gfs2_dinode));
@@ -1167,7 +1166,6 @@ static int do_grow(struct inode *inode, u64 size) 
		goto do_end_trans;



	i_size_write(inode, size);

	ip->i_disksize = size;

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

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

	gfs2_dinode_out(ip, dibh->b_data);
@@ -1219,7 +1217,7 @@ int gfs2_setattr_size(struct inode *inode, u64 newsize) 
int gfs2_truncatei_resume(struct gfs2_inode *ip)

{

	int error;

	error = trunc_dealloc(ip, ip->i_disksize);

	error = trunc_dealloc(ip, i_size_read(&ip->i_inode));

	if (!error)

		error = trunc_end(ip);

	return error;
@@ -1260,7 +1258,7 @@ int gfs2_write_alloc_required(struct gfs2_inode *ip, u64 offset, 


	shift = sdp->sd_sb.sb_bsize_shift;

	BUG_ON(gfs2_is_dir(ip));

	end_of_file = (ip->i_disksize + sdp->sd_sb.sb_bsize - 1) >> shift;

	end_of_file = (i_size_read(&ip->i_inode) + sdp->sd_sb.sb_bsize - 1) >> shift;

	lblock = offset >> shift;

	lblock_stop = (offset + len + sdp->sd_sb.sb_bsize - 1) >> shift;

	if (lblock_stop > end_of_file)

fs/gfs2/dir.c

+15 −13
Original line number Diff line number Diff line
@@ -127,8 +127,8 @@ static int gfs2_dir_write_stuffed(struct gfs2_inode *ip, const char *buf, 


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

	memcpy(dibh->b_data + offset + sizeof(struct gfs2_dinode), buf, size);

	if (ip->i_disksize < offset + size)

		ip->i_disksize = offset + 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;

	gfs2_dinode_out(ip, dibh->b_data);
@@ -225,8 +225,8 @@ static int gfs2_dir_write_data(struct gfs2_inode *ip, const char *buf, 
	if (error)

		return error;



	if (ip->i_disksize < offset + copied)

		ip->i_disksize = offset + copied;

	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;



	gfs2_trans_add_bh(ip->i_gl, dibh, 1);
@@ -275,12 +275,13 @@ static int gfs2_dir_read_data(struct gfs2_inode *ip, char *buf, u64 offset, 
	unsigned int o;

	int copied = 0;

	int error = 0;

	u64 disksize = i_size_read(&ip->i_inode);



	if (offset >= ip->i_disksize)

	if (offset >= disksize)

		return 0;



	if (offset + size > ip->i_disksize)

		size = ip->i_disksize - offset;

	if (offset + size > disksize)

		size = disksize - offset;



	if (!size)

		return 0;
@@ -727,7 +728,7 @@ static struct gfs2_dirent *gfs2_dirent_search(struct inode *inode, 
		unsigned hsize = 1 << ip->i_depth;

		unsigned index;

		u64 ln;

		if (hsize * sizeof(u64) != ip->i_disksize) {

		if (hsize * sizeof(u64) != i_size_read(inode)) {

			gfs2_consist_inode(ip);

			return ERR_PTR(-EIO);

		}
@@ -879,7 +880,7 @@ static int dir_make_exhash(struct inode *inode) 
	for (x = sdp->sd_hash_ptrs; x--; lp++)

		*lp = cpu_to_be64(bn);



	dip->i_disksize = sdp->sd_sb.sb_bsize / 2;

	i_size_write(inode, sdp->sd_sb.sb_bsize / 2);

	gfs2_add_inode_blocks(&dip->i_inode, 1);

	dip->i_diskflags |= GFS2_DIF_EXHASH;
@@ -1057,11 +1058,12 @@ static int dir_double_exhash(struct gfs2_inode *dip) 
	u64 *buf;

	u64 *from, *to;

	u64 block;

	u64 disksize = i_size_read(&dip->i_inode);

	int x;

	int error = 0;



	hsize = 1 << dip->i_depth;

	if (hsize * sizeof(u64) != dip->i_disksize) {

	if (hsize * sizeof(u64) != disksize) {

		gfs2_consist_inode(dip);

		return -EIO;

	}
@@ -1072,7 +1074,7 @@ static int dir_double_exhash(struct gfs2_inode *dip) 
	if (!buf)

		return -ENOMEM;



	for (block = dip->i_disksize >> sdp->sd_hash_bsize_shift; block--;) {

	for (block = disksize >> sdp->sd_hash_bsize_shift; block--;) {

		error = gfs2_dir_read_data(dip, (char *)buf,

					    block * sdp->sd_hash_bsize,

					    sdp->sd_hash_bsize, 1);
@@ -1370,7 +1372,7 @@ static int dir_e_read(struct inode *inode, u64 *offset, void *opaque, 
	unsigned depth = 0;



	hsize = 1 << dip->i_depth;

	if (hsize * sizeof(u64) != dip->i_disksize) {

	if (hsize * sizeof(u64) != i_size_read(inode)) {

		gfs2_consist_inode(dip);

		return -EIO;

	}
@@ -1784,7 +1786,7 @@ static int foreach_leaf(struct gfs2_inode *dip, leaf_call_t lc, void *data) 
	int error = 0;



	hsize = 1 << dip->i_depth;

	if (hsize * sizeof(u64) != dip->i_disksize) {

	if (hsize * sizeof(u64) != i_size_read(&dip->i_inode)) {

		gfs2_consist_inode(dip);

		return -EIO;

	}

fs/gfs2/file.c

+1 −1
Original line number Diff line number Diff line
@@ -491,7 +491,7 @@ static int gfs2_open(struct inode *inode, struct file *file) 
			goto fail;



		if (!(file->f_flags & O_LARGEFILE) &&

		    ip->i_disksize > MAX_NON_LFS) {

		    i_size_read(inode) > MAX_NON_LFS) {

			error = -EOVERFLOW;

			goto fail_gunlock;

		}

fs/gfs2/glops.c

+2 −3
Original line number Diff line number Diff line
@@ -262,13 +262,12 @@ static int inode_go_dump(struct seq_file *seq, const struct gfs2_glock *gl) 
	const struct gfs2_inode *ip = gl->gl_object;

	if (ip == NULL)

		return 0;

	gfs2_print_dbg(seq, " I: n:%llu/%llu t:%u f:0x%02lx d:0x%08x s:%llu/%llu\n",

	gfs2_print_dbg(seq, " I: n:%llu/%llu t:%u f:0x%02lx d:0x%08x s:%llu\n",

		  (unsigned long long)ip->i_no_formal_ino,

		  (unsigned long long)ip->i_no_addr,

		  IF2DT(ip->i_inode.i_mode), ip->i_flags,

		  (unsigned int)ip->i_diskflags,

		  (unsigned long long)ip->i_inode.i_size,

		  (unsigned long long)ip->i_disksize);

		  (unsigned long long)i_size_read(&ip->i_inode));

	return 0;

}