Skip to content

Commit 60eaf8f

Browse files
tv42tv42
committed
Remove macOS support
OSXFUSE is no longer open source, see e.g. https://colatkinson.site/macos/fuse/2019/09/29/osxfuse/ It looks like Apple is killing the whole category: https://news.ycombinator.com/item?id=22251076 I will not personally put uncompensated effort into supporting non-open source environments, especially ones that are this hostile to work with. The macOS kludges were a significant amount of code, about 25% of the remaining non-test lines, and the primary source of complexity and alternate code paths. The API definitions will be remain for a short while, with deprecation markers. This should let multiplatform callers work without changes. Everything deprecated will be removed soon, so please adjust your code. Fixes #224
1 parent 5883e5a commit 60eaf8f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+237
-1702
lines changed

‎doc/mount-linux-error-init.seq ‎doc/mount-error-init.seq

+14-8
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,22 @@ seqdiag {
1717
fusermount -> kernel [label="mount(2)"];
1818
kernel ->> mounts [label="mount is visible"];
1919
fusermount <-- kernel [label="mount(2) returns"];
20-
fuse <<-- fusermount [diagonal, label="exit, receive /dev/fuse fd", leftnote="on Linux, successful exit here\nmeans the mount has happened,\nthough InitRequest might not have yet"];
21-
app <-- fuse [label="Mount returns\nConn.Ready is already closed"];
20+
fuse <<-- fusermount [diagonal, label="exit, receive /dev/fuse fd"];
2221

23-
app -> fuse [label="fs.Serve"];
24-
fuse => kernel [label="read /dev/fuse fd", note="starts with InitRequest"];
25-
fuse -> app [label="Init"];
26-
fuse <-- app [color=red];
22+
fuse => kernel [label="read /dev/fuse fd: InitRequest"];
2723
fuse -> kernel [label="write /dev/fuse fd", color=red];
2824
kernel -> kernel [label="set connection\nstate to error", color=red];
2925
fuse <-- kernel;
30-
... conn.MountError == nil, so it is still mounted ...
31-
... call conn.Close to clean up ...
26+
27+
... Mount calls Unmount to clean up ...
28+
fuse -> fusermount [label="fusermount -u"];
29+
fusermount -> kernel;
30+
kernel <<-- mounts;
31+
fusermount <-- kernel;
32+
fuse <<-- fusermount [diagonal];
33+
34+
fuse => kernel [label="close /dev/fuse fd"];
35+
fuse <<-- kernel [diagonal, label="/dev/fuse is released"];
36+
37+
app <-- fuse [label="Mount returns", color=red];
3238
}

‎doc/mount-error-init.seq.png

22.5 KB
Loading

‎doc/mount-linux-error-init.seq.png

-28.5 KB
Binary file not shown.

‎doc/mount-linux.seq.png

-43.6 KB
Binary file not shown.

‎doc/mount-osx-error-init.seq

-32
This file was deleted.

‎doc/mount-osx-error-init.seq.png

-31.9 KB
Binary file not shown.

‎doc/mount-osx.seq

-45
This file was deleted.

‎doc/mount-osx.seq.png

-50.2 KB
Binary file not shown.

‎doc/mount-sequence.md

+5-15
Original file line numberDiff line numberDiff line change
@@ -7,24 +7,14 @@ more complex API on us.
77

88
## Successful runs
99

10-
On Linux, the mount is immediate and file system accesses wait until
11-
the requests are served.
10+
The mount is immediate and file system accesses wait until the requests are served.
1211

13-
![Diagram of Linux FUSE mount sequence](mount-linux.seq.png)
14-
15-
On OS X, the mount becomes visible only after `InitRequest` (and maybe
16-
more) have been served.
17-
18-
![Diagram of OSXFUSE mount sequence](mount-osx.seq.png)
12+
![Diagram of the mount sequence](mount.seq.png)
1913

2014

2115
## Errors
2216

23-
Let's see what happens if `InitRequest` gets an error response. On
24-
Linux, the mountpoint is there but all operations will fail:
25-
26-
![Diagram of Linux error handling](mount-linux-error-init.seq.png)
27-
28-
On OS X, the mount never happened:
17+
Let's see what happens if `InitRequest` gets an error response.
18+
The mountpoint is temporarily there but all operations will fail:
2919

30-
![Diagram of OS X error handling](mount-osx-error-init.seq.png)
20+
![Diagram of error handling](mount-error-init.seq.png)

‎doc/mount-linux.seq ‎doc/mount.seq

+12-7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
seqdiag {
2-
// seqdiag -T svg -o doc/mount-osx.svg doc/mount-osx.seq
2+
// seqdiag -T svg -o doc/mount.svg doc/mount.seq
33
app;
44
fuse [label="bazil.org/fuse"];
55
fusermount;
@@ -12,16 +12,21 @@ seqdiag {
1212
fusermount -> kernel [label="mount(2)"];
1313
kernel ->> mounts [label="mount is visible"];
1414
fusermount <-- kernel [label="mount(2) returns"];
15-
fuse <<-- fusermount [diagonal, label="exit, receive /dev/fuse fd", leftnote="on Linux, successful exit here\nmeans the mount has happened,\nthough InitRequest might not have yet"];
16-
app <-- fuse [label="Mount returns\nConn.Ready is already closed", rightnote="InitRequest and StatfsRequest\nmay or may not be seen\nbefore Conn.Ready,\ndepending on platform"];
15+
fuse <<-- fusermount [diagonal, label="exit, receive /dev/fuse fd"];
16+
17+
fuse => kernel [label="read /dev/fuse fd: InitRequest"];
18+
fuse => kernel [label="write /dev/fuse fd: InitResponse"];
19+
20+
app <-- fuse [label="Mount returns"];
1721

1822
app -> fuse [label="fs.Serve"];
19-
fuse => kernel [label="read /dev/fuse fd", note="starts with InitRequest"];
23+
fuse => kernel [label="read /dev/fuse fd"];
2024
fuse => app [label="FS/Node/Handle methods"];
2125
fuse => kernel [label="write /dev/fuse fd"];
2226
... repeat ...
2327

2428
... shutting down ...
29+
fuse -> kernel [label="read /dev/fuse fd"];
2530
app -> fuse [label="Unmount"];
2631
fuse -> fusermount [label="fusermount -u"];
2732
fusermount -> kernel;
@@ -31,11 +36,11 @@ seqdiag {
3136
app <-- fuse [label="Unmount returns"];
3237

3338
// actually triggers before above
34-
fuse <<-- kernel [diagonal, label="/dev/fuse EOF"];
39+
fuse <-- kernel [diagonal, label="/dev/fuse EOF"];
3540
app <-- fuse [label="fs.Serve returns"];
3641

3742
app -> fuse [label="conn.Close"];
38-
fuse -> kernel [label="close /dev/fuse fd"];
39-
fuse <-- kernel;
43+
fuse => kernel [label="close /dev/fuse fd"];
44+
fuse <<-- kernel [diagonal, label="/dev/fuse is released"];
4045
app <-- fuse;
4146
}

‎doc/mount.seq.png

33.9 KB
Loading

‎error_darwin.go

-17
This file was deleted.

‎error_std.go

+5-6
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,16 @@ package fuse
44
// across platforms.
55
//
66
// getxattr return value for "extended attribute does not exist" is
7-
// ENOATTR on OS X, and ENODATA on Linux and apparently at least
8-
// NetBSD. There may be a #define ENOATTR on Linux too, but the value
9-
// is ENODATA in the actual syscalls. FreeBSD and OpenBSD have no
10-
// ENODATA, only ENOATTR. ENOATTR is not in any of the standards,
11-
// ENODATA exists but is only used for STREAMs.
7+
// ENODATA on Linux and apparently at least NetBSD. There may be a
8+
// #define ENOATTR on Linux too, but the value is ENODATA in the
9+
// actual syscalls. FreeBSD and OpenBSD have no ENODATA, only ENOATTR.
10+
// ENOATTR is not in any of the standards, ENODATA exists but is only
11+
// used for STREAMs.
1212
//
1313
// Each platform will define it a errNoXattr constant, and this file
1414
// will enforce that it implements the right interfaces and hide the
1515
// implementation.
1616
//
17-
// https://developer.apple.com/library/mac/documentation/Darwin/Reference/ManPages/man2/getxattr.2.html
1817
// http://mail-index.netbsd.org/tech-kern/2012/04/30/msg013090.html
1918
// http://mail-index.netbsd.org/tech-kern/2012/04/30/msg013097.html
2019
// http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/errno.h.html

‎examples/clockfs/clockfs.go

-8
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@ func run(mountpoint string) error {
2929
mountpoint,
3030
fuse.FSName("clock"),
3131
fuse.Subtype("clockfsfs"),
32-
fuse.LocalVolume(),
33-
fuse.VolumeName("Clock filesystem"),
3432
)
3533
if err != nil {
3634
return err
@@ -58,12 +56,6 @@ func run(mountpoint string) error {
5856
if err := srv.Serve(filesys); err != nil {
5957
return err
6058
}
61-
62-
// Check if the mount process has an error to report.
63-
<-c.Ready
64-
if err := c.MountError; err != nil {
65-
return err
66-
}
6759
return nil
6860
}
6961

‎examples/hellofs/hello.go

-8
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,6 @@ func main() {
3434
mountpoint,
3535
fuse.FSName("helloworld"),
3636
fuse.Subtype("hellofs"),
37-
fuse.LocalVolume(),
38-
fuse.VolumeName("Hello world!"),
3937
)
4038
if err != nil {
4139
log.Fatal(err)
@@ -46,12 +44,6 @@ func main() {
4644
if err != nil {
4745
log.Fatal(err)
4846
}
49-
50-
// check if the mount process has an error to report
51-
<-c.Ready
52-
if err := c.MountError; err != nil {
53-
log.Fatal(err)
54-
}
5547
}
5648

5749
// FS implements the hello world file system.

‎fs/fstestutil/mounted.go

+1-21
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package fstestutil
22

33
import (
4-
"errors"
54
"io/ioutil"
65
"log"
76
"os"
@@ -67,9 +66,6 @@ func (mnt *Mount) Close() {
6766
// filesystem used is constructed by calling a function, to allow
6867
// storing fuse.Conn and fs.Server in the FS.
6968
//
70-
// It also waits until the filesystem is known to be visible (OS X
71-
// workaround).
72-
//
7369
// After successful return, caller must clean up by calling Close.
7470
func MountedFunc(fn func(*Mount) fs.FS, conf *fs.Config, options ...fuse.MountOption) (*Mount, error) {
7571
dir, err := ioutil.TempDir("", "fusetest")
@@ -96,27 +92,11 @@ func MountedFunc(fn func(*Mount) fs.FS, conf *fs.Config, options ...fuse.MountOp
9692
serveErr <- server.Serve(filesys)
9793
}()
9894

99-
select {
100-
case <-mnt.Conn.Ready:
101-
if err := mnt.Conn.MountError; err != nil {
102-
return nil, err
103-
}
104-
return mnt, nil
105-
case err = <-mnt.Error:
106-
// Serve quit early
107-
if err != nil {
108-
return nil, err
109-
}
110-
//lint:ignore ST1005 uppercase because it's an idenfier
111-
return nil, errors.New("Serve exited early")
112-
}
95+
return mnt, nil
11396
}
11497

11598
// Mounted mounts the fuse.Server at a temporary directory.
11699
//
117-
// It also waits until the filesystem is known to be visible (OS X
118-
// workaround).
119-
//
120100
// After successful return, caller must clean up by calling Close.
121101
func Mounted(filesys fs.FS, conf *fs.Config, options ...fuse.MountOption) (*Mount, error) {
122102
fn := func(*Mount) fs.FS { return filesys }

‎fs/fstestutil/mountinfo_darwin.go

-41
This file was deleted.

‎fs/fstestutil/mountinfo_linux.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,7 @@ var fstabUnescape = strings.NewReplacer(
2727
var errNotFound = errors.New("mount not found")
2828

2929
func getMountInfo(mnt string) (*MountInfo, error) {
30-
// TODO delay a little to minimize an undiagnosed race between
31-
// fuse.Conn.Ready and /proc/mounts
30+
// TODO delay a little to minimize an undiagnosed race
3231
// https://github.com/bazil/fuse/issues/228
3332
time.Sleep(10 * time.Millisecond)
3433
data, err := ioutil.ReadFile("/proc/mounts")

0 commit comments

Comments
 (0)