Merge branch 'master' into for-linus

1 files changed, 3 insertions, 8 deletions

diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c
index 14a69aec2c0b..ed0684cc50ee 100644
--- a/fs/xfs/xfs_log_recover.c
+++ b/fs/xfs/xfs_log_recover.c
@@ -132,15 +132,10 @@ xlog_align(
         int             nbblks,
         xfs_buf_t       *bp)
 {
-        xfs_daddr_t     offset;
-        xfs_caddr_t     ptr;
+        xfs_daddr_t     offset = blk_no & ((xfs_daddr_t)log->l_sectBBsize - 1);
 
-        offset = blk_no & ((xfs_daddr_t) log->l_sectBBsize - 1);
-        ptr = XFS_BUF_PTR(bp) + BBTOB(offset);
-
-        ASSERT(ptr + BBTOB(nbblks) <= XFS_BUF_PTR(bp) + XFS_BUF_SIZE(bp));
-
-        return ptr;
+        ASSERT(BBTOB(offset + nbblks) <= XFS_BUF_SIZE(bp));
+        return XFS_BUF_PTR(bp) + BBTOB(offset);
 }