diff options
| author | Dave Chinner <david@fromorbit.com> | 2015-06-23 08:49:01 +1000 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2015-06-23 08:49:01 +1000 |
| commit | de50e16ffabf64d30ca9372f39dc855a7553e305 (patch) | |
| tree | 08b926c00c75fde21823ee8279ce1473546d1356 /fs/xfs/xfs_buf.c | |
| parent | 3d238b7e0efc2d9dde7513298ef32da289a6a0f4 (diff) | |
| parent | f66bf042693b620133d39af8d2f13615f03eadfc (diff) | |
Merge branch 'xfs-misc-fixes-for-4.2-3' into for-next
Diffstat (limited to 'fs/xfs/xfs_buf.c')
| -rw-r--r-- | fs/xfs/xfs_buf.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/xfs/xfs_buf.c b/fs/xfs/xfs_buf.c index 1790b00bea7a..a4b7d92e946c 100644 --- a/fs/xfs/xfs_buf.c +++ b/fs/xfs/xfs_buf.c @@ -1419,9 +1419,9 @@ xfs_buf_submit_wait( return error; } -xfs_caddr_t +void * xfs_buf_offset( - xfs_buf_t *bp, + struct xfs_buf *bp, size_t offset) { struct page *page; @@ -1431,7 +1431,7 @@ xfs_buf_offset( offset += bp->b_offset; page = bp->b_pages[offset >> PAGE_SHIFT]; - return (xfs_caddr_t)page_address(page) + (offset & (PAGE_SIZE-1)); + return page_address(page) + (offset & (PAGE_SIZE-1)); } /* |