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

Commit d6382a35 authored by Andreas Gruenbacher's avatar Andreas Gruenbacher Committed by Bob Peterson
Browse files

gfs2: gfs2_stuffed_write_end cleanup 



First, change the sanity check in gfs2_stuffed_write_end to check for
the actual write size instead of the requested write size.

Second, use the existing teardown code in gfs2_write_end instead of
duplicating it in gfs2_stuffed_write_end.

Signed-off-by: default avatarAndreas Gruenbacher <agruenba@redhat.com>
Signed-off-by: default avatarBob Peterson <rpeterso@redhat.com>
parent 7841b9f0

fs/gfs2/aops.c

+18 −31
Original line number Diff line number Diff line
@@ -817,7 +817,6 @@ static void adjust_fs_space(struct inode *inode) 
 * @inode: The inode

 * @dibh: The buffer_head containing the on-disk inode

 * @pos: The file position

 * @len: The length of the write

 * @copied: How much was actually copied by the VFS

 * @page: The page

 *
@@ -827,17 +826,15 @@ static void adjust_fs_space(struct inode *inode) 
 * Returns: errno

 */

static int gfs2_stuffed_write_end(struct inode *inode, struct buffer_head *dibh,

				  loff_t pos, unsigned len, unsigned copied,

				  loff_t pos, unsigned copied,

				  struct page *page)

{

	struct gfs2_inode *ip = GFS2_I(inode);

	struct gfs2_sbd *sdp = GFS2_SB(inode);

	struct gfs2_inode *m_ip = GFS2_I(sdp->sd_statfs_inode);

	u64 to = pos + copied;

	void *kaddr;

	unsigned char *buf = dibh->b_data + sizeof(struct gfs2_dinode);



	BUG_ON(pos + len > gfs2_max_stuffed_size(ip));

	BUG_ON(pos + copied > gfs2_max_stuffed_size(ip));



	kaddr = kmap_atomic(page);

	memcpy(buf + pos, kaddr + pos, copied);
@@ -853,20 +850,6 @@ static int gfs2_stuffed_write_end(struct inode *inode, struct buffer_head *dibh, 
			i_size_write(inode, to);

		mark_inode_dirty(inode);

	}



	if (inode == sdp->sd_rindex) {

		adjust_fs_space(inode);

		sdp->sd_rindex_uptodate = 0;

	}



	brelse(dibh);

	gfs2_trans_end(sdp);

	if (inode == sdp->sd_rindex) {

		gfs2_glock_dq(&m_ip->i_gh);

		gfs2_holder_uninit(&m_ip->i_gh);

	}

	gfs2_glock_dq(&ip->i_gh);

	gfs2_holder_uninit(&ip->i_gh);

	return copied;

}
@@ -880,9 +863,8 @@ static int gfs2_stuffed_write_end(struct inode *inode, struct buffer_head *dibh, 
 * @page: The page that has been written

 * @fsdata: The fsdata (unused in GFS2)

 *

 * The main write_end function for GFS2. We have a separate one for

 * stuffed files as they are slightly different, otherwise we just

 * put our locking around the VFS provided functions.

 * The main write_end function for GFS2. We just put our locking around the VFS

 * provided functions.

 *

 * Returns: errno

 */
@@ -903,32 +885,37 @@ static int gfs2_write_end(struct file *file, struct address_space *mapping, 
	BUG_ON(gfs2_glock_is_locked_by_me(ip->i_gl) == NULL);



	ret = gfs2_meta_inode_buffer(ip, &dibh);

	if (unlikely(ret)) {

		unlock_page(page);

		put_page(page);

		goto failed;

	}

	if (unlikely(ret))

		goto out;



	if (gfs2_is_stuffed(ip))

		return gfs2_stuffed_write_end(inode, dibh, pos, len, copied, page);

	if (gfs2_is_stuffed(ip)) {

		ret = gfs2_stuffed_write_end(inode, dibh, pos, copied, page);

		page = NULL;

		goto out2;

	}



	if (!gfs2_is_writeback(ip))

		gfs2_page_add_databufs(ip, page, pos & ~PAGE_MASK, len);



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

	page = NULL;

	if (tr->tr_num_buf_new)

		__mark_inode_dirty(inode, I_DIRTY_DATASYNC);

	else

		gfs2_trans_add_meta(ip->i_gl, dibh);





out2:

	if (inode == sdp->sd_rindex) {

		adjust_fs_space(inode);

		sdp->sd_rindex_uptodate = 0;

	}



	brelse(dibh);

failed:

out:

	if (page) {

		unlock_page(page);

		put_page(page);

	}

	gfs2_trans_end(sdp);

	gfs2_inplace_release(ip);

	if (ip->i_qadata && ip->i_qadata->qa_qd_num)