Commit 5f12191b authored by J. Bruce Fields's avatar J. Bruce Fields Committed by Trond Myklebust
Browse files

LOCKD: Make nlmsvc_traverse_shares return void 



The nlmsvc_traverse_shares return value is always zero, hence useless.

Signed-off-by: default avatarJ. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent f3ee439f

fs/lockd/svcshare.c

+1 −3
Original line number Diff line number Diff line
@@ -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;

}

fs/lockd/svcsubs.c

+1 −3
Original line number Diff line number Diff line
@@ -225,9 +225,7 @@ nlm_inspect_file(struct nlm_host *host, struct nlm_file *file, int action) 
			return 1;

	} else {

		nlmsvc_traverse_blocks(host, file, action);



		if (nlmsvc_traverse_shares(host, file, action))

			return 1;

		nlmsvc_traverse_shares(host, file, action);

	}

	return nlm_traverse_locks(host, file, action);

}

include/linux/lockd/share.h

+1 −1
Original line number Diff line number Diff line
@@ -25,6 +25,6 @@ u32 nlmsvc_share_file(struct nlm_host *, struct nlm_file *, 
					       struct nlm_args *);

u32	nlmsvc_unshare_file(struct nlm_host *, struct nlm_file *,

					       struct nlm_args *);

int	nlmsvc_traverse_shares(struct nlm_host *, struct nlm_file *, int);

void	nlmsvc_traverse_shares(struct nlm_host *, struct nlm_file *, int);



#endif /* LINUX_LOCKD_SHARE_H */