blob: 5908bff2f9a2d2a241ccae56aba88b863c4c91e4 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
|
From 949366463796471c62032e2b57ef5e501efb0c4d Mon Sep 17 00:00:00 2001
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
Date: Wed, 30 Sep 2020 16:58:15 +0200
Subject: [PATCH 33/33] mm: only use bdev functions for CONFIG_BLOCK
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
---
mm/filemap.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/mm/filemap.c b/mm/filemap.c
index 89a4851ac925..1c826057289b 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -2186,9 +2186,13 @@ generic_file_aio_read2(struct kiocb *iocb, const struct iovec *iov,
goto out; /* skip atime */
size = i_size_read(inode);
+#ifdef CONFIG_BLOCK
bs_mask = (1 << blksize_bits(
bdev_logical_block_size(inode->i_sb->s_bdev)))
- 1;
+#else
+ bs_mask = 0;
+#endif
if ((pos | count) & bs_mask) {
if (pos == size)
--
2.28.0
|
