Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 195819
b: refs/heads/master
c: 207d041
h: refs/heads/master
i:
  195817: 63513a2
  195815: ceb35f3
v: v3
  • Loading branch information
Christoph Hellwig authored and Alex Elder committed May 19, 2010
1 parent 69861cc commit 438dddc
Show file tree
Hide file tree
Showing 4 changed files with 76 additions and 124 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: e513182d4d7ec8f1870ae368c549ef2838e2c105
refs/heads/master: 207d041602cead1c1a16288f6225aea9da1f5bc4
90 changes: 46 additions & 44 deletions trunk/fs/xfs/linux-2.6/xfs_aops.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -310,23 +310,24 @@ xfs_map_blocks(
struct inode *inode,
loff_t offset,
ssize_t count,
xfs_iomap_t *mapp,
struct xfs_bmbt_irec *imap,
int flags)
{
int nmaps = 1;
int new = 0;

return -xfs_iomap(XFS_I(inode), offset, count, flags, mapp, &nmaps);
return -xfs_iomap(XFS_I(inode), offset, count, flags, imap, &nmaps, &new);
}

STATIC int
xfs_iomap_valid(
struct inode *inode,
xfs_iomap_t *iomapp,
struct xfs_bmbt_irec *imap,
loff_t offset)
{
struct xfs_mount *mp = XFS_I(inode)->i_mount;
xfs_off_t iomap_offset = XFS_FSB_TO_B(mp, iomapp->iomap_offset);
xfs_off_t iomap_bsize = XFS_FSB_TO_B(mp, iomapp->iomap_bsize);
xfs_off_t iomap_offset = XFS_FSB_TO_B(mp, imap->br_startoff);
xfs_off_t iomap_bsize = XFS_FSB_TO_B(mp, imap->br_blockcount);

return offset >= iomap_offset &&
offset < iomap_offset + iomap_bsize;
Expand Down Expand Up @@ -562,16 +563,16 @@ STATIC void
xfs_map_buffer(
struct inode *inode,
struct buffer_head *bh,
xfs_iomap_t *mp,
struct xfs_bmbt_irec *imap,
xfs_off_t offset)
{
sector_t bn;
struct xfs_mount *m = XFS_I(inode)->i_mount;
xfs_off_t iomap_offset = XFS_FSB_TO_B(m, mp->iomap_offset);
xfs_daddr_t iomap_bn = xfs_fsb_to_db(XFS_I(inode), mp->iomap_bn);
xfs_off_t iomap_offset = XFS_FSB_TO_B(m, imap->br_startoff);
xfs_daddr_t iomap_bn = xfs_fsb_to_db(XFS_I(inode), imap->br_startblock);

ASSERT(mp->iomap_bn != HOLESTARTBLOCK);
ASSERT(mp->iomap_bn != DELAYSTARTBLOCK);
ASSERT(imap->br_startblock != HOLESTARTBLOCK);
ASSERT(imap->br_startblock != DELAYSTARTBLOCK);

bn = (iomap_bn >> (inode->i_blkbits - BBSHIFT)) +
((offset - iomap_offset) >> inode->i_blkbits);
Expand All @@ -586,14 +587,14 @@ STATIC void
xfs_map_at_offset(
struct inode *inode,
struct buffer_head *bh,
xfs_iomap_t *iomapp,
struct xfs_bmbt_irec *imap,
xfs_off_t offset)
{
ASSERT(iomapp->iomap_bn != HOLESTARTBLOCK);
ASSERT(iomapp->iomap_bn != DELAYSTARTBLOCK);
ASSERT(imap->br_startblock != HOLESTARTBLOCK);
ASSERT(imap->br_startblock != DELAYSTARTBLOCK);

lock_buffer(bh);
xfs_map_buffer(inode, bh, iomapp, offset);
xfs_map_buffer(inode, bh, imap, offset);
bh->b_bdev = xfs_find_bdev_for_inode(inode);
set_buffer_mapped(bh);
clear_buffer_delay(bh);
Expand Down Expand Up @@ -750,7 +751,7 @@ xfs_convert_page(
struct inode *inode,
struct page *page,
loff_t tindex,
xfs_iomap_t *mp,
struct xfs_bmbt_irec *imap,
xfs_ioend_t **ioendp,
struct writeback_control *wbc,
int startio,
Expand Down Expand Up @@ -815,15 +816,15 @@ xfs_convert_page(
else
type = IOMAP_DELAY;

if (!xfs_iomap_valid(inode, mp, offset)) {
if (!xfs_iomap_valid(inode, imap, offset)) {
done = 1;
continue;
}

ASSERT(mp->iomap_bn != HOLESTARTBLOCK);
ASSERT(mp->iomap_bn != DELAYSTARTBLOCK);
ASSERT(imap->br_startblock != HOLESTARTBLOCK);
ASSERT(imap->br_startblock != DELAYSTARTBLOCK);

xfs_map_at_offset(inode, bh, mp, offset);
xfs_map_at_offset(inode, bh, imap, offset);
if (startio) {
xfs_add_to_ioend(inode, bh, offset,
type, ioendp, done);
Expand Down Expand Up @@ -875,7 +876,7 @@ STATIC void
xfs_cluster_write(
struct inode *inode,
pgoff_t tindex,
xfs_iomap_t *iomapp,
struct xfs_bmbt_irec *imap,
xfs_ioend_t **ioendp,
struct writeback_control *wbc,
int startio,
Expand All @@ -894,7 +895,7 @@ xfs_cluster_write(

for (i = 0; i < pagevec_count(&pvec); i++) {
done = xfs_convert_page(inode, pvec.pages[i], tindex++,
iomapp, ioendp, wbc, startio, all_bh);
imap, ioendp, wbc, startio, all_bh);
if (done)
break;
}
Expand Down Expand Up @@ -1051,7 +1052,7 @@ xfs_page_state_convert(
int unmapped) /* also implies page uptodate */
{
struct buffer_head *bh, *head;
xfs_iomap_t iomap;
struct xfs_bmbt_irec imap;
xfs_ioend_t *ioend = NULL, *iohead = NULL;
loff_t offset;
unsigned long p_offset = 0;
Expand Down Expand Up @@ -1125,7 +1126,7 @@ xfs_page_state_convert(
}

if (iomap_valid)
iomap_valid = xfs_iomap_valid(inode, &iomap, offset);
iomap_valid = xfs_iomap_valid(inode, &imap, offset);

/*
* First case, map an unwritten extent and prepare for
Expand Down Expand Up @@ -1177,13 +1178,13 @@ xfs_page_state_convert(
}

err = xfs_map_blocks(inode, offset, size,
&iomap, flags);
&imap, flags);
if (err)
goto error;
iomap_valid = xfs_iomap_valid(inode, &iomap, offset);
iomap_valid = xfs_iomap_valid(inode, &imap, offset);
}
if (iomap_valid) {
xfs_map_at_offset(inode, bh, &iomap, offset);
xfs_map_at_offset(inode, bh, &imap, offset);
if (startio) {
xfs_add_to_ioend(inode, bh, offset,
type, &ioend,
Expand All @@ -1207,10 +1208,10 @@ xfs_page_state_convert(
size = xfs_probe_cluster(inode, page, bh,
head, 1);
err = xfs_map_blocks(inode, offset, size,
&iomap, flags);
&imap, flags);
if (err)
goto error;
iomap_valid = xfs_iomap_valid(inode, &iomap, offset);
iomap_valid = xfs_iomap_valid(inode, &imap, offset);
}

/*
Expand Down Expand Up @@ -1251,13 +1252,13 @@ xfs_page_state_convert(

if (ioend && iomap_valid) {
struct xfs_mount *m = XFS_I(inode)->i_mount;
xfs_off_t iomap_offset = XFS_FSB_TO_B(m, iomap.iomap_offset);
xfs_off_t iomap_bsize = XFS_FSB_TO_B(m, iomap.iomap_bsize);
xfs_off_t iomap_offset = XFS_FSB_TO_B(m, imap.br_startoff);
xfs_off_t iomap_bsize = XFS_FSB_TO_B(m, imap.br_blockcount);

offset = (iomap_offset + iomap_bsize - 1) >>
PAGE_CACHE_SHIFT;
tlast = min_t(pgoff_t, offset, last_index);
xfs_cluster_write(inode, page->index + 1, &iomap, &ioend,
xfs_cluster_write(inode, page->index + 1, &imap, &ioend,
wbc, startio, all_bh, tlast);
}

Expand Down Expand Up @@ -1460,10 +1461,11 @@ __xfs_get_blocks(
int direct,
bmapi_flags_t flags)
{
xfs_iomap_t iomap;
struct xfs_bmbt_irec imap;
xfs_off_t offset;
ssize_t size;
int niomap = 1;
int nimap = 1;
int new = 0;
int error;

offset = (xfs_off_t)iblock << inode->i_blkbits;
Expand All @@ -1474,21 +1476,21 @@ __xfs_get_blocks(
return 0;

error = xfs_iomap(XFS_I(inode), offset, size,
create ? flags : BMAPI_READ, &iomap, &niomap);
create ? flags : BMAPI_READ, &imap, &nimap, &new);
if (error)
return -error;
if (niomap == 0)
if (nimap == 0)
return 0;

if (iomap.iomap_bn != HOLESTARTBLOCK &&
iomap.iomap_bn != DELAYSTARTBLOCK) {
if (imap.br_startblock != HOLESTARTBLOCK &&
imap.br_startblock != DELAYSTARTBLOCK) {
/*
* For unwritten extents do not report a disk address on
* the read case (treat as if we're reading into a hole).
*/
if (create || !(iomap.iomap_flags & IOMAP_UNWRITTEN))
xfs_map_buffer(inode, bh_result, &iomap, offset);
if (create && (iomap.iomap_flags & IOMAP_UNWRITTEN)) {
if (create || !ISUNWRITTEN(&imap))
xfs_map_buffer(inode, bh_result, &imap, offset);
if (create && ISUNWRITTEN(&imap)) {
if (direct)
bh_result->b_private = inode;
set_buffer_unwritten(bh_result);
Expand All @@ -1513,10 +1515,10 @@ __xfs_get_blocks(
if (create &&
((!buffer_mapped(bh_result) && !buffer_uptodate(bh_result)) ||
(offset >= i_size_read(inode)) ||
(iomap.iomap_flags & (IOMAP_NEW|IOMAP_UNWRITTEN))))
(new || ISUNWRITTEN(&imap))))
set_buffer_new(bh_result);

if (iomap.iomap_bn == DELAYSTARTBLOCK) {
if (imap.br_startblock == DELAYSTARTBLOCK) {
BUG_ON(direct);
if (create) {
set_buffer_uptodate(bh_result);
Expand All @@ -1527,9 +1529,9 @@ __xfs_get_blocks(

if (direct || size > (1 << inode->i_blkbits)) {
struct xfs_mount *mp = XFS_I(inode)->i_mount;
xfs_off_t iomap_offset = XFS_FSB_TO_B(mp, iomap.iomap_offset);
xfs_off_t iomap_offset = XFS_FSB_TO_B(mp, imap.br_startoff);
xfs_off_t iomap_delta = offset - iomap_offset;
xfs_off_t iomap_bsize = XFS_FSB_TO_B(mp, iomap.iomap_bsize);
xfs_off_t iomap_bsize = XFS_FSB_TO_B(mp, imap.br_blockcount);

ASSERT(iomap_bsize - iomap_delta > 0);
offset = min_t(xfs_off_t,
Expand Down
82 changes: 28 additions & 54 deletions trunk/fs/xfs/xfs_iomap.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,46 +55,25 @@
#define XFS_STRAT_WRITE_IMAPS 2
#define XFS_WRITE_IMAPS XFS_BMAP_MAX_NMAP

STATIC void
xfs_imap_to_bmap(
xfs_inode_t *ip,
xfs_off_t offset,
xfs_bmbt_irec_t *imap,
xfs_iomap_t *iomapp,
int imaps, /* Number of imap entries */
int flags)
{
iomapp->iomap_offset = imap->br_startoff;
iomapp->iomap_bsize = imap->br_blockcount;
iomapp->iomap_flags = flags;
iomapp->iomap_bn = imap->br_startblock;

if (imap->br_startblock != HOLESTARTBLOCK &&
imap->br_startblock != DELAYSTARTBLOCK &&
ISUNWRITTEN(imap))
iomapp->iomap_flags |= IOMAP_UNWRITTEN;
}

int
xfs_iomap(
xfs_inode_t *ip,
xfs_off_t offset,
ssize_t count,
int flags,
xfs_iomap_t *iomapp,
int *niomaps)
struct xfs_inode *ip,
xfs_off_t offset,
ssize_t count,
int flags,
struct xfs_bmbt_irec *imap,
int *nimaps,
int *new)
{
xfs_mount_t *mp = ip->i_mount;
xfs_fileoff_t offset_fsb, end_fsb;
int error = 0;
int lockmode = 0;
xfs_bmbt_irec_t imap;
int nimaps = 1;
int bmapi_flags = 0;
int iomap_flags = 0;
struct xfs_mount *mp = ip->i_mount;
xfs_fileoff_t offset_fsb, end_fsb;
int error = 0;
int lockmode = 0;
int bmapi_flags = 0;

ASSERT((ip->i_d.di_mode & S_IFMT) == S_IFREG);
ASSERT(niomaps && *niomaps == 1);

*new = 0;

if (XFS_FORCED_SHUTDOWN(mp))
return XFS_ERROR(EIO);
Expand Down Expand Up @@ -136,62 +115,57 @@ xfs_iomap(

error = xfs_bmapi(NULL, ip, offset_fsb,
(xfs_filblks_t)(end_fsb - offset_fsb),
bmapi_flags, NULL, 0, &imap,
&nimaps, NULL, NULL);
bmapi_flags, NULL, 0, imap,
nimaps, NULL, NULL);

if (error)
goto out;

switch (flags & (BMAPI_WRITE|BMAPI_ALLOCATE)) {
case BMAPI_WRITE:
/* If we found an extent, return it */
if (nimaps &&
(imap.br_startblock != HOLESTARTBLOCK) &&
(imap.br_startblock != DELAYSTARTBLOCK)) {
trace_xfs_iomap_found(ip, offset, count, flags, &imap);
if (*nimaps &&
(imap->br_startblock != HOLESTARTBLOCK) &&
(imap->br_startblock != DELAYSTARTBLOCK)) {
trace_xfs_iomap_found(ip, offset, count, flags, imap);
break;
}

if (flags & (BMAPI_DIRECT|BMAPI_MMAP)) {
error = xfs_iomap_write_direct(ip, offset, count, flags,
&imap, &nimaps, nimaps);
imap, nimaps, *nimaps);
} else {
error = xfs_iomap_write_delay(ip, offset, count, flags,
&imap, &nimaps);
imap, nimaps);
}
if (!error) {
trace_xfs_iomap_alloc(ip, offset, count, flags, &imap);
trace_xfs_iomap_alloc(ip, offset, count, flags, imap);
}
iomap_flags = IOMAP_NEW;
*new = 1;
break;
case BMAPI_ALLOCATE:
/* If we found an extent, return it */
xfs_iunlock(ip, lockmode);
lockmode = 0;

if (nimaps && !isnullstartblock(imap.br_startblock)) {
trace_xfs_iomap_found(ip, offset, count, flags, &imap);
if (*nimaps && !isnullstartblock(imap->br_startblock)) {
trace_xfs_iomap_found(ip, offset, count, flags, imap);
break;
}

error = xfs_iomap_write_allocate(ip, offset, count,
&imap, &nimaps);
imap, nimaps);
break;
}

ASSERT(nimaps <= 1);

if (nimaps)
xfs_imap_to_bmap(ip, offset, &imap, iomapp, nimaps, iomap_flags);
*niomaps = nimaps;
ASSERT(*nimaps <= 1);

out:
if (lockmode)
xfs_iunlock(ip, lockmode);
return XFS_ERROR(error);
}


STATIC int
xfs_iomap_eof_align_last_fsb(
xfs_mount_t *mp,
Expand Down
Loading

0 comments on commit 438dddc

Please sign in to comment.