Skip to content

Commit d1b0949

Browse files
committed
Merge tag 'pull-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull misc filesystem fixes from Al Viro: "Assorted fixes all over the place: literally nothing in common, could have been three separate pull requests. All are simple regression fixes, but not for anything from this cycle" * tag 'pull-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: ceph_wait_on_conflict_unlink(): grab reference before dropping ->d_lock io_uring: kiocb_done() should *not* trust ->ki_pos if ->{read,write}_iter() failed sparc32: fix a braino in fault handling in csum_and_copy_..._user()
2 parents 56567a2 + dc32464 commit d1b0949

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

arch/sparc/lib/checksum_32.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -453,5 +453,5 @@ ccslow: cmp %g1, 0
453453
* we only bother with faults on loads... */
454454

455455
cc_fault:
456-
ret
456+
retl
457457
clr %o0

fs/ceph/mds_client.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -861,8 +861,8 @@ int ceph_wait_on_conflict_unlink(struct dentry *dentry)
861861
if (!d_same_name(udentry, pdentry, &dname))
862862
goto next;
863863

864+
found = dget_dlock(udentry);
864865
spin_unlock(&udentry->d_lock);
865-
found = dget(udentry);
866866
break;
867867
next:
868868
spin_unlock(&udentry->d_lock);

io_uring/rw.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ static int kiocb_done(struct io_kiocb *req, ssize_t ret,
339339
struct io_rw *rw = io_kiocb_to_cmd(req, struct io_rw);
340340
unsigned final_ret = io_fixup_rw_res(req, ret);
341341

342-
if (req->flags & REQ_F_CUR_POS)
342+
if (ret >= 0 && req->flags & REQ_F_CUR_POS)
343343
req->file->f_pos = rw->kiocb.ki_pos;
344344
if (ret >= 0 && (rw->kiocb.ki_complete == io_complete_rw)) {
345345
if (!__io_complete_rw_common(req, ret)) {

0 commit comments

Comments
 (0)