diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-05-29 10:05:05 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-05-29 10:05:05 -0400 |
| commit | 6715930654e06c4d2e66e718ea159079f71838f4 (patch) | |
| tree | 6a0a19fb62f3e99cb5f6bf6c34ae541f7c30fb42 /fs/dlm/plock.c | |
| parent | ea3f01f8afd3bc5daff915cc4ea5cc5ea9e7d427 (diff) | |
| parent | e490517a039a99d692cb3a5561941b0a5f576172 (diff) | |
Merge commit 'linus/master' into sched-fixes-for-linus
Diffstat (limited to 'fs/dlm/plock.c')
| -rw-r--r-- | fs/dlm/plock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/dlm/plock.c b/fs/dlm/plock.c index d6d6e370f89c..78878c5781ca 100644 --- a/fs/dlm/plock.c +++ b/fs/dlm/plock.c | |||
| @@ -379,7 +379,7 @@ static ssize_t dev_write(struct file *file, const char __user *u, size_t count, | |||
| 379 | struct plock_xop *xop; | 379 | struct plock_xop *xop; |
| 380 | xop = (struct plock_xop *)op; | 380 | xop = (struct plock_xop *)op; |
| 381 | if (xop->callback) | 381 | if (xop->callback) |
| 382 | count = dlm_plock_callback(op); | 382 | dlm_plock_callback(op); |
| 383 | else | 383 | else |
| 384 | wake_up(&recv_wq); | 384 | wake_up(&recv_wq); |
| 385 | } else | 385 | } else |