diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-03-07 08:27:30 (GMT) |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-03-07 08:27:30 (GMT) |
| commit | ec87e1cf7d8399d81d8965c6d852f8057a8dd687 (patch) | |
| tree | 472a168fa4861090edf110c8a9712a5c15ea259f /fs/affs/file.c | |
| parent | 869ae76147ffdf21ad24f0e599303cd58a2bb39f (diff) | |
| parent | f6cede5b49e822ebc41a099fe41ab4989f64e2cb (diff) | |
| download | linux-ec87e1cf7d8399d81d8965c6d852f8057a8dd687.tar.xz | |
Merge tag 'v4.5-rc7' into x86/asm, to pick up SMAP fix
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'fs/affs/file.c')
| -rw-r--r-- | fs/affs/file.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/affs/file.c b/fs/affs/file.c index 0548c53..22fc7c8 100644 --- a/fs/affs/file.c +++ b/fs/affs/file.c @@ -511,8 +511,6 @@ affs_do_readpage_ofs(struct page *page, unsigned to) pr_debug("%s(%lu, %ld, 0, %d)\n", __func__, inode->i_ino, page->index, to); BUG_ON(to > PAGE_CACHE_SIZE); - kmap(page); - data = page_address(page); bsize = AFFS_SB(sb)->s_data_blksize; tmp = page->index << PAGE_CACHE_SHIFT; bidx = tmp / bsize; @@ -524,14 +522,15 @@ affs_do_readpage_ofs(struct page *page, unsigned to) return PTR_ERR(bh); tmp = min(bsize - boff, to - pos); BUG_ON(pos + tmp > to || tmp > bsize); + data = kmap_atomic(page); memcpy(data + pos, AFFS_DATA(bh) + boff, tmp); + kunmap_atomic(data); affs_brelse(bh); bidx++; pos += tmp; boff = 0; } flush_dcache_page(page); - kunmap(page); return 0; } |