Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

lib/fs: Disable ioctl on ppc (fixes #6898) #6901

Merged
merged 3 commits into from Aug 19, 2020
Merged

lib/fs: Disable ioctl on ppc (fixes #6898) #6901

merged 3 commits into from Aug 19, 2020

Conversation

AudriusButkevicius
Copy link
Member

@AudriusButkevicius AudriusButkevicius commented Aug 18, 2020 •
edited

Fixes #6898

@calmh calmh merged commit 758a1a6 into main Aug 19, 2020
@calmh calmh deleted the AudriusButkevicius-patch-1 branch August 19, 2020 05:56
calmh added a commit to calmh/syncthing that referenced this pull request Aug 19, 2020
@calmh
Merge branch 'main' into trimpath
e4d63b2 
* main: (368 commits)
  build: We now target Go 1.14
  lib/fs: Disable ioctl on ppc (fixes syncthing#6898) (syncthing#6901)
  gui, man, authors: Update docs, translations, and contributors
  lib/dialer: Try dialing without reuse in parallel (fixes syncthing#6892) (syncthing#6893)
  cmd/stcrashreceiver: Don't crash on nil err
  all: Remove need to restart syncthing (syncthing#6883)
  lib/db: Don't put truncated files (ref syncthing#6855, ref syncthing#6501) (syncthing#6888)
  lib/osutil: Check returned error instead of info (ref syncthing#6885) (syncthing#6887)
  gui, man, authors: Update docs, translations, and contributors
  lib/osutil: Preserve perms in AtomicWriter (fixes #tbd) (syncthing#6885)
  lib/fs: Fix WatchRename test for FreeBSD (fixes syncthing#6613)
  lib/fs: Unwrap mtimeFile, get fd the "correct" way (ref syncthing#6875) (syncthing#6877)
  lib/model: Don't close file early (fixes syncthing#6875) (syncthing#6876)
  lib/fs: Unwrap mtimeFile, get fd the "correct" way (ref syncthing#6875) (syncthing#6877)
  gui, man, authors: Update docs, translations, and contributors
  lib/fs: Fix WatchRename test for FreeBSD (fixes syncthing#6613)
  lib/model: Don't close file early (fixes syncthing#6875) (syncthing#6876)
  lib/db: Log context on panic (syncthing#6872)
  gui: Don't show pull order on SO folders (ref syncthing#6807) (syncthing#6871)
  lib/model: Check folder error before sync-waiting (fixes syncthing#6793) (syncthing#6847)
  ...
@calmh calmh added this to the v1.9.0 milestone Aug 19, 2020
tklauser added a commit to tklauser/syncthing that referenced this pull request Sep 23, 2020
@tklauser
lib/fs: use file clone ioctl wrappers and types from golang.org/x/sys…
8b374f8 
…/unix

Use the IoctlFileClone and IoctlFileCloneRange ioctl wrappers and the
FileCloneRange type provided by golang.org/x/sys/unix instead of
locally implementing them. This also allows to re-enable the code for
ppc/ppc64/ppc64le again (see commit 758a1a6 ("lib/fs: Disable ioctl
on ppc (fixes syncthing#6898) (syncthing#6901)")) since the golang.org/x/sys/unix
internally uses the correct FICLONE and FICLONERANGE values depending on
$GOARCH.
@tklauser tklauser mentioned this pull request Sep 23, 2020
Merged
tklauser added a commit to tklauser/syncthing that referenced this pull request Sep 23, 2020
@tklauser
lib/fs: use file clone ioctl wrappers and types from golang.org/x/sys…
2691c8f 
…/unix

Use the IoctlFileClone and IoctlFileCloneRange ioctl wrappers and the
FileCloneRange type provided by golang.org/x/sys/unix instead of
locally implementing them. This also allows to re-enable the code for
ppc/ppc64/ppc64le again (see commit 758a1a6 ("lib/fs: Disable ioctl
on ppc (fixes syncthing#6898) (syncthing#6901)")) since golang.org/x/sys/unix internally
uses the correct FICLONE and FICLONERANGE values depending on $GOARCH.
tklauser added a commit to tklauser/syncthing that referenced this pull request Sep 23, 2020
@tklauser
lib/fs: use file clone ioctl wrappers and types from golang.org/x/sys…
801db5e 
…/unix

Use the IoctlFileClone and IoctlFileCloneRange ioctl wrappers and the
FileCloneRange type provided by golang.org/x/sys/unix instead of
locally implementing them. This also allows to re-enable the code for
ppc/ppc64/ppc64le again (see commit 758a1a6 ("lib/fs: Disable ioctl
on ppc (fixes syncthing#6898) (syncthing#6901)")) since golang.org/x/sys/unix internally
uses the correct FICLONE and FICLONERANGE values depending on $GOARCH.
tklauser added a commit to tklauser/syncthing that referenced this pull request Sep 23, 2020
@tklauser
lib/fs: use file clone ioctl wrappers and types from golang.org/x/sys…
41c3654 
…/unix

Use the IoctlFileClone and IoctlFileCloneRange ioctl wrappers and the
FileCloneRange type provided by golang.org/x/sys/unix instead of
locally implementing them. This also allows to re-enable the code for
ppc/ppc64/ppc64le again (see commit 758a1a6 ("lib/fs: Disable ioctl
on ppc (fixes syncthing#6898) (syncthing#6901)")) since golang.org/x/sys/unix internally
uses the correct FICLONE and FICLONERANGE values depending on $GOARCH.
calmh pushed a commit that referenced this pull request Sep 24, 2020
@tklauser
lib/fs: Use file clone ioctl wrappers and types from golang.org/x/sys…
c390565 
…/unix (#7000)

Use the IoctlFileClone and IoctlFileCloneRange ioctl wrappers and the
FileCloneRange type provided by golang.org/x/sys/unix instead of
locally implementing them. This also allows to re-enable the code for
ppc/ppc64/ppc64le again (see commit 758a1a6 ("lib/fs: Disable ioctl
on ppc (fixes #6898) (#6901)")) since golang.org/x/sys/unix internally
uses the correct FICLONE and FICLONERANGE values depending on $GOARCH.
@st-review st-review added the frozen-due-to-age Issues closed and untouched for a long time, together with being locked for discussion label Aug 19, 2021
@syncthing syncthing locked and limited conversation to collaborators Aug 19, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@calmh calmh calmh approved these changes

Assignees
No one assigned
Labels
frozen-due-to-age Issues closed and untouched for a long time, together with being locked for discussion
Projects
None yet
Milestone
v1.9.0
Development

Successfully merging this pull request may close these issues.

tests in TestCopyRange fail on ppc64le with "inappropriate ioctl for device"
3 participants
@AudriusButkevicius @calmh @st-review