diff options
author | Chris Mason <chris.mason@oracle.com> | 2011-12-15 13:43:49 -0500 |
---|---|---|
committer | Chris Mason <chris.mason@oracle.com> | 2011-12-15 13:43:49 -0500 |
commit | 567a45e917343c952806bb9f5c19aab0139bd519 (patch) | |
tree | b1d6dac31a3a2836d24662139f21bb1ddc2522d3 /fs/btrfs/file.c | |
parent | e755d9ab387c4c2401dce5b6f435432a829f41cb (diff) | |
parent | e65cbb94e036058128a5dec6398be2fd64cf88ba (diff) |
Merge branch 'for-chris' of http://git.kernel.org/pub/scm/linux/kernel/git/josef/btrfs-work into integration
Conflicts:
fs/btrfs/inode.c
Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs/btrfs/file.c')
-rw-r--r-- | fs/btrfs/file.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c index f2e928289600..cc7492c823f3 100644 --- a/fs/btrfs/file.c +++ b/fs/btrfs/file.c @@ -1387,7 +1387,11 @@ static ssize_t btrfs_file_aio_write(struct kiocb *iocb, goto out; } - file_update_time(file); + err = btrfs_update_time(file); + if (err) { + mutex_unlock(&inode->i_mutex); + goto out; + } BTRFS_I(inode)->sequence++; start_pos = round_down(pos, root->sectorsize); |