diff options
| author | Mark Brown <broonie@linaro.org> | 2014-04-29 13:01:28 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-04-29 13:01:28 -0400 |
| commit | 3e93457b45a1a8c69227ce596ee2005fa06f20dd (patch) | |
| tree | 248c27e432533b1af80a9b2240eaa8e48e3b87cc /fs/xfs/xfs_file.c | |
| parent | 290414499cf94284a97cc3c33214d13ccfcd896a (diff) | |
| parent | c42ba72ec3a7a1b6aa30122931f1f4b91b601c31 (diff) | |
Merge tag 'ib-mfd-regulator-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd into regulator-tps65090
Immutable branch between MFD and Regulator due for v3.16 merge-window.
Diffstat (limited to 'fs/xfs/xfs_file.c')
| -rw-r--r-- | fs/xfs/xfs_file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c index 79e96ce98733..82afdcb33183 100644 --- a/fs/xfs/xfs_file.c +++ b/fs/xfs/xfs_file.c | |||
| @@ -679,7 +679,7 @@ xfs_file_dio_aio_write( | |||
| 679 | goto out; | 679 | goto out; |
| 680 | 680 | ||
| 681 | if (mapping->nrpages) { | 681 | if (mapping->nrpages) { |
| 682 | ret = -filemap_write_and_wait_range(VFS_I(ip)->i_mapping, | 682 | ret = filemap_write_and_wait_range(VFS_I(ip)->i_mapping, |
| 683 | pos, -1); | 683 | pos, -1); |
| 684 | if (ret) | 684 | if (ret) |
| 685 | goto out; | 685 | goto out; |