diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-04-06 19:01:47 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-04-06 19:01:47 -0700 |
| commit | 053f78d359953be40043972c98e16b3f1cd9fc27 (patch) | |
| tree | 80185e1554da6362dd3ca411a3e724864c59dc05 /fs/reiserfs/tail_conversion.c | |
| parent | 1bb025f6db789ea0bb674eaed15ee843ef0b2e88 (diff) | |
| parent | 3d085c7413d32bb6895e5b9b5ee6a7d2180159c5 (diff) | |
| download | talos-op-linux-053f78d359953be40043972c98e16b3f1cd9fc27.tar.gz talos-op-linux-053f78d359953be40043972c98e16b3f1cd9fc27.zip | |
Merge tag 'lkdtm-4.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux into char-misc-linus
Kees briefly writes:
fixes some possible memory allocation leaks on error paths
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)++; |
