On Tue, Dec 13, 2011 at 04:35:58PM -0500, bjschuma@xxxxxxxxxx wrote:
> From: Bryan Schumaker <bjschuma@xxxxxxxxxx>
>
> unhash_delegation() will grab the recall lock before calling
> list_del_init() in each of these places. This patch removes the
> redundant calls.
Looks right, thanks. (How did you happen across this?)
--b.
>
> Signed-off-by: Bryan Schumaker <bjschuma@xxxxxxxxxx>
> ---
> fs/nfsd/nfs4state.c | 3 ---
> 1 files changed, 0 insertions(+), 3 deletions(-)
>
> diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
> index 6ab6779..43d5c22 100644
> --- a/fs/nfsd/nfs4state.c
> +++ b/fs/nfsd/nfs4state.c
> @@ -1058,7 +1058,6 @@ expire_client(struct nfs4_client *clp)
> spin_unlock(&recall_lock);
> while (!list_empty(&reaplist)) {
> dp = list_entry(reaplist.next, struct nfs4_delegation, dl_recall_lru);
> - list_del_init(&dp->dl_recall_lru);
> unhash_delegation(dp);
> }
> while (!list_empty(&clp->cl_openowners)) {
> @@ -3125,7 +3124,6 @@ nfs4_laundromat(void)
> spin_unlock(&recall_lock);
> list_for_each_safe(pos, next, &reaplist) {
> dp = list_entry (pos, struct nfs4_delegation, dl_recall_lru);
> - list_del_init(&dp->dl_recall_lru);
> unhash_delegation(dp);
> }
> test_val = nfsd4_lease;
> @@ -4667,7 +4665,6 @@ __nfs4_state_shutdown(void)
> spin_unlock(&recall_lock);
> list_for_each_safe(pos, next, &reaplist) {
> dp = list_entry (pos, struct nfs4_delegation, dl_recall_lru);
> - list_del_init(&dp->dl_recall_lru);
> unhash_delegation(dp);
> }
>
> --
> 1.7.8
>
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
