From 3c2b654583139d71a5cef9e38477be5443a80372 Mon Sep 17 00:00:00 2001 From: Lai Jiangshan Date: Sun, 1 May 2011 06:21:54 -0700 Subject: [PATCH] --- yaml --- r: 252787 b: refs/heads/master c: 26f04dde681c6a48b2bacfc5fe01fef204419b0c h: refs/heads/master i: 252785: 0f7ae71058e59f47a3f31cc49e9401b6e04093c2 252783: dff1232855d5d9822c4f1533a6aecf954680e039 v: v3 --- [refs] | 2 +- trunk/fs/nfs/delegation.c | 14 +------------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/[refs] b/[refs] index ce365836491c..a055956e08bc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4b8ee2b82e8b0b6e17ee33feb74fcdb5c6d8dbdd +refs/heads/master: 26f04dde681c6a48b2bacfc5fe01fef204419b0c diff --git a/trunk/fs/nfs/delegation.c b/trunk/fs/nfs/delegation.c index bbbc6bf5cb2e..dd25c2aec375 100644 --- a/trunk/fs/nfs/delegation.c +++ b/trunk/fs/nfs/delegation.c @@ -21,25 +21,13 @@ #include "delegation.h" #include "internal.h" -static void nfs_do_free_delegation(struct nfs_delegation *delegation) -{ - kfree(delegation); -} - -static void nfs_free_delegation_callback(struct rcu_head *head) -{ - struct nfs_delegation *delegation = container_of(head, struct nfs_delegation, rcu); - - nfs_do_free_delegation(delegation); -} - static void nfs_free_delegation(struct nfs_delegation *delegation) { if (delegation->cred) { put_rpccred(delegation->cred); delegation->cred = NULL; } - call_rcu(&delegation->rcu, nfs_free_delegation_callback); + kfree_rcu(delegation, rcu); } /**