insert_inline_extent() checked for compressed_pages to be NULL then
it accessed it under compress_type != BTRFS_COMPRESS_NONE.
This patch adds a BUG() when compress_size != 0, compress_type !=
BTRFS_COMPRESS_NONE and compressed_pages == 0.
Signed-off-by: Fabian Frederick <f...@skynet.be>
---
fs/btrfs/inode.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index ada4d24..449653d 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -150,8 +150,12 @@ static int insert_inline_extent(struct btrfs_trans_handle
*trans,
size_t cur_size = size;
unsigned long offset;
- if (compressed_size && compressed_pages)
- cur_size = compressed_size;
+ if (compressed_size) {
+ if (compressed_pages)
+ cur_size = compressed_size;
+ else if (compress_type != BTRFS_COMPRESS_NONE)
+ BUG();
+ }
inode_add_bytes(inode, size);
--
1.9.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
