瀏覽代碼

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>
Trond Myklebust 17 年之前
父節點
當前提交
744d18dbfa
共有 1 個文件被更改,包括 2 次插入1 次删除
  1. 2 1
      fs/nfs/unlink.c

+ 2 - 1
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)
 static void nfs_async_unlink_release(void *calldata)
 {
 {
 	struct nfs_unlinkdata	*data = calldata;
 	struct nfs_unlinkdata	*data = calldata;
+	struct super_block *sb = data->dir->i_sb;
 
 
 	nfs_dec_sillycount(data->dir);
 	nfs_dec_sillycount(data->dir);
-	nfs_sb_deactive(NFS_SERVER(data->dir));
 	nfs_free_unlinkdata(data);
 	nfs_free_unlinkdata(data);
+	nfs_sb_deactive(NFS_SB(sb));
 }
 }
 
 
 static const struct rpc_call_ops nfs_unlink_ops = {
 static const struct rpc_call_ops nfs_unlink_ops = {