---

yaml --- r: 349609 b: refs/heads/master c: 1a65e24 h: refs/heads/master i: 349607: 52502a8 v: v3
git-mirror · Feb 6, 2013 · a0ac6cd · a0ac6cd
1 parent 9aadc24
commit a0ac6cd
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eb6b88d92c6df083dd09a8c471011e3788dfd7c6
+refs/heads/master: 1a65e24b0bb7dde48cac4a2bf74d5558f9e32ba7
diff --git a/trunk/fs/btrfs/ioctl.c b/trunk/fs/btrfs/ioctl.c
@@ -515,7 +515,6 @@ static noinline int create_subvol(struct btrfs_root *root,
 
 	BUG_ON(ret);
 
-	d_instantiate(dentry, btrfs_lookup_dentry(dir, dentry));
 fail:
 	if (async_transid) {
 		*async_transid = trans->transid;
@@ -525,6 +524,10 @@ static noinline int create_subvol(struct btrfs_root *root,
 	}
 	if (err && !ret)
 		ret = err;
+
+	if (!ret)
+		d_instantiate(dentry, btrfs_lookup_dentry(dir, dentry));
+
 	return ret;
 }