NFS: Ensure we call nfs_sb_deactive() after releasing the directory inode
authorTrond Myklebust <Trond.Myklebust@netapp.com>
Sun, 27 Jul 2008 22:03:19 +0000 (18:03 -0400)
committerTrond Myklebust <Trond.Myklebust@netapp.com>
Sun, 27 Jul 2008 22:20:51 +0000 (18:20 -0400)
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>
fs/nfs/unlink.c

index 3adf8b266461fbf3562d7876ed57f50de2f974df..f089e5839d7deefe50bc351f98eff7d45fdfd453 100644 (file)
@@ -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 = {