Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 90dc7d2796edf94a9eaa838321a9734c8513e717

Authored by Harvey Harrison
Committed by Trond Myklebust
1 parent 1227a74e2e
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

nfs: fix sparse warnings 

fs/nfs/nfs4state.c:788:34: warning: Using plain integer as NULL pointer
fs/nfs/delegation.c:52:34: warning: Using plain integer as NULL pointer
fs/nfs/idmap.c:312:12: warning: Using plain integer as NULL pointer
fs/nfs/callback_xdr.c:257:6: warning: Using plain integer as NULL pointer
fs/nfs/callback_xdr.c:270:6: warning: Using plain integer as NULL pointer
fs/nfs/callback_xdr.c:281:6: warning: Using plain integer as NULL pointer

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

Showing 4 changed files with 6 additions and 6 deletions Side-by-side Diff

fs/nfs/callback_xdr.c
Diff comments   View file @ 90dc7d2
... ... @@ -254,7 +254,7 @@
254 254 if (!(bitmap[0] & FATTR4_WORD0_CHANGE))
255 255 return 0;
256 256 p = xdr_reserve_space(xdr, 8);
257   - if (unlikely(p == 0))
  257 + if (unlikely(!p))
258 258 return htonl(NFS4ERR_RESOURCE);
259 259 p = xdr_encode_hyper(p, change);
260 260 return 0;
... ... @@ -267,7 +267,7 @@
267 267 if (!(bitmap[0] & FATTR4_WORD0_SIZE))
268 268 return 0;
269 269 p = xdr_reserve_space(xdr, 8);
270   - if (unlikely(p == 0))
  270 + if (unlikely(!p))
271 271 return htonl(NFS4ERR_RESOURCE);
272 272 p = xdr_encode_hyper(p, size);
273 273 return 0;
... ... @@ -278,7 +278,7 @@
278 278 __be32 *p;
279 279  
280 280 p = xdr_reserve_space(xdr, 12);
281   - if (unlikely(p == 0))
  281 + if (unlikely(!p))
282 282 return htonl(NFS4ERR_RESOURCE);
283 283 p = xdr_encode_hyper(p, time->tv_sec);
284 284 *p = htonl(time->tv_nsec);
... ... @@ -49,7 +49,7 @@
49 49 struct file_lock *fl;
50 50 int status;
51 51  
52   - for (fl = inode->i_flock; fl != 0; fl = fl->fl_next) {
  52 + for (fl = inode->i_flock; fl != NULL; fl = fl->fl_next) {
53 53 if (!(fl->fl_flags & (FL_POSIX|FL_FLOCK)))
54 54 continue;
55 55 if (nfs_file_open_context(fl->fl_file) != ctx)
... ... @@ -309,7 +309,7 @@
309 309 mutex_lock(&idmap->idmap_im_lock);
310 310  
311 311 he = idmap_lookup_id(h, id);
312   - if (he != 0) {
  312 + if (he) {
313 313 memcpy(name, he->ih_name, he->ih_namelen);
314 314 ret = he->ih_namelen;
315 315 goto out;
... ... @@ -785,7 +785,7 @@
785 785 struct file_lock *fl;
786 786 int status = 0;
787 787  
788   - for (fl = inode->i_flock; fl != 0; fl = fl->fl_next) {
  788 + for (fl = inode->i_flock; fl != NULL; fl = fl->fl_next) {
789 789 if (!(fl->fl_flags & (FL_POSIX|FL_FLOCK)))
790 790 continue;
791 791 if (nfs_file_open_context(fl->fl_file)->state != state)