Skip to content

Commit

Permalink
NLM: Fix sparse warnings
Browse files Browse the repository at this point in the history
 - 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>
  • Loading branch information
Trond Myklebust authored and Trond Myklebust committed May 14, 2007
1 parent 2e42c3e commit d48c5f4
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 6 deletions.
4 changes: 0 additions & 4 deletions fs/lockd/xdr.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
6 changes: 4 additions & 2 deletions fs/lockd/xdr4.c
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down Expand Up @@ -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);
Expand Down
1 change: 1 addition & 0 deletions include/linux/lockd/xdr4.h
Original file line number Diff line number Diff line change
Expand Up @@ -42,5 +42,6 @@ int nlmclt_encode_lockargs(struct rpc_rqst *, u32 *, struct nlm_args *);
int nlmclt_encode_cancargs(struct rpc_rqst *, u32 *, struct nlm_args *);
int nlmclt_encode_unlockargs(struct rpc_rqst *, u32 *, struct nlm_args *);
*/
extern struct rpc_version nlm_version4;

#endif /* LOCKD_XDR4_H */

0 comments on commit d48c5f4

Please sign in to comment.