diff --git a/fs/buffer.c b/fs/buffer.c
index af88734d1d38b192e74d8c3721a6362a5042e122..ab98aefd8de35687eed376f0019f0abb236d916b 100644
--- a/fs/buffer.c
+++ b/fs/buffer.c
@@ -2037,6 +2037,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 35033bb431495df8df02d077e1be224684ff55f0..939def774e17500e16b30724c931fb8027484c8b 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -3155,6 +3155,12 @@ static int ext4_da_write_end(struct file *file,
 	if (unlikely(copied < len) && !PageUptodate(page))
 		copied = 0;
 
+	if (unlikely(!page_has_buffers(page))) {
+		unlock_page(page);
+		put_page(page);
+		return -EIO;
+	}
+
 	start = pos & (PAGE_SIZE - 1);
 	end = start + copied - 1;