diff --git a/fs/buffer.c b/fs/buffer.c
index a74312b1bb42fc07bc20b0375e3df6c30e4d1f1e..fb8cb9993fc17ff136260cf6caac840f458fc027 100644
--- a/fs/buffer.c
+++ b/fs/buffer.c
@@ -2070,6 +2070,9 @@ static int __block_commit_write(struct inode *inode, struct page *page,
 	unsigned blocksize;
 	struct buffer_head *bh, *head;
 
+	if (!page_has_buffers(page))
+		return 0;
+
 	bh = head = page_buffers(page);
 	blocksize = bh->b_size;
 
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index 8e4407120cbc6556e66959d0549a33b578424f5b..ad7918c8df7b831ac572c4204e31661e8efe3304 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -3078,6 +3078,11 @@ static int ext4_da_do_write_end(struct address_space *mapping,
 	bool disksize_changed = false;
 	loff_t new_i_size;
 
+	if (unlikely(!page_has_buffers(page))) {
+		unlock_page(page);
+		put_page(page);
+		return -EIO;
+	}
 	/*
 	 * block_write_end() will mark the inode as dirty with I_DIRTY_PAGES
 	 * flag, which all that's needed to trigger page writeback.