Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 3e7b19198003fc25b11838e709f17d4fa173b2d7

Authored by Ian Kent
Committed by Linus Torvalds
1 parent 871f94344c
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[PATCH] autofs4: atomic var underflow 

Fix accidental underflow of the atomic counter.

Signed-off-by: Ian Kent <raven@themaw.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Showing 2 changed files with 5 additions and 3 deletions Side-by-side Diff

fs/autofs4/autofs_i.h
Diff comments   View file @ 3e7b191
... ... @@ -85,7 +85,7 @@
85 85 pid_t tgid;
86 86 /* This is for status reporting upon return */
87 87 int status;
88   - atomic_t notified;
  88 + atomic_t notify;
89 89 atomic_t wait_ctr;
90 90 };
91 91  
... ... @@ -263,7 +263,7 @@
263 263 wq->tgid = current->tgid;
264 264 wq->status = -EINTR; /* Status return if interrupted */
265 265 atomic_set(&wq->wait_ctr, 2);
266   - atomic_set(&wq->notified, 1);
  266 + atomic_set(&wq->notify, 1);
267 267 mutex_unlock(&sbi->wq_mutex);
268 268 } else {
269 269 atomic_inc(&wq->wait_ctr);
270 270  
... ... @@ -273,8 +273,10 @@
273 273 (unsigned long) wq->wait_queue_token, wq->len, wq->name, notify);
274 274 }
275 275  
276   - if (notify != NFY_NONE && atomic_dec_and_test(&wq->notified)) {
  276 + if (notify != NFY_NONE && atomic_read(&wq->notify)) {
277 277 int type;
  278 +
  279 + atomic_dec(&wq->notify);
278 280  
279 281 if (sbi->version < 5) {
280 282 if (notify == NFY_MOUNT)