diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-05-14 17:21:26 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-05-14 19:33:46 -0400 |
| commit | d48c5f41000ad176df71d2d43932c6c50f938196 (patch) | |
| tree | fa513ac473e1a9cd778c35fc260db6e7e4fc3dd6 /fs/lockd | |
| parent | 2e42c3e2aec6e24e58c4c601e1a33f0e9e36e314 (diff) | |
| download | linux-3.10-d48c5f41000ad176df71d2d43932c6c50f938196.tar.gz linux-3.10-d48c5f41000ad176df71d2d43932c6c50f938196.tar.bz2 linux-3.10-d48c5f41000ad176df71d2d43932c6c50f938196.zip | |
NLM: Fix sparse warnings
- fs/lockd/xdr4.c:140:27: warning: incorrect type in argument 2 (different
explicit signedness)
- fs/lockd/xdr4.c:141:27: warning: incorrect type in argument 2 (different
explicit signedness)
- fs/lockd/xdr4.c:432:28: warning: incorrect type in argument 2 (different
explicit signedness)
- fs/lockd/xdr4.c:433:28: warning: incorrect type in argument 2 (different
explicit signedness)
- fs/lockd/xdr4.c:587:20: warning: symbol 'nlm_version4' was not declared.
Should it be static?
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/lockd')
| -rw-r--r-- | fs/lockd/xdr.c | 4 | ||||
| -rw-r--r-- | fs/lockd/xdr4.c | 6 |
2 files changed, 4 insertions, 6 deletions
diff --git a/fs/lockd/xdr.c b/fs/lockd/xdr.c index 9702956d206..5316e307a49 100644 --- a/fs/lockd/xdr.c +++ b/fs/lockd/xdr.c @@ -586,10 +586,6 @@ static struct rpc_version nlm_version3 = { .procs = nlm_procedures, }; -#ifdef CONFIG_LOCKD_V4 -extern struct rpc_version nlm_version4; -#endif - static struct rpc_version * nlm_versions[] = { [1] = &nlm_version1, [3] = &nlm_version3, diff --git a/fs/lockd/xdr4.c b/fs/lockd/xdr4.c index ce1efdbe1b3..846fc1d639d 100644 --- a/fs/lockd/xdr4.c +++ b/fs/lockd/xdr4.c @@ -123,7 +123,8 @@ static __be32 * nlm4_decode_lock(__be32 *p, struct nlm_lock *lock) { struct file_lock *fl = &lock->fl; - __s64 len, start, end; + __u64 len, start; + __s64 end; if (!(p = xdr_decode_string_inplace(p, &lock->caller, &lock->len, NLM_MAXSTRLEN)) @@ -417,7 +418,8 @@ nlm4clt_decode_testres(struct rpc_rqst *req, __be32 *p, struct nlm_res *resp) if (resp->status == nlm_lck_denied) { struct file_lock *fl = &resp->lock.fl; u32 excl; - s64 start, end, len; + __u64 start, len; + __s64 end; memset(&resp->lock, 0, sizeof(resp->lock)); locks_init_lock(fl); |