leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xfs: simplify xfs_map_at_offset

Browse Source 
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: Christoph Hellwig <hch@lst.de>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Alex Elder <aelder@sgi.com>
This commit is contained in:
Christoph Hellwig 2010-12-10 08:42:25 +00:00 committed by Alex Elder
parent aeea1b1f81
commit ecff71e677
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
fs/xfs/linux-2.6/xfs_aops.c
View File

@ -626,9 +626,7 @@ xfs_map_at_offset(
ASSERT(imap->br_startblock != HOLESTARTBLOCK); ASSERT(imap->br_startblock != HOLESTARTBLOCK);
ASSERT(imap->br_startblock != DELAYSTARTBLOCK); ASSERT(imap->br_startblock != DELAYSTARTBLOCK);
lock_buffer(bh);
xfs_map_buffer(inode, bh, imap, offset); xfs_map_buffer(inode, bh, imap, offset);
bh->b_bdev = xfs_find_bdev_for_inode(inode);
set_buffer_mapped(bh); set_buffer_mapped(bh);
clear_buffer_delay(bh); clear_buffer_delay(bh);
clear_buffer_unwritten(bh); clear_buffer_unwritten(bh);
@ -751,12 +749,8 @@ xfs_convert_page(
continue; continue;
} }
ASSERT(imap->br_startblock != HOLESTARTBLOCK); lock_buffer(bh);
ASSERT(imap->br_startblock != DELAYSTARTBLOCK); if (type != IO_OVERWRITE)
if (type == IO_OVERWRITE)
lock_buffer(bh);
else
xfs_map_at_offset(inode, bh, imap, offset); xfs_map_at_offset(inode, bh, imap, offset);
xfs_add_to_ioend(inode, bh, offset, type, xfs_add_to_ioend(inode, bh, offset, type,
ioendp, done); ioendp, done);
@ -1041,9 +1035,8 @@ xfs_vm_writepage(
imap_valid = xfs_imap_valid(inode, &imap, offset); imap_valid = xfs_imap_valid(inode, &imap, offset);
} }
if (imap_valid) { if (imap_valid) {
if (type == IO_OVERWRITE) lock_buffer(bh);
lock_buffer(bh); if (type != IO_OVERWRITE)
else
xfs_map_at_offset(inode, bh, &imap, offset); xfs_map_at_offset(inode, bh, &imap, offset);
xfs_add_to_ioend(inode, bh, offset, type, &ioend, xfs_add_to_ioend(inode, bh, offset, type, &ioend,
new_ioend); new_ioend);