LOCKD: nlmsvc_traverse_blocks return is unused

Note that we never return non-zero.

Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

diff --git a/fs/lockd/svclock.c b/fs/lockd/svclock.c
index ce754ef..d2b66ba 100644 (file)
--- a/fs/lockd/svclock.c
+++ b/fs/lockd/svclock.c
@@ -309,14 +309,13 @@ restart:
  * Loop over all blocks and perform the action specified.
  * (NLM_ACT_CHECK handled by nlmsvc_inspect_file).
  */
-int
+void
 nlmsvc_traverse_blocks(struct nlm_host *host, struct nlm_file *file, int action)
 {
        if (action == NLM_ACT_MARK)
                nlmsvc_act_mark(host, file);
        else
                nlmsvc_act_unlock(host, file);
-       return 0;
 }
 
 /*

diff --git a/fs/lockd/svcsubs.c b/fs/lockd/svcsubs.c
index 601e5b3..2043011 100644 (file)
--- a/fs/lockd/svcsubs.c
+++ b/fs/lockd/svcsubs.c
@@ -224,8 +224,9 @@ nlm_inspect_file(struct nlm_host *host, struct nlm_file *file, int action)
                if (file->f_count || file->f_blocks || file->f_shares)
                        return 1;
        } else {
-               if (nlmsvc_traverse_blocks(host, file, action)
-                || nlmsvc_traverse_shares(host, file, action))
+               nlmsvc_traverse_blocks(host, file, action);
+
+               if (nlmsvc_traverse_shares(host, file, action))
                        return 1;
        }
        return nlm_traverse_locks(host, file, action);

diff --git a/include/linux/lockd/lockd.h b/include/linux/lockd/lockd.h
index a04137d..995f89d 100644 (file)
--- a/include/linux/lockd/lockd.h
+++ b/include/linux/lockd/lockd.h
@@ -183,7 +183,7 @@ u32           nlmsvc_testlock(struct nlm_file *, struct nlm_lock *,
                                        struct nlm_lock *);
 u32              nlmsvc_cancel_blocked(struct nlm_file *, struct nlm_lock *);
 unsigned long    nlmsvc_retry_blocked(void);
-int              nlmsvc_traverse_blocks(struct nlm_host *, struct nlm_file *,
+void             nlmsvc_traverse_blocks(struct nlm_host *, struct nlm_file *,
                                        int action);
 void     nlmsvc_grant_reply(struct svc_rqst *, struct nlm_cookie *, u32);