From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Sun, 27 Jul 2008 22:03:19 +0000 (-0400)
Subject: NFS: Ensure we call nfs_sb_deactive() after releasing the directory inode
X-Git-Tag: v2.6.27-rc1~50^2
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=744d18dbfae07482ea461701b0aaec3a75ec9224;p=linux-2.6-omap-h63xx.git

NFS: Ensure we call nfs_sb_deactive() after releasing the directory inode

In order to avoid the "Busy inodes after unmount" error message, we need to
ensure that nfs_async_unlink_release() releases the super block after the
call to nfs_free_unlinkdata().

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
---

diff --git a/fs/nfs/unlink.c b/fs/nfs/unlink.c
index 3adf8b26646..f089e5839d7 100644
--- a/fs/nfs/unlink.c
+++ b/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 = {