Filipe Manana 84471e2429 Btrfs: incremental send, don't rename a directory too soon ... There's one more case where we can't issue a rename operation for a directory as soon as we process it. We used to delay directory renames only if they have some ancestor directory with a higher inode number that got renamed too, but there's another case where we need to delay the rename too - when a directory A is renamed to the old name of a directory B but that directory B has its rename delayed because it has now (in the send root) an ancestor with a higher inode number that was renamed. If we don't delay the directory rename in this case, the receiving end of the send stream will attempt to rename A to the old name of B before B got renamed to its new name, which results in a "directory not empty" error. So fix this by delaying directory renames for this case too. Steps to reproduce: $ mkfs.btrfs -f /dev/sdb $ mount /dev/sdb /mnt $ mkdir /mnt/a $ mkdir /mnt/b $ mkdir /mnt/c $ touch /mnt/a/file $ btrfs subvolume snapshot -r /mnt /mnt/snap1 $ mv /mnt/c /mnt/x $ mv /mnt/a /mnt/x/y $ mv /mnt/b /mnt/a $ btrfs subvolume snapshot -r /mnt /mnt/snap2 $ btrfs send /mnt/snap1 -f /tmp/1.send $ btrfs send -p /mnt/snap1 /mnt/snap2 -f /tmp/2.send $ mkfs.btrfs -f /dev/sdc $ mount /dev/sdc /mnt2 $ btrfs receive /mnt2 -f /tmp/1.send $ btrfs receive /mnt2 -f /tmp/2.send ERROR: rename b -> a failed. Directory not empty A test case for xfstests follows soon. Reported-by: Ames Cornish <ames@cornishes.net> Signed-off-by: Filipe Manana <fdmanana@suse.com> Signed-off-by: Chris Mason <clm@fb.com>		2015-03-02 14:04:45 -08:00
..
tests	btrfs: switch extent_state state to unsigned	2015-01-21 18:02:04 -08:00
acl.c	btrfs: remove useless ACL check	2014-06-09 17:20:42 -07:00
async-thread.c	btrfs: remove unlikely from NULL checks	2014-10-02 16:06:19 +02:00
async-thread.h	Btrfs: implement repair function when direct read fails	2014-09-17 13:39:01 -07:00
backref.c	btrfs: cleanup, remove inode_ref_info helper	2015-01-14 19:23:47 +01:00
backref.h	btrfs: cleanup, remove inode_item_info helper	2015-01-14 19:23:47 +01:00
btrfs_inode.h	Btrfs: Add code to support file creation time	2015-02-02 18:39:16 -08:00
check-integrity.c	Btrfs: include vmalloc.h in check-integrity.c	2014-11-25 06:01:11 -08:00
check-integrity.h	block: submit_bio_wait() conversions	2013-11-24 16:33:41 -07:00
compression.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs	2014-12-12 11:15:23 -08:00
compression.h	btrfs: zero out left over bytes after processing compression streams	2014-11-30 09:33:51 -08:00
ctree.c	Btrfs: fix off-by-one logic error in btrfs_realloc_node	2015-03-02 14:04:45 -08:00
ctree.h	Btrfs: account for large extents with enospc	2015-02-14 08:22:48 -08:00
delayed-inode.c	Btrfs: Add code to support file creation time	2015-02-02 18:39:16 -08:00
delayed-inode.h	Btrfs: introduce the delayed inode ref deletion for the single link inode	2014-01-28 13:20:09 -08:00
delayed-ref.c	Btrfs: rework qgroup accounting	2014-06-09 17:20:48 -07:00
delayed-ref.h	Btrfs: rework qgroup accounting	2014-06-09 17:20:48 -07:00
dev-replace.c	Btrfs: btrfs_rm_dev_replace_blocked(): Use wait_event()	2015-01-21 18:06:48 -08:00
dev-replace.h	Btrfs: add new sources for device replace code	2012-12-12 17:15:41 -05:00
dir-item.c	Btrfs: make xattr replace operations atomic	2014-11-20 17:20:07 -08:00
disk-io.c	Btrfs: fix race between transaction commit and empty block group removal	2015-02-02 19:24:48 -08:00
disk-io.h	btrfs: sink blocksize parameter to btrfs_find_create_tree_block	2014-12-12 18:07:21 +01:00
export.c	btrfs: kill the key type accessor helpers	2014-09-17 13:37:12 -07:00
export.h
extent_io.c	Btrfs: account for large extents with enospc	2015-02-14 08:22:48 -08:00
extent_io.h	btrfs: switch extent_state state to unsigned	2015-01-21 18:02:04 -08:00
extent_map.c	Btrfs: do not move em to modified list when unpinning	2014-11-21 11:59:54 -08:00
extent_map.h	Btrfs: fix NULL pointer crash when running balance and scrub concurrently	2014-06-19 14:20:55 -07:00
extent-tree.c	Btrfs: abort the transaction if we fail to update the free space cache inode	2015-03-02 14:04:44 -08:00
file-item.c	Btrfs: fix kfree on list_head in btrfs_lookup_csums_range error cleanup	2014-11-04 06:59:04 -08:00
file.c	Btrfs: add missing inode update when punching hole	2015-03-02 14:04:44 -08:00
free-space-cache.c	btrfs: cleanup init for list in free-space-cache	2015-02-02 19:25:50 -08:00
free-space-cache.h	Btrfs: fix race between writing free space cache and trimming	2014-12-02 18:35:09 -08:00
hash.c	btrfs: LLVMLinux: Remove VLAIS	2014-10-14 10:51:22 +02:00
hash.h	Btrfs: fix btrfs boot when compiled as built-in	2014-01-28 13:20:31 -08:00
inode-item.c	Btrfs: fix fsync log replay for inodes with a mix of regular refs and extrefs	2015-01-21 18:02:05 -08:00
inode-map.c	Btrfs: fix race between writing free space cache and trimming	2014-12-02 18:35:09 -08:00
inode-map.h	Btrfs: Support reading/writing on disk free ino cache	2011-04-25 16:46:11 +08:00
inode.c	btrfs: fix lost return value due to variable shadowing	2015-03-02 14:04:45 -08:00
ioctl.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs	2014-12-12 11:15:23 -08:00
Kconfig	Btrfs: fix btrfs boot when compiled as built-in	2014-01-28 13:20:31 -08:00
locking.c	btrfs: fix lockups from btrfs_clear_path_blocking	2014-11-19 10:34:35 -08:00
locking.h	btrfs: fix lockups from btrfs_clear_path_blocking	2014-11-19 10:34:35 -08:00
lzo.c	btrfs: zero out left over bytes after processing compression streams	2014-11-30 09:33:51 -08:00
Makefile	Btrfs: add sanity tests for new qgroup accounting code	2014-06-09 17:20:49 -07:00
math.h	Btrfs: cleanup duplicated division functions	2012-12-11 13:31:30 -05:00
ordered-data.c	Btrfs: fix fsync race leading to ordered extent memory leaks	2015-03-02 14:04:44 -08:00
ordered-data.h	Btrfs: collect only the necessary ordered extents on ranged fsync	2014-11-21 11:59:56 -08:00
orphan.c	btrfs: kill the key type accessor helpers	2014-09-17 13:37:12 -07:00
print-tree.c	btrfs: remove parameter blocksize from read_tree_block	2014-10-02 17:14:50 +02:00
print-tree.h	btrfs: make static code static & remove dead code	2013-05-06 15:55:23 -04:00
props.c	Btrfs: add support for inode properties	2014-01-28 13:20:24 -08:00
props.h	Btrfs: add support for inode properties	2014-01-28 13:20:24 -08:00
qgroup.c	btrfs: qgroup: move WARN_ON() to the correct location.	2015-01-21 18:22:37 -08:00
qgroup.h	btrfs: qgroup: account shared subtrees during snapshot delete	2014-08-15 07:43:14 -07:00
raid56.c	Btrfs: Include map_type in raid_bio	2015-01-21 18:06:49 -08:00
raid56.h	Btrfs: Make raid_map array be inlined in btrfs_bio structure	2015-01-21 18:06:47 -08:00
rcu-string.h	Btrfs: use rcu to protect device->name	2012-06-14 21:29:16 -04:00
reada.c	Btrfs: add ref_count and free function for btrfs_bio	2015-01-21 18:06:48 -08:00
relocation.c	btrfs: sink blocksize parameter to tree_block_processed	2014-12-12 18:07:22 +01:00
root-tree.c	Btrfs: use bitfield instead of integer data type for the some variants in btrfs_root	2014-06-09 17:20:40 -07:00
scrub.c	Btrfs: scrub, fix sleep in atomic context	2015-02-14 08:19:14 -08:00
send.c	Btrfs: incremental send, don't rename a directory too soon	2015-03-02 14:04:45 -08:00
send.h	btrfs: make static code static & remove dead code	2013-05-06 15:55:23 -04:00
struct-funcs.c	Btrfs: rewrite BTRFS_SETGET_FUNCS	2012-07-23 16:28:06 -04:00
super.c	btrfs: remove a no-op unfreeze superbock callback	2015-01-21 18:02:04 -08:00
sysfs.c	Btrfs: add missing cleanup on sysfs init failure	2015-02-02 19:24:49 -08:00
sysfs.h	btrfs: code optimize: BTRFS_ATTR_RW could set the mode	2014-09-17 13:37:59 -07:00
transaction.c	btrfs: Fix out-of-space bug	2015-02-14 08:19:14 -08:00
transaction.h	btrfs: Fix out-of-space bug	2015-02-14 08:19:14 -08:00
tree-defrag.c	Btrfs: use bitfield instead of integer data type for the some variants in btrfs_root	2014-06-09 17:20:40 -07:00
tree-log.c	Btrfs: don't remove extents and xattrs when logging new names	2015-02-14 08:22:49 -08:00
tree-log.h	Btrfs: fix data corruption after fast fsync and writeback error	2014-09-19 06:57:51 -07:00
ulist.c	Btrfs: do not export ulist functions	2014-01-29 07:06:27 -08:00
ulist.h	Btrfs: Fix memory corruption by ulist_add_merge() on 32bit arch	2014-08-15 07:43:19 -07:00
uuid-tree.c	Btrfs: make btrfs_search_forward return with nodes unlocked	2014-09-17 13:38:02 -07:00
volumes.c	Btrfs: fix allocation size calculations in alloc_btrfs_bio	2015-02-20 06:55:15 -08:00
volumes.h	Btrfs: Include map_type in raid_bio	2015-01-21 18:06:49 -08:00
xattr.c	Btrfs: do not ignore errors from btrfs_lookup_xattr in do_setxattr	2015-03-02 14:04:45 -08:00
xattr.h	btrfs: use generic posix ACL infrastructure	2014-01-25 23:58:18 -05:00
zlib.c	btrfs: zero out left over bytes after processing compression streams	2014-11-30 09:33:51 -08:00