diff options
| author | Takashi Iwai <tiwai@suse.de> | 2016-05-10 16:06:04 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2016-05-10 16:06:04 +0200 |
| commit | 2e00fde5c6ed8535244332ebb55e881baa54ae46 (patch) | |
| tree | f578e02ef1dc6e59630f09404bb2f58500876811 /fs/reiserfs/tail_conversion.c | |
| parent | ALSA: hda - Clarify CONFIG_SND_HDA_RECONFIG usages (diff) | |
| parent | ALSA: hda - Fix subwoofer pin on ASUS N751 and N551 (diff) | |
| download | linux-2e00fde5c6ed8535244332ebb55e881baa54ae46.tar.xz linux-2e00fde5c6ed8535244332ebb55e881baa54ae46.zip | |
Merge branch 'for-linus' into for-next
Diffstat (limited to 'fs/reiserfs/tail_conversion.c')
| -rw-r--r-- | fs/reiserfs/tail_conversion.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/reiserfs/tail_conversion.c b/fs/reiserfs/tail_conversion.c index f41e19b4bb42..2d5489b0a269 100644 --- a/fs/reiserfs/tail_conversion.c +++ b/fs/reiserfs/tail_conversion.c @@ -151,7 +151,7 @@ int direct2indirect(struct reiserfs_transaction_handle *th, struct inode *inode, */ if (up_to_date_bh) { unsigned pgoff = - (tail_offset + total_tail - 1) & (PAGE_CACHE_SIZE - 1); + (tail_offset + total_tail - 1) & (PAGE_SIZE - 1); char *kaddr = kmap_atomic(up_to_date_bh->b_page); memset(kaddr + pgoff, 0, blk_size - total_tail); kunmap_atomic(kaddr); @@ -271,7 +271,7 @@ int indirect2direct(struct reiserfs_transaction_handle *th, * the page was locked and this part of the page was up to date when * indirect2direct was called, so we know the bytes are still valid */ - tail = tail + (pos & (PAGE_CACHE_SIZE - 1)); + tail = tail + (pos & (PAGE_SIZE - 1)); PATH_LAST_POSITION(path)++; |