diff options
| author | Namhyung Kim <namhyung@kernel.org> | 2024-07-02 11:51:32 -0700 |
|---|---|---|
| committer | Namhyung Kim <namhyung@kernel.org> | 2024-07-02 11:51:32 -0700 |
| commit | 74ad3cb08b0166776c41a460b70034edb02acb65 (patch) | |
| tree | 7b50357cf4260da46d64369eef294f4a9622312b /fs/bcachefs/fs-io-direct.c | |
| parent | a7cacaa0880e427642cb305010ea2a62c7b0e1ac (diff) | |
| parent | 83a7eefedc9b56fe7bfeff13b6c7356688ffa670 (diff) | |
Merge remote-tracking branch 'perf-tools' into perf-tools-next
Merge fixes and updates in v6.10 into perf-tools-next to resolve changes
in synthesizing the LOST_SAMPLES records and build fixes.
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Diffstat (limited to 'fs/bcachefs/fs-io-direct.c')
| -rw-r--r-- | fs/bcachefs/fs-io-direct.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/bcachefs/fs-io-direct.c b/fs/bcachefs/fs-io-direct.c index 09d21aef879a..049b61bc9a5b 100644 --- a/fs/bcachefs/fs-io-direct.c +++ b/fs/bcachefs/fs-io-direct.c @@ -609,8 +609,10 @@ ssize_t bch2_direct_write(struct kiocb *req, struct iov_iter *iter) if (unlikely(ret)) goto err_put_write_ref; - if (unlikely((req->ki_pos|iter->count) & (block_bytes(c) - 1))) + if (unlikely((req->ki_pos|iter->count) & (block_bytes(c) - 1))) { + ret = -EINVAL; goto err_put_write_ref; + } inode_dio_begin(&inode->v); bch2_pagecache_block_get(inode); |