diff options
| author | Chris Mason <chris.mason@fusionio.com> | 2013-02-06 12:06:02 -0500 |
|---|---|---|
| committer | Chris Mason <chris.mason@fusionio.com> | 2013-02-06 12:11:10 -0500 |
| commit | 1a65e24b0bb7dde48cac4a2bf74d5558f9e32ba7 (patch) | |
| tree | bda896534a46bf159e725379236509e2def0e52a | |
| parent | eb6b88d92c6df083dd09a8c471011e3788dfd7c6 (diff) | |
| download | linux-3.10-1a65e24b0bb7dde48cac4a2bf74d5558f9e32ba7.tar.gz linux-3.10-1a65e24b0bb7dde48cac4a2bf74d5558f9e32ba7.tar.bz2 linux-3.10-1a65e24b0bb7dde48cac4a2bf74d5558f9e32ba7.zip | |
Btrfs: move d_instantiate outside the transaction during mksubvol
Dave Sterba triggered a lockdep complaint about lock ordering
between the sb_internal lock and the cleaner semaphore.
btrfs_lookup_dentry() checks for orphans if we're looking up
the inode for a subvolume, and subvolume creation is triggering
the lookup with a transaction running.
This commit moves the d_instantiate after the transaction closes.
Signed-off-by: Chris Mason <chris.mason@fusionio.com>
| -rw-r--r-- | fs/btrfs/ioctl.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c index afbf3ac2079..a31cd931d36 100644 --- a/fs/btrfs/ioctl.c +++ b/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 @@ fail: } if (err && !ret) ret = err; + + if (!ret) + d_instantiate(dentry, btrfs_lookup_dentry(dir, dentry)); + return ret; } |