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

Commit ecff71e6 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Alex Elder
Browse files

xfs: simplify xfs_map_at_offset 



Move the buffer locking into the callers as they need to do it
wether they call xfs_map_at_offset or not.  Remove the b_bdev
assignment, which is already done by get_blocks.  Remove the
duplicate extent type asserts in xfs_convert_page just before
calling xfs_map_at_offset.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDave Chinner <dchinner@redhat.com>
Signed-off-by: default avatarAlex Elder <aelder@sgi.com>
parent aeea1b1f

fs/xfs/linux-2.6/xfs_aops.c

+4 −11
Original line number Diff line number Diff line
@@ -626,9 +626,7 @@ xfs_map_at_offset( 
	ASSERT(imap->br_startblock != HOLESTARTBLOCK);

	ASSERT(imap->br_startblock != DELAYSTARTBLOCK);



	lock_buffer(bh);

	xfs_map_buffer(inode, bh, imap, offset);

	bh->b_bdev = xfs_find_bdev_for_inode(inode);

	set_buffer_mapped(bh);

	clear_buffer_delay(bh);

	clear_buffer_unwritten(bh);
@@ -751,12 +749,8 @@ xfs_convert_page( 
				continue;

			}



			ASSERT(imap->br_startblock != HOLESTARTBLOCK);

			ASSERT(imap->br_startblock != DELAYSTARTBLOCK);



			if (type == IO_OVERWRITE)

			lock_buffer(bh);

			else

			if (type != IO_OVERWRITE)

				xfs_map_at_offset(inode, bh, imap, offset);

			xfs_add_to_ioend(inode, bh, offset, type,

					 ioendp, done);
@@ -1041,9 +1035,8 @@ xfs_vm_writepage( 
			imap_valid = xfs_imap_valid(inode, &imap, offset);

		}

		if (imap_valid) {

			if (type == IO_OVERWRITE)

			lock_buffer(bh);

			else

			if (type != IO_OVERWRITE)

				xfs_map_at_offset(inode, bh, &imap, offset);

			xfs_add_to_ioend(inode, bh, offset, type, &ioend,

					 new_ioend);