diff options
author | NeilBrown <neilb@suse.de> | 2012-02-06 23:35:42 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-04-02 12:27:21 -0400 |
commit | 7b1e2d3c528c25cdd4691e3f8c1fdc3275e5de96 (patch) | |
tree | 149a5bce052fe4497e199e6ef518f8ea646b3628 | |
parent | 096e4eafb36436b6ce6e8dc372bc5f6e11804e68 (diff) |
lockd: fix arg parsing for grace_period and timeout.
commit de5b8e8e047534aac6bc9803f96e7257436aef9c upstream.
If you try to set grace_period or timeout via a module parameter
to lockd, and do this on a big-endian machine where
sizeof(int) != sizeof(unsigned long)
it won't work. This number given will be effectively shifted right
by the difference in those two sizes.
So cast kp->arg properly to get correct result.
Signed-off-by: NeilBrown <neilb@suse.de>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | fs/lockd/svc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/lockd/svc.c b/fs/lockd/svc.c index abfff9d7979..1743064cd0c 100644 --- a/fs/lockd/svc.c +++ b/fs/lockd/svc.c | |||
@@ -440,7 +440,7 @@ static int param_set_##name(const char *val, struct kernel_param *kp) \ | |||
440 | __typeof__(type) num = which_strtol(val, &endp, 0); \ | 440 | __typeof__(type) num = which_strtol(val, &endp, 0); \ |
441 | if (endp == val || *endp || num < (min) || num > (max)) \ | 441 | if (endp == val || *endp || num < (min) || num > (max)) \ |
442 | return -EINVAL; \ | 442 | return -EINVAL; \ |
443 | *((int *) kp->arg) = num; \ | 443 | *((type *) kp->arg) = num; \ |
444 | return 0; \ | 444 | return 0; \ |
445 | } | 445 | } |
446 | 446 | ||