projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mm/gup: Mark lock taken only after a successful retake
[linux-2.6-microblaze.git]
/
mm
/
gup.c
diff --git
a/mm/gup.c
b/mm/gup.c
index
a212305
..
afce0bc
100644
(file)
--- a/
mm/gup.c
+++ b/
mm/gup.c
@@
-1329,7
+1329,6
@@
retry:
if (fatal_signal_pending(current))
break;
if (fatal_signal_pending(current))
break;
- *locked = 1;
ret = down_read_killable(&mm->mmap_sem);
if (ret) {
BUG_ON(ret > 0);
ret = down_read_killable(&mm->mmap_sem);
if (ret) {
BUG_ON(ret > 0);
@@
-1338,6
+1337,7
@@
retry:
break;
}
break;
}
+ *locked = 1;
ret = __get_user_pages(tsk, mm, start, 1, flags | FOLL_TRIED,
pages, NULL, locked);
if (!*locked) {
ret = __get_user_pages(tsk, mm, start, 1, flags | FOLL_TRIED,
pages, NULL, locked);
if (!*locked) {