git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
[sfrench/cifs-2.6.git]
/
fs
/
btrfs
/
file.c
diff --git
a/fs/btrfs/file.c
b/fs/btrfs/file.c
index c02033596f02237aaeaabb2795960c2b29bd0e7b..9d08096299675548651069e4aa613712b827ba67 100644
(file)
--- a/
fs/btrfs/file.c
+++ b/
fs/btrfs/file.c
@@
-1133,7
+1133,7
@@
int btrfs_sync_file(struct file *file, struct dentry *dentry, int datasync)
}
mutex_lock(&dentry->d_inode->i_mutex);
out:
- return ret > 0 ? EIO : ret;
+ return ret > 0 ?
-
EIO : ret;
}
static const struct vm_operations_struct btrfs_file_vm_ops = {