diff options
| author | Dave Chinner <david@fromorbit.com> | 2015-08-25 10:13:35 +1000 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2015-08-25 10:13:35 +1000 |
| commit | 70b33a7466baac62103e04c916b8915665b79d80 (patch) | |
| tree | 14549cadf0ddb49f3392eb9869c62e3d5ec4ce20 /fs/xfs/xfs_buf.c | |
| parent | aa493382cb8c5768ba452d87f175fc2aff63911d (diff) | |
| parent | f79af0b9090895520c69fbe1939184c4f8ed8426 (diff) | |
| download | op-kernel-dev-70b33a7466baac62103e04c916b8915665b79d80.zip op-kernel-dev-70b33a7466baac62103e04c916b8915665b79d80.tar.gz | |
Merge branch 'xfs-misc-fixes-for-4.3-3' into for-next
Diffstat (limited to 'fs/xfs/xfs_buf.c')
| -rw-r--r-- | fs/xfs/xfs_buf.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/fs/xfs/xfs_buf.c b/fs/xfs/xfs_buf.c index d7dbd81..c46166b 100644 --- a/fs/xfs/xfs_buf.c +++ b/fs/xfs/xfs_buf.c @@ -438,7 +438,6 @@ _xfs_buf_find( xfs_buf_flags_t flags, xfs_buf_t *new_bp) { - size_t numbytes; struct xfs_perag *pag; struct rb_node **rbp; struct rb_node *parent; @@ -450,10 +449,9 @@ _xfs_buf_find( for (i = 0; i < nmaps; i++) numblks += map[i].bm_len; - numbytes = BBTOB(numblks); /* Check for IOs smaller than the sector size / not sector aligned */ - ASSERT(!(numbytes < btp->bt_meta_sectorsize)); + ASSERT(!(BBTOB(numblks) < btp->bt_meta_sectorsize)); ASSERT(!(BBTOB(blkno) & (xfs_off_t)btp->bt_meta_sectormask)); /* |
