aboutsummaryrefslogtreecommitdiffstats
path: root/fs/btrfs/file.c
diff options
context:
space:
mode:
authorChris Mason <chris.mason@oracle.com>2010-05-26 10:59:53 -0400
committerChris Mason <chris.mason@oracle.com>2010-05-26 10:59:53 -0400
commit3f7c579c41a3d20af76fd6ff1f6b949edf105fd1 (patch)
tree374d50346763fb37299f5de93f48901596f21e59 /fs/btrfs/file.c
parent4845e44ffdb26be9b25610664228e8ecaf949a0d (diff)
Btrfs: move O_DIRECT space reservation to btrfs_direct_IO
This moves the delalloc space reservation done for O_DIRECT into btrfs_direct_IO. This way we don't leak reserved space if the generic O_DIRECT write code errors out before it calls into btrfs_direct_IO. Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs/btrfs/file.c')
-rw-r--r--fs/btrfs/file.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c
index 54556cae4497..79437c5eeb1e 100644
--- a/fs/btrfs/file.c
+++ b/fs/btrfs/file.c
@@ -888,14 +888,9 @@ static ssize_t btrfs_file_aio_write(struct kiocb *iocb,
888 BTRFS_I(inode)->sequence++; 888 BTRFS_I(inode)->sequence++;
889 889
890 if (unlikely(file->f_flags & O_DIRECT)) { 890 if (unlikely(file->f_flags & O_DIRECT)) {
891 ret = btrfs_delalloc_reserve_space(inode, count);
892 if (ret)
893 goto out;
894
895 num_written = generic_file_direct_write(iocb, iov, &nr_segs, 891 num_written = generic_file_direct_write(iocb, iov, &nr_segs,
896 pos, ppos, count, 892 pos, ppos, count,
897 ocount); 893 ocount);
898
899 /* 894 /*
900 * the generic O_DIRECT will update in-memory i_size after the 895 * the generic O_DIRECT will update in-memory i_size after the
901 * DIOs are done. But our endio handlers that update the on 896 * DIOs are done. But our endio handlers that update the on