From 8ccc693ed66e3b7f60537f46eeb18815d17d48f4 Mon Sep 17 00:00:00 2001
From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Sun, 27 Jul 2008 18:03:19 -0400
Subject: [PATCH] --- yaml --- r: 106638 b: refs/heads/master c:
 744d18dbfae07482ea461701b0aaec3a75ec9224 h: refs/heads/master v: v3

---
 [refs]                | 2 +-
 trunk/fs/nfs/unlink.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index e387e9d07af7..9a191ea7eb80 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 31c9446993f412ecb7875e30bba4bc7f216ae016
+refs/heads/master: 744d18dbfae07482ea461701b0aaec3a75ec9224
diff --git a/trunk/fs/nfs/unlink.c b/trunk/fs/nfs/unlink.c
index 3adf8b266461..f089e5839d7d 100644
--- a/trunk/fs/nfs/unlink.c
+++ b/trunk/fs/nfs/unlink.c
@@ -95,10 +95,11 @@ static void nfs_async_unlink_done(struct rpc_task *task, void *calldata)
 static void nfs_async_unlink_release(void *calldata)
 {
 	struct nfs_unlinkdata	*data = calldata;
+	struct super_block *sb = data->dir->i_sb;
 
 	nfs_dec_sillycount(data->dir);
-	nfs_sb_deactive(NFS_SERVER(data->dir));
 	nfs_free_unlinkdata(data);
+	nfs_sb_deactive(NFS_SB(sb));
 }
 
 static const struct rpc_call_ops nfs_unlink_ops = {