diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-06-02 02:05:42 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-06-02 02:05:42 -0400 |
| commit | f407a8258610169cd8e975dba7f0b2824562014c (patch) | |
| tree | 6c87b2d168a4665411a9e16b9f481599f2db25bc /fs/xfs/xfs_file.c | |
| parent | 960d447b94b22ceba286917056871d1dac8da697 (diff) | |
| parent | c46a024ea5eb0165114dbbc8c82c29b7bcf66e71 (diff) | |
Merge branch 'linus' into sched/core, to resolve conflict
Conflicts:
arch/sparc/include/asm/topology_64.h
Signed-off-by: Ingo Molnar <mingo@kernel.org>
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 8121e75352ee..3b7591224f4a 100644 --- a/fs/xfs/xfs_file.c +++ b/fs/xfs/xfs_file.c | |||
| @@ -124,7 +124,7 @@ xfs_iozero( | |||
| 124 | status = 0; | 124 | status = 0; |
| 125 | } while (count); | 125 | } while (count); |
| 126 | 126 | ||
| 127 | return (-status); | 127 | return status; |
| 128 | } | 128 | } |
| 129 | 129 | ||
| 130 | int | 130 | int |