diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-07 20:06:46 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-07 20:06:46 -0500 |
| commit | 8d19514fade54798106a60059c539501eda31b47 (patch) | |
| tree | 737e9fc90b37bec251cfb2bf36bf056200d6e596 /fs/btrfs/ioctl.c | |
| parent | 95436adaa0f97e42e89978690c3a79cf9ef0d486 (diff) | |
| parent | 1a65e24b0bb7dde48cac4a2bf74d5558f9e32ba7 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs
Pull btrfs fixes from Chris Mason:
"We've got corner cases for updating i_size that ceph was hitting,
error handling for quotas when we run out of space, a very subtle
snapshot deletion race, a crash while removing devices, and one
deadlock between subvolume creation and the sb_internal code (thanks
lockdep)."
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
Btrfs: move d_instantiate outside the transaction during mksubvol
Btrfs: fix EDQUOT handling in btrfs_delalloc_reserve_metadata
Btrfs: fix possible stale data exposure
Btrfs: fix missing i_size update
Btrfs: fix race between snapshot deletion and getting inode
Btrfs: fix missing release of the space/qgroup reservation in start_transaction()
Btrfs: fix wrong sync_writers decrement in btrfs_file_aio_write()
Btrfs: do not merge logged extents if we've removed them from the tree
btrfs: don't try to notify udev about missing devices
Diffstat (limited to 'fs/btrfs/ioctl.c')
| -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 5b22d45d3c6a..338f2597bf7f 100644 --- a/fs/btrfs/ioctl.c +++ b/fs/btrfs/ioctl.c | |||
| @@ -515,7 +515,6 @@ static noinline int create_subvol(struct btrfs_root *root, | |||
| 515 | 515 | ||
| 516 | BUG_ON(ret); | 516 | BUG_ON(ret); |
| 517 | 517 | ||
| 518 | d_instantiate(dentry, btrfs_lookup_dentry(dir, dentry)); | ||
| 519 | fail: | 518 | fail: |
| 520 | if (async_transid) { | 519 | if (async_transid) { |
| 521 | *async_transid = trans->transid; | 520 | *async_transid = trans->transid; |
| @@ -525,6 +524,10 @@ fail: | |||
| 525 | } | 524 | } |
| 526 | if (err && !ret) | 525 | if (err && !ret) |
| 527 | ret = err; | 526 | ret = err; |
| 527 | |||
| 528 | if (!ret) | ||
| 529 | d_instantiate(dentry, btrfs_lookup_dentry(dir, dentry)); | ||
| 530 | |||
| 528 | return ret; | 531 | return ret; |
| 529 | } | 532 | } |
| 530 | 533 | ||