On Sat, Apr 07, 2018 at 02:37:24PM -0700, Linus Torvalds wrote:
> On Sat, Apr 7, 2018 at 1:44 PM, Al Viro <v...@zeniv.linux.org.uk> wrote:
> >
> > Conflicts in arch/sparc/kernel/sys_sparc32.c are not hard to
> > resolve,
> > but keep in mind that casts to u64 are needed there. I'd pushed a variant
> > of
> > resolution into #test-merge.
>
> You say "keep in mind that casts to u64 are needed there", but then
> you seem to be missing them yourself in your test merge (see
> [f]truncate64).
>
> I only noticed because I decided to check my merge against yours. I
> strive to always do the merge resolution, but if people give me a test
> merge, I then double-check against it after-the-fack.
>
> Hmm?
Merge fuckup; mine ;-/ FWIW, the corresponding part in my branch (in
3d0e354e4e51) is
-asmlinkage long sys32_truncate64(const char __user * path, unsigned long high,
unsigned long low)
+COMPAT_SYSCALL_DEFINE3(truncate64, const char __user *, path, u32, high, u32,
low)
{
- if ((int)high < 0)
- return -EINVAL;
- else
- return sys_truncate(path, (high << 32) | low);
+ return sys_truncate(path, ((u64)high << 32) | low);
}
linux-next resolution is the right one -
git diff v4.16..HEAD -- arch/sparc/kernel/sys_sparc32.c
gives
-asmlinkage long sys32_truncate64(const char __user * path, unsigned long high,
unsigned long low)
+COMPAT_SYSCALL_DEFINE3(truncate64, const char __user *, path, u32, high, u32,
low)
{
- if ((int)high < 0)
- return -EINVAL;
- else
- return sys_truncate(path, (high << 32) | low);
+ return ksys_truncate(path, ((u64)high << 32) | low);
}
etc. in there. Again, my apologies.
