From a80d8a21dc1be642d17633d379c7c517272b65d4 Mon Sep 17 00:00:00 2001 From: Nick Craig-Wood Date: Thu, 7 Dec 2017 12:34:18 +0000 Subject: [PATCH] vfs: add flags parameter to Dir.Create --- cmd/cmount/fs.go | 2 +- cmd/mount/dir.go | 2 +- vfs/dir.go | 2 +- vfs/dir_test.go | 4 ++-- vfs/vfs.go | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cmd/cmount/fs.go b/cmd/cmount/fs.go index 8b159713d..c9242e0cb 100644 --- a/cmd/cmount/fs.go +++ b/cmd/cmount/fs.go @@ -299,7 +299,7 @@ func (fsys *FS) Create(filePath string, flags int, mode uint32) (errc int, fh ui if errc != 0 { return errc, fhUnset } - file, err := parentDir.Create(leaf) + file, err := parentDir.Create(leaf, flags) if err != nil { return translateError(err), fhUnset } diff --git a/cmd/mount/dir.go b/cmd/mount/dir.go index 77086cba0..5f3600717 100644 --- a/cmd/mount/dir.go +++ b/cmd/mount/dir.go @@ -112,7 +112,7 @@ var _ fusefs.NodeCreater = (*Dir)(nil) // Create makes a new file func (d *Dir) Create(ctx context.Context, req *fuse.CreateRequest, resp *fuse.CreateResponse) (node fusefs.Node, handle fusefs.Handle, err error) { defer log.Trace(d, "name=%q", req.Name)("node=%v, handle=%v, err=%v", &node, &handle, &err) - file, err := d.Dir.Create(req.Name) + file, err := d.Dir.Create(req.Name, int(req.Flags)) if err != nil { return nil, nil, translateError(err) } diff --git a/vfs/dir.go b/vfs/dir.go index 017828e99..bd19ee057 100644 --- a/vfs/dir.go +++ b/vfs/dir.go @@ -326,7 +326,7 @@ func (d *Dir) Open(flags int) (fd Handle, err error) { } // Create makes a new file node -func (d *Dir) Create(name string) (*File, error) { +func (d *Dir) Create(name string, flags int) (*File, error) { // fs.Debugf(path, "Dir.Create") if d.vfs.Opt.ReadOnly { return nil, EROFS diff --git a/vfs/dir_test.go b/vfs/dir_test.go index c8f20614a..c71c981e7 100644 --- a/vfs/dir_test.go +++ b/vfs/dir_test.go @@ -281,7 +281,7 @@ func TestDirCreate(t *testing.T) { defer r.Finalise() vfs, dir, _ := dirCreate(t, r) - file, err := dir.Create("potato") + file, err := dir.Create("potato", os.O_WRONLY|os.O_CREATE) require.NoError(t, err) assert.Equal(t, int64(0), file.Size()) @@ -306,7 +306,7 @@ func TestDirCreate(t *testing.T) { assert.Equal(t, int64(5), file2.Size()) vfs.Opt.ReadOnly = true - _, err = dir.Create("sausage") + _, err = dir.Create("sausage", os.O_WRONLY|os.O_CREATE) assert.Equal(t, EROFS, err) } diff --git a/vfs/vfs.go b/vfs/vfs.go index 5a491b273..7b4023463 100644 --- a/vfs/vfs.go +++ b/vfs/vfs.go @@ -403,7 +403,7 @@ func (vfs *VFS) OpenFile(name string, flags int, perm os.FileMode) (fd Handle, e if err != nil { return nil, err } - node, err = dir.Create(leaf) + node, err = dir.Create(leaf, flags) if err != nil { return nil, err }