diff options
author | Kent Overstreet <kent.overstreet@linux.dev> | 2022-10-22 13:25:25 -0400 |
---|---|---|
committer | Kent Overstreet <kent.overstreet@linux.dev> | 2022-10-22 14:41:54 -0400 |
commit | 188b6d0c8ef1c02462a744b176557c27220112c9 (patch) | |
tree | ab1f239b3bad0335e1d3fa62415bc8d845ba68be /libbcachefs/fs-io.c | |
parent | 494421ee6e85514f90bb316d77e1dd4f7dad3420 (diff) |
Update bcachefs sources to cd779e0cc5 bcachefs: Skip inode unpack/pack in bch2_extent_update()v0.23
Diffstat (limited to 'libbcachefs/fs-io.c')
-rw-r--r-- | libbcachefs/fs-io.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libbcachefs/fs-io.c b/libbcachefs/fs-io.c index 74292063..706180b9 100644 --- a/libbcachefs/fs-io.c +++ b/libbcachefs/fs-io.c @@ -1684,7 +1684,7 @@ static int __bch2_buffered_write(struct bch_inode_info *inode, unsigned pg_len = min_t(unsigned, len - copied, PAGE_SIZE - pg_offset); unsigned pg_copied = copy_page_from_iter_atomic(page, - pg_offset, pg_len,iter); + pg_offset, pg_len, iter); if (!pg_copied) break; @@ -2137,8 +2137,8 @@ static long bch2_dio_write_loop(struct dio_write *dio) struct iovec *iov = dio->inline_vecs; if (dio->iter.nr_segs > ARRAY_SIZE(dio->inline_vecs)) { - iov = kmalloc(dio->iter.nr_segs * sizeof(*iov), - GFP_KERNEL); + iov = kmalloc_array(dio->iter.nr_segs, sizeof(*iov), + GFP_KERNEL); if (unlikely(!iov)) { dio->sync = sync = true; goto do_io; @@ -2713,7 +2713,7 @@ static long bchfs_fpunch(struct bch_inode_info *inode, loff_t offset, loff_t len truncate_pagecache_range(&inode->v, offset, end - 1); - if (block_start < block_end ) { + if (block_start < block_end) { s64 i_sectors_delta = 0; ret = bch2_fpunch(c, inode_inum(inode), |