diff options
Diffstat (limited to 'fs/btrfs')
-rw-r--r-- | fs/btrfs/extent_map.c | 2 | ||||
-rw-r--r-- | fs/btrfs/file.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/fs/btrfs/extent_map.c b/fs/btrfs/extent_map.c index ccbdcb54ec5d..46bea0f4dc7b 100644 --- a/fs/btrfs/extent_map.c +++ b/fs/btrfs/extent_map.c | |||
@@ -256,7 +256,7 @@ out: | |||
256 | * Insert @em into @tree or perform a simple forward/backward merge with | 256 | * Insert @em into @tree or perform a simple forward/backward merge with |
257 | * existing mappings. The extent_map struct passed in will be inserted | 257 | * existing mappings. The extent_map struct passed in will be inserted |
258 | * into the tree directly, with an additional reference taken, or a | 258 | * into the tree directly, with an additional reference taken, or a |
259 | * reference dropped if the merge attempt was sucessfull. | 259 | * reference dropped if the merge attempt was successfull. |
260 | */ | 260 | */ |
261 | int add_extent_mapping(struct extent_map_tree *tree, | 261 | int add_extent_mapping(struct extent_map_tree *tree, |
262 | struct extent_map *em) | 262 | struct extent_map *em) |
diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c index 06550affbd27..77f759302e12 100644 --- a/fs/btrfs/file.c +++ b/fs/btrfs/file.c | |||
@@ -909,7 +909,7 @@ static ssize_t btrfs_file_write(struct file *file, const char __user *buf, | |||
909 | unsigned long last_index; | 909 | unsigned long last_index; |
910 | int will_write; | 910 | int will_write; |
911 | 911 | ||
912 | will_write = ((file->f_flags & O_SYNC) || IS_SYNC(inode) || | 912 | will_write = ((file->f_flags & O_DSYNC) || IS_SYNC(inode) || |
913 | (file->f_flags & O_DIRECT)); | 913 | (file->f_flags & O_DIRECT)); |
914 | 914 | ||
915 | nrptrs = min((count + PAGE_CACHE_SIZE - 1) / PAGE_CACHE_SIZE, | 915 | nrptrs = min((count + PAGE_CACHE_SIZE - 1) / PAGE_CACHE_SIZE, |
@@ -1076,7 +1076,7 @@ out_nolock: | |||
1076 | if (err) | 1076 | if (err) |
1077 | num_written = err; | 1077 | num_written = err; |
1078 | 1078 | ||
1079 | if ((file->f_flags & O_SYNC) || IS_SYNC(inode)) { | 1079 | if ((file->f_flags & O_DSYNC) || IS_SYNC(inode)) { |
1080 | trans = btrfs_start_transaction(root, 1); | 1080 | trans = btrfs_start_transaction(root, 1); |
1081 | ret = btrfs_log_dentry_safe(trans, root, | 1081 | ret = btrfs_log_dentry_safe(trans, root, |
1082 | file->f_dentry); | 1082 | file->f_dentry); |