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

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

GFS2: Move i_size from gfs2_dinode_host and rename it to i_disksize 



This patch moved the i_size field from the gfs2_dinode_host and
following the ext3 convention renames it i_disksize.

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

fs/gfs2/bmap.c

+13 −13
Original line number Diff line number Diff line
@@ -75,9 +75,9 @@ static int gfs2_unstuffer_page(struct gfs2_inode *ip, struct buffer_head *dibh, 
		void *kaddr = kmap(page);



		memcpy(kaddr, dibh->b_data + sizeof(struct gfs2_dinode),

		       ip->i_di.di_size);

		memset(kaddr + ip->i_di.di_size, 0,

		       PAGE_CACHE_SIZE - ip->i_di.di_size);

		       ip->i_disksize);

		memset(kaddr + ip->i_disksize, 0,

		       PAGE_CACHE_SIZE - ip->i_disksize);

		kunmap(page);



		SetPageUptodate(page);
@@ -132,7 +132,7 @@ int gfs2_unstuff_dinode(struct gfs2_inode *ip, struct page *page) 
	if (error)

		goto out;



	if (ip->i_di.di_size) {

	if (ip->i_disksize) {

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

		   and write it out to disk */
@@ -159,7 +159,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_di.di_size) {

	if (ip->i_disksize) {

		*(__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));
@@ -926,7 +926,7 @@ static int do_grow(struct gfs2_inode *ip, u64 size) 
		}

	}



	ip->i_di.di_size = 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);
@@ -1033,7 +1033,7 @@ static int trunc_start(struct gfs2_inode *ip, u64 size) 
		goto out;



	if (gfs2_is_stuffed(ip)) {

		ip->i_di.di_size = 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);
@@ -1045,7 +1045,7 @@ static int trunc_start(struct gfs2_inode *ip, u64 size) 
			error = gfs2_block_truncate_page(ip->i_inode.i_mapping);



		if (!error) {

			ip->i_di.di_size = size;

			ip->i_disksize = size;

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

			ip->i_di.di_flags |= GFS2_DIF_TRUNC_IN_PROG;

			gfs2_trans_add_bh(ip->i_gl, dibh, 1);
@@ -1114,7 +1114,7 @@ static int trunc_end(struct gfs2_inode *ip) 
	if (error)

		goto out;



	if (!ip->i_di.di_size) {

	if (!ip->i_disksize) {

		ip->i_height = 0;

		ip->i_goal = ip->i_no_addr;

		gfs2_buffer_clear_tail(dibh, sizeof(struct gfs2_dinode));
@@ -1205,9 +1205,9 @@ int gfs2_truncatei(struct gfs2_inode *ip, u64 size) 
	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)

	if (size > ip->i_disksize)

		error = do_grow(ip, size);

	else if (size < ip->i_di.di_size)

	else if (size < ip->i_disksize)

		error = do_shrink(ip, size);

	else

		/* update time stamps */
@@ -1219,7 +1219,7 @@ int gfs2_truncatei(struct gfs2_inode *ip, u64 size) 
int gfs2_truncatei_resume(struct gfs2_inode *ip)

{

	int error;

	error = trunc_dealloc(ip, ip->i_di.di_size);

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

	if (!error)

		error = trunc_end(ip);

	return error;
@@ -1298,7 +1298,7 @@ int gfs2_write_alloc_required(struct gfs2_inode *ip, u64 offset, 
		lblock_stop = offset + len + bsize - 1;

		do_div(lblock_stop, bsize);

	} else {

		u64 end_of_file = (ip->i_di.di_size + sdp->sd_sb.sb_bsize - 1) >> shift;

		u64 end_of_file = (ip->i_disksize + 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

+13 −13
Original line number Diff line number Diff line
@@ -128,8 +128,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_di.di_size < offset + size)

		ip->i_di.di_size = offset + size;

	if (ip->i_disksize < offset + size)

		ip->i_disksize = offset + size;

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

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

		return error;



	if (ip->i_di.di_size < offset + copied)

		ip->i_di.di_size = offset + copied;

	if (ip->i_disksize < offset + copied)

		ip->i_disksize = offset + copied;

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



	gfs2_trans_add_bh(ip->i_gl, dibh, 1);
@@ -277,11 +277,11 @@ static int gfs2_dir_read_data(struct gfs2_inode *ip, char *buf, u64 offset, 
	int copied = 0;

	int error = 0;



	if (offset >= ip->i_di.di_size)

	if (offset >= ip->i_disksize)

		return 0;



	if (offset + size > ip->i_di.di_size)

		size = ip->i_di.di_size - offset;

	if (offset + size > ip->i_disksize)

		size = ip->i_disksize - offset;



	if (!size)

		return 0;
@@ -760,7 +760,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_di.di_size) {

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

			gfs2_consist_inode(ip);

			return ERR_PTR(-EIO);

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

		*lp = cpu_to_be64(bn);



	dip->i_di.di_size = sdp->sd_sb.sb_bsize / 2;

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

	gfs2_add_inode_blocks(&dip->i_inode, 1);

	dip->i_di.di_flags |= GFS2_DIF_EXHASH;
@@ -1082,7 +1082,7 @@ static int dir_double_exhash(struct gfs2_inode *dip) 
	int error = 0;



	hsize = 1 << dip->i_depth;

	if (hsize * sizeof(u64) != dip->i_di.di_size) {

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

		gfs2_consist_inode(dip);

		return -EIO;

	}
@@ -1091,7 +1091,7 @@ static int dir_double_exhash(struct gfs2_inode *dip) 


	buf = kcalloc(3, sdp->sd_hash_bsize, GFP_NOFS | __GFP_NOFAIL);



	for (block = dip->i_di.di_size >> sdp->sd_hash_bsize_shift; block--;) {

	for (block = dip->i_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 +1370,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_di.di_size) {

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

		gfs2_consist_inode(dip);

		return -EIO;

	}
@@ -1784,7 +1784,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_di.di_size) {

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

		gfs2_consist_inode(dip);

		return -EIO;

	}

fs/gfs2/incore.h

+1 −1
Original line number Diff line number Diff line
@@ -234,7 +234,6 @@ enum { 
};



struct gfs2_dinode_host {

	u64 di_size;		/* number of bytes in file */

	u32 di_flags;		/* GFS2_DIF_... */

};
@@ -244,6 +243,7 @@ struct gfs2_inode { 
	u64 i_no_formal_ino;

	u64 i_generation;

	u64 i_eattr;

	loff_t i_disksize;

	unsigned long i_flags;		/* GIF_... */



	struct gfs2_dinode_host i_di; /* To be replaced by ref to block */

fs/gfs2/inode.c

+7 −6
Original line number Diff line number Diff line
@@ -273,8 +273,8 @@ static int gfs2_dinode_in(struct gfs2_inode *ip, const void *buf) 
	 * to do that.

	 */

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

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

	i_size_write(&ip->i_inode, di->di_size);

	ip->i_disksize = be64_to_cpu(str->di_size);

	i_size_write(&ip->i_inode, ip->i_disksize);

	gfs2_set_inode_blocks(&ip->i_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);
@@ -1167,7 +1167,7 @@ int gfs2_readlinki(struct gfs2_inode *ip, char **buf, unsigned int *len) 
		return error;

	}



	if (!ip->i_di.di_size) {

	if (!ip->i_disksize) {

		gfs2_consist_inode(ip);

		error = -EIO;

		goto out;
@@ -1177,7 +1177,7 @@ int gfs2_readlinki(struct gfs2_inode *ip, char **buf, unsigned int *len) 
	if (error)

		goto out;



	x = ip->i_di.di_size + 1;

	x = ip->i_disksize + 1;

	if (x > *len) {

		*buf = kmalloc(x, GFP_NOFS);

		if (!*buf) {
@@ -1255,7 +1255,7 @@ void gfs2_dinode_out(const struct gfs2_inode *ip, void *buf) 
	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(ip->i_inode.i_nlink);

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

	str->di_size = cpu_to_be64(ip->i_disksize);

	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);
@@ -1287,7 +1287,8 @@ void gfs2_dinode_print(const struct gfs2_inode *ip) 
	       (unsigned long long)ip->i_no_formal_ino);

	printk(KERN_INFO "  no_addr = %llu\n",

	       (unsigned long long)ip->i_no_addr);

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

	printk(KERN_INFO "  i_disksize = %llu\n",

	       (unsigned long long)ip->i_disksize);

	printk(KERN_INFO "  blocks = %llu\n",

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

	printk(KERN_INFO "  i_goal = %llu\n",

fs/gfs2/ops_address.c

+5 −5
Original line number Diff line number Diff line
@@ -451,8 +451,8 @@ static int stuffed_readpage(struct gfs2_inode *ip, struct page *page) 


	kaddr = kmap_atomic(page, KM_USER0);

	memcpy(kaddr, dibh->b_data + sizeof(struct gfs2_dinode),

	       ip->i_di.di_size);

	memset(kaddr + ip->i_di.di_size, 0, PAGE_CACHE_SIZE - ip->i_di.di_size);

	       ip->i_disksize);

	memset(kaddr + ip->i_disksize, 0, PAGE_CACHE_SIZE - ip->i_disksize);

	kunmap_atomic(kaddr, KM_USER0);

	flush_dcache_page(page);

	brelse(dibh);
@@ -780,7 +780,7 @@ static int gfs2_stuffed_write_end(struct inode *inode, struct buffer_head *dibh, 


	if (inode->i_size < to) {

		i_size_write(inode, to);

		ip->i_di.di_size = inode->i_size;

		ip->i_disksize = inode->i_size;

		di->di_size = cpu_to_be64(inode->i_size);

		mark_inode_dirty(inode);

	}
@@ -845,9 +845,9 @@ static int gfs2_write_end(struct file *file, struct address_space *mapping, 


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



	if (likely(ret >= 0) && (inode->i_size > ip->i_di.di_size)) {

	if (likely(ret >= 0) && (inode->i_size > ip->i_disksize)) {

		di = (struct gfs2_dinode *)dibh->b_data;

		ip->i_di.di_size = inode->i_size;

		ip->i_disksize = inode->i_size;

		di->di_size = cpu_to_be64(inode->i_size);

		mark_inode_dirty(inode);

	}