diff options
| author | Chris Mason | 2012-07-26 01:17:39 +0200 |
|---|---|---|
| committer | Chris Mason | 2012-07-26 01:19:10 +0200 |
| commit | 113c1cb530e10bcada93d88ffaa6b521aae2d251 (patch) | |
| tree | e41776281314eb8fdc6b07e1533491e5f9ec21af /fs/btrfs/inode.c | |
| parent | Btrfs: add a barrier before a waitqueue_active check (diff) | |
| parent | Btrfs: introduce BTRFS_IOC_SEND for btrfs send/receive (diff) | |
| download | kernel-qcow2-linux-113c1cb530e10bcada93d88ffaa6b521aae2d251.tar.gz kernel-qcow2-linux-113c1cb530e10bcada93d88ffaa6b521aae2d251.tar.xz kernel-qcow2-linux-113c1cb530e10bcada93d88ffaa6b521aae2d251.zip | |
Merge branch 'send-v2' of git://github.com/ablock84/linux-btrfs into for-linus
This is the kernel portion of btrfs send/receive
Conflicts:
fs/btrfs/Makefile
fs/btrfs/backref.h
fs/btrfs/ctree.c
fs/btrfs/ioctl.c
fs/btrfs/ioctl.h
Signed-off-by: Chris Mason <chris.mason@fusionio.com>
Diffstat (limited to 'fs/btrfs/inode.c')
| -rw-r--r-- | fs/btrfs/inode.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 144f4642b2a9..dac1fc21d809 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -2734,6 +2734,8 @@ noinline int btrfs_update_inode(struct btrfs_trans_handle *trans, */ if (!btrfs_is_free_space_inode(inode) && root->root_key.objectid != BTRFS_DATA_RELOC_TREE_OBJECTID) { + btrfs_update_root_times(trans, root); + ret = btrfs_delayed_update_inode(trans, root, inode); if (!ret) btrfs_set_inode_last_trans(trans, inode); @@ -4728,6 +4730,8 @@ static struct inode *btrfs_new_inode(struct btrfs_trans_handle *trans, trace_btrfs_inode_new(inode); btrfs_set_inode_last_trans(trans, inode); + btrfs_update_root_times(trans, root); + return inode; fail: if (dir) |