summaryrefslogtreecommitdiffstats
path: root/fs/xfs/xfs_buf_item.c
diff options
context:
space:
mode:
authorDave Chinner <david@fromorbit.com>2015-01-22 09:51:30 +1100
committerDave Chinner <david@fromorbit.com>2015-01-22 09:51:30 +1100
commit438c3c8d2bb910966db6fc4140e62d67b3c5f2a8 (patch)
treec44fbb5488a82a24b3d71c4fe19924c2dc97df0e /fs/xfs/xfs_buf_item.c
parent465e2def7cb45864da1f82afb973a6acd1046ed8 (diff)
parent3443a3bca54588f43286b725d8648d33a38c86f1 (diff)
downloadlinux-stable-438c3c8d2bb910966db6fc4140e62d67b3c5f2a8.tar.gz
linux-stable-438c3c8d2bb910966db6fc4140e62d67b3c5f2a8.tar.bz2
linux-stable-438c3c8d2bb910966db6fc4140e62d67b3c5f2a8.zip
Merge branch 'xfs-buf-type-fixes' into for-next
Diffstat (limited to 'fs/xfs/xfs_buf_item.c')
-rw-r--r--fs/xfs/xfs_buf_item.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/fs/xfs/xfs_buf_item.c b/fs/xfs/xfs_buf_item.c
index 925ead22803a..507d96a57ac7 100644
--- a/fs/xfs/xfs_buf_item.c
+++ b/fs/xfs/xfs_buf_item.c
@@ -319,6 +319,10 @@ xfs_buf_item_format(
ASSERT(atomic_read(&bip->bli_refcount) > 0);
ASSERT((bip->bli_flags & XFS_BLI_LOGGED) ||
(bip->bli_flags & XFS_BLI_STALE));
+ ASSERT((bip->bli_flags & XFS_BLI_STALE) ||
+ (xfs_blft_from_flags(&bip->__bli_format) > XFS_BLFT_UNKNOWN_BUF
+ && xfs_blft_from_flags(&bip->__bli_format) < XFS_BLFT_MAX_BUF));
+
/*
* If it is an inode buffer, transfer the in-memory state to the