diff options
| author | Chris Mason <chris.mason@oracle.com> | 2011-05-22 07:07:01 -0400 |
|---|---|---|
| committer | Chris Mason <chris.mason@oracle.com> | 2011-05-22 07:07:01 -0400 |
| commit | dcc6d073225b6b732a52477c91bd4edc9b4d5502 (patch) | |
| tree | 71da6844bb03c940c87c01a2a1f8c2e11cf85238 /fs/btrfs/tree-log.c | |
| parent | 0965537308ac3b267ea16e731bd73870a51c53b8 (diff) | |
| parent | 16cdcec736cd214350cdb591bf1091f8beedefa0 (diff) | |
| download | linux-dcc6d073225b6b732a52477c91bd4edc9b4d5502.tar.bz2 | |
Merge branch 'delayed_inode' into inode_numbers
Conflicts:
fs/btrfs/inode.c
fs/btrfs/ioctl.c
fs/btrfs/transaction.c
Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs/btrfs/tree-log.c')
| -rw-r--r-- | fs/btrfs/tree-log.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c index 177d943755f4..183913bac14e 100644 --- a/fs/btrfs/tree-log.c +++ b/fs/btrfs/tree-log.c @@ -2774,6 +2774,13 @@ static int btrfs_log_inode(struct btrfs_trans_handle *trans, max_key.type = (u8)-1; max_key.offset = (u64)-1; + ret = btrfs_commit_inode_delayed_items(trans, inode); + if (ret) { + btrfs_free_path(path); + btrfs_free_path(dst_path); + return ret; + } + mutex_lock(&BTRFS_I(inode)->log_mutex); /* |