diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-04-18 22:24:16 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-04-18 22:24:16 +0300 |
| commit | 7553c7e68fd144643e74a279ef51b74a15214071 (patch) | |
| tree | 5ad08f6de205a14eeba1793aa641e6b25c22b2c1 /fs/reiserfs/stree.c | |
| parent | 423de92f56bdfc3e68503af31e6ec041d59a6a25 (diff) | |
| parent | c3b46c73264b03000d1e18b22f5caf63332547c9 (diff) | |
| download | linux-7553c7e68fd144643e74a279ef51b74a15214071.tar.xz | |
Merge 4.6-rc4 into char-misc-next
We want the fixes in there to build off of for other dependant patches.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs/reiserfs/stree.c')
| -rw-r--r-- | fs/reiserfs/stree.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/reiserfs/stree.c b/fs/reiserfs/stree.c index 24cbe013240f..5feacd689241 100644 --- a/fs/reiserfs/stree.c +++ b/fs/reiserfs/stree.c @@ -1342,7 +1342,7 @@ int reiserfs_delete_item(struct reiserfs_transaction_handle *th, */ data = kmap_atomic(un_bh->b_page); - off = ((le_ih_k_offset(&s_ih) - 1) & (PAGE_CACHE_SIZE - 1)); + off = ((le_ih_k_offset(&s_ih) - 1) & (PAGE_SIZE - 1)); memcpy(data + off, ih_item_body(PATH_PLAST_BUFFER(path), &s_ih), ret_value); @@ -1511,7 +1511,7 @@ static void unmap_buffers(struct page *page, loff_t pos) if (page) { if (page_has_buffers(page)) { - tail_index = pos & (PAGE_CACHE_SIZE - 1); + tail_index = pos & (PAGE_SIZE - 1); cur_index = 0; head = page_buffers(page); bh = head; |