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

Commit 9e55cd53 authored by Steven Whitehouse's avatar Steven Whitehouse
Browse files

GFS2: Remove unreachable calls to vmtruncate 



Suggested-by: default avatarChristoph Hellwig <hch@infradead.org>
Signed-off-by: default avatarSteven Whitehouse <swhiteho@redhat.com>
parent cc18152e

fs/gfs2/inode.c

+0 −9
Original line number Diff line number Diff line
@@ -916,17 +916,8 @@ static int __gfs2_setattr_simple(struct gfs2_inode *ip, struct iattr *attr) 
	if (error)

		return error;



	if ((attr->ia_valid & ATTR_SIZE) &&

	    attr->ia_size != i_size_read(inode)) {

		error = vmtruncate(inode, attr->ia_size);

		if (error)

			return error;

	}



	setattr_copy(inode, attr);

	mark_inode_dirty(inode);



	gfs2_assert_warn(GFS2_SB(inode), !error);

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

	gfs2_dinode_out(ip, dibh->b_data);

	brelse(dibh);

fs/gfs2/ops_inode.c

+0 −9
Original line number Diff line number Diff line
@@ -1104,17 +1104,8 @@ static int setattr_chown(struct inode *inode, struct iattr *attr) 
	if (error)

		goto out_end_trans;



	if ((attr->ia_valid & ATTR_SIZE) &&

	    attr->ia_size != i_size_read(inode)) {

		int error;



		error = vmtruncate(inode, attr->ia_size);

		gfs2_assert_warn(sdp, !error);

	}



	setattr_copy(inode, attr);

	mark_inode_dirty(inode);



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

	gfs2_dinode_out(ip, dibh->b_data);

	brelse(dibh);

fs/gfs2/xattr.c

+0 −9
Original line number Diff line number Diff line
@@ -1325,17 +1325,8 @@ int gfs2_xattr_acl_chmod(struct gfs2_inode *ip, struct iattr *attr, char *data) 
	if (error)

		goto out_trans_end;



	if ((attr->ia_valid & ATTR_SIZE) &&

	    attr->ia_size != i_size_read(inode)) {

		int error;



		error = vmtruncate(inode, attr->ia_size);

		gfs2_assert_warn(GFS2_SB(inode), !error);

	}



	setattr_copy(inode, attr);

	mark_inode_dirty(inode);



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

	gfs2_dinode_out(ip, dibh->b_data);

	brelse(dibh);