git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
ALSA: pcm: potential uninitialized return values
[pandora-kernel.git]
/
fs
/
lockd
/
clntlock.c
diff --git
a/fs/lockd/clntlock.c
b/fs/lockd/clntlock.c
index
8d4ea83
..
de88922
100644
(file)
--- a/
fs/lockd/clntlock.c
+++ b/
fs/lockd/clntlock.c
@@
-141,6
+141,9
@@
int nlmclnt_block(struct nlm_wait *block, struct nlm_rqst *req, long timeout)
timeout);
if (ret < 0)
return -ERESTARTSYS;
+ /* Reset the lock status after a server reboot so we resend */
+ if (block->b_status == nlm_lck_denied_grace_period)
+ block->b_status = nlm_lck_blocked;
req->a_res.status = block->b_status;
return 0;
}