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

Commit 7eabb77e authored by Bob Peterson's avatar Bob Peterson Committed by Steven Whitehouse
Browse files

[GFS2] Misc fixups 



This patch contains two small fixups that didn't fit elsewhere.
They are: (1) get rid of temp variable in find_metapath.
(2) Remove vestigial "ret" variable from gfs2_writepage_common.

Signed-off-by: default avatarBob Peterson <rpeterso@redhat.com>
Signed-off-by: default avatarSteven Whitehouse <swhiteho@redhat.com>
parent d0109bfa

fs/gfs2/bmap.c

+1 −2
Original line number Diff line number Diff line
@@ -305,11 +305,10 @@ static void find_metapath(struct gfs2_inode *ip, u64 block, 
			  struct metapath *mp)

{

	struct gfs2_sbd *sdp = GFS2_SB(&ip->i_inode);

	u64 b = block;

	unsigned int i;



	for (i = ip->i_height; i--;)

		mp->mp_list[i] = do_div(b, sdp->sd_inptrs);

		mp->mp_list[i] = do_div(block, sdp->sd_inptrs);



}

fs/gfs2/ops_address.c

+1 −3
Original line number Diff line number Diff line 
/*

 * Copyright (C) Sistina Software, Inc.  1997-2003 All rights reserved.

 * Copyright (C) 2004-2007 Red Hat, Inc.  All rights reserved.

 * Copyright (C) 2004-2008 Red Hat, Inc.  All rights reserved.

 *

 * This copyrighted material is made available to anyone wishing to use,

 * modify, copy, or redistribute it subject to the terms and conditions
@@ -104,11 +104,9 @@ static int gfs2_writepage_common(struct page *page, 
	loff_t i_size = i_size_read(inode);

	pgoff_t end_index = i_size >> PAGE_CACHE_SHIFT;

	unsigned offset;

	int ret = -EIO;



	if (gfs2_assert_withdraw(sdp, gfs2_glock_is_held_excl(ip->i_gl)))

		goto out;

	ret = 0;

	if (current->journal_info)

		goto redirty;

	/* Is the page fully outside i_size? (truncate in progress) */