Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / fs / lockd / svcshare.c

diff --git a/fs/lockd/svcshare.c b/fs/lockd/svcshare.c
index ef24965..27288c8 100644 (file)
--- a/fs/lockd/svcshare.c
+++ b/fs/lockd/svcshare.c
@@ -71,7 +71,7 @@ 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); shpp = &share->s_next) {
+       for (shpp = &file->f_shares; (share = *shpp) != 0; shpp = &share->s_next) {
                if (share->s_host == host && nlm_cmp_owner(share, oh)) {
                        *shpp = share->s_next;
                        kfree(share);
@@ -88,7 +88,7 @@ nlmsvc_unshare_file(struct nlm_host *host, struct nlm_file *file,
  * Traverse all shares for a given file (and host).
  * NLM_ACT_CHECK is handled by nlmsvc_inspect_file.
  */
-int
+void
 nlmsvc_traverse_shares(struct nlm_host *host, struct nlm_file *file, int action)
 {
        struct nlm_share        *share, **shpp;
@@ -106,6 +106,4 @@ nlmsvc_traverse_shares(struct nlm_host *host, struct nlm_file *file, int action)
                }
                shpp = &share->s_next;
        }
-
-       return 0;
 }