Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 65319
b: refs/heads/master
c: 87e2831
h: refs/heads/master
i:
  65317: da71785
  65315: e320520
  65311: a9e7efe
v: v3
  • Loading branch information
Yan Zheng authored and Linus Torvalds committed Oct 8, 2007
1 parent 473c7e0 commit 1e3372a
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 745ad48e8cac47beec0b2f72dc3c64424bce1fec
refs/heads/master: 87e2831c3fa39cbf6f7ab676bb5aef039b9659e2
2 changes: 1 addition & 1 deletion trunk/fs/aio.c
Original file line number Diff line number Diff line change
Expand Up @@ -1562,6 +1562,7 @@ int fastcall io_submit_one(struct kioctx *ctx, struct iocb __user *user_iocb,
fput(file);
return -EAGAIN;
}
req->ki_filp = file;
if (iocb->aio_flags & IOCB_FLAG_RESFD) {
/*
* If the IOCB_FLAG_RESFD flag of aio_flags is set, get an
Expand All @@ -1576,7 +1577,6 @@ int fastcall io_submit_one(struct kioctx *ctx, struct iocb __user *user_iocb,
}
}

req->ki_filp = file;
ret = put_user(req->ki_key, &user_iocb->aio_key);
if (unlikely(ret)) {
dprintk("EFAULT: aio_key\n");
Expand Down

0 comments on commit 1e3372a

Please sign in to comment.