diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-02-07 21:34:03 -0500 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-02-07 21:34:03 -0500 |
| commit | 2e18e047981ae04be9bd0d9760057f7c1a7b3785 (patch) | |
| tree | 999941abf466ce4d6915273e2e7a42bf0a107385 /fs/btrfs/file.c | |
| parent | b06ede84dd1473dec7c6af03a41c8d04d2fee437 (diff) | |
| parent | cfefe99795251d76d92e8457f4152f532a961ec5 (diff) | |
Merge branch 'sh/dmaengine'
Conflicts:
arch/sh/drivers/dma/dma-sh.c
Diffstat (limited to 'fs/btrfs/file.c')
| -rw-r--r-- | fs/btrfs/file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c index c02033596f0..9d080962996 100644 --- 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) | |||
| 1133 | } | 1133 | } |
| 1134 | mutex_lock(&dentry->d_inode->i_mutex); | 1134 | mutex_lock(&dentry->d_inode->i_mutex); |
| 1135 | out: | 1135 | out: |
| 1136 | return ret > 0 ? EIO : ret; | 1136 | return ret > 0 ? -EIO : ret; |
| 1137 | } | 1137 | } |
| 1138 | 1138 | ||
| 1139 | static const struct vm_operations_struct btrfs_file_vm_ops = { | 1139 | static const struct vm_operations_struct btrfs_file_vm_ops = { |