diff --git a/[refs] b/[refs] index 251cdc032460..1596933b12cb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f2b0dee2ec8d562ad9ced2b7481be72d356c6cfc +refs/heads/master: 93245d11fcaccdebccabe86a2b92db524f82d8b4 diff --git a/trunk/fs/lockd/svcshare.c b/trunk/fs/lockd/svcshare.c index 068886de4dda..b0ae07008700 100644 --- a/trunk/fs/lockd/svcshare.c +++ b/trunk/fs/lockd/svcshare.c @@ -71,7 +71,8 @@ nlmsvc_unshare_file(struct nlm_host *host, struct nlm_file *file, struct nlm_share *share, **shpp; struct xdr_netobj *oh = &argp->lock.oh; - for (shpp = &file->f_shares; (share = *shpp) != 0; shpp = &share->s_next) { + for (shpp = &file->f_shares; (share = *shpp) != NULL; + shpp = &share->s_next) { if (share->s_host == host && nlm_cmp_owner(share, oh)) { *shpp = share->s_next; kfree(share);