diff options
| author |   Jason A. Donenfeld <Jason@zx2c4.com> | 2020-09-30 16:58:15 +0200 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2020-09-30 16:59:48 +0200 |
| commit | 949366463796471c62032e2b57ef5e501efb0c4d (patch) | |
| tree | 4ec41fe0091314c1b1011a5a674e3d172bac32a0 | |
| parent | x86: clear smap in cr4 when not used (diff) | |
| download | rhel7-kernel-misery-949366463796471c62032e2b57ef5e501efb0c4d.tar.xz rhel7-kernel-misery-949366463796471c62032e2b57ef5e501efb0c4d.zip | |
mm: only use bdev functions for CONFIG_BLOCK
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
| -rw-r--r-- | mm/filemap.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mm/filemap.c b/mm/filemap.c index 89a4851ac92..1c826057289 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) |