iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

LOCKD: Make nlmsvc_traverse_shares return void

Browse Source 
The nlmsvc_traverse_shares return value is always zero, hence useless.

Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
J. Bruce Fields 2006-03-20 23:24:25 -05:00 committed by Trond Myklebust
parent f3ee439f43
commit 5f12191bc0
3 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fs/lockd/svcshare.c
View File

@ -88,7 +88,7 @@ nlmsvc_unshare_file(struct nlm_host *host, struct nlm_file *file,
* Traverse all shares for a given file (and host). * Traverse all shares for a given file (and host).
* NLM_ACT_CHECK is handled by nlmsvc_inspect_file. * NLM_ACT_CHECK is handled by nlmsvc_inspect_file.
*/ */
int void
nlmsvc_traverse_shares(struct nlm_host *host, struct nlm_file *file, int action) nlmsvc_traverse_shares(struct nlm_host *host, struct nlm_file *file, int action)
{ {
struct nlm_share *share, **shpp; 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; shpp = &share->s_next;
} }
return 0;
} }

4
fs/lockd/svcsubs.c
View File

@ -225,9 +225,7 @@ nlm_inspect_file(struct nlm_host *host, struct nlm_file *file, int action)
return 1; return 1;
} else { } else {
nlmsvc_traverse_blocks(host, file, action); nlmsvc_traverse_blocks(host, file, action);
nlmsvc_traverse_shares(host, file, action);
if (nlmsvc_traverse_shares(host, file, action))
return 1;
} }
return nlm_traverse_locks(host, file, action); return nlm_traverse_locks(host, file, action);
} }

2
include/linux/lockd/share.h
View File

@ -25,6 +25,6 @@ u32 nlmsvc_share_file(struct nlm_host *, struct nlm_file *,
struct nlm_args *); struct nlm_args *);
u32 nlmsvc_unshare_file(struct nlm_host *, struct nlm_file *, u32 nlmsvc_unshare_file(struct nlm_host *, struct nlm_file *,
struct nlm_args *); 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 */ #endif /* LINUX_LOCKD_SHARE_H */