alexvanin/rclone
1
0
Fork 0
forked from TrueCloudLab/rclone
Code Pull requests Activity

mount: fix logging for unimplemented file open modes #1195

Browse source
This commit is contained in:
Nick Craig-Wood 2017-03-02 22:07:01 +00:00
parent fdaac6df67
commit 1cc58e4e09
1 changed files with 15 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
cmd/mount/file.go
View file

@ -112,37 +112,30 @@ func (f *File) waitForValidObject() (o fs.Object, err error) {
var _ fusefs.NodeOpener = (*File)(nil) var _ fusefs.NodeOpener = (*File)(nil)
// Open the file for read or write // Open the file for read or write
func (f *File) Open(ctx context.Context, req *fuse.OpenRequest, resp *fuse.OpenResponse) (fusefs.Handle, error) { func (f *File) Open(ctx context.Context, req *fuse.OpenRequest, resp *fuse.OpenResponse) (fh fusefs.Handle, err error) {
// if o is nil it isn't valid yet // if o is nil it isn't valid yet
o, err := f.waitForValidObject() o, err := f.waitForValidObject()
if err != nil { if err != nil {
return nil, err return nil, err
} }
fs.Debugf(o, "File.Open %v", req.Flags)
fs.Debugf(o, "File.Open")
switch { switch {
case req.Flags.IsReadOnly(): case req.Flags.IsReadOnly():
if noSeek { if noSeek {
resp.Flags |= fuse.OpenNonSeekable resp.Flags |= fuse.OpenNonSeekable
} }
fh, err := newReadFileHandle(o) fh, err = newReadFileHandle(o)
if err != nil { err = errors.Wrap(err, "open for read")
fs.Debugf(o, "File.Open failed to open for read: %v", err)
return nil, err
}
return fh, nil
case req.Flags.IsWriteOnly() || (req.Flags.IsReadWrite() && (req.Flags&fuse.OpenTruncate) != 0): case req.Flags.IsWriteOnly() || (req.Flags.IsReadWrite() && (req.Flags&fuse.OpenTruncate) != 0):
resp.Flags |= fuse.OpenNonSeekable resp.Flags |= fuse.OpenNonSeekable
src := newCreateInfo(f.d.f, o.Remote()) src := newCreateInfo(f.d.f, o.Remote())
fh, err := newWriteFileHandle(f.d, f, src) fh, err = newWriteFileHandle(f.d, f, src)
if err != nil { err = errors.Wrap(err, "open for write")
fs.Debugf(o, "File.Open failed to open for write: %v", err)
return nil, err
}
return fh, nil
case req.Flags.IsReadWrite(): case req.Flags.IsReadWrite():
return nil, errors.New("can't open read and write") err = errors.New("can't open for read and write simultaneously")
default:
err = errors.Errorf("can't figure out how to open with flags %v", req.Flags)
} }
/* /*
@ -156,7 +149,12 @@ func (f *File) Open(ctx context.Context, req *fuse.OpenRequest, resp *fuse.OpenR
OpenSync OpenFlags = syscall.O_SYNC OpenSync OpenFlags = syscall.O_SYNC
OpenTruncate OpenFlags = syscall.O_TRUNC OpenTruncate OpenFlags = syscall.O_TRUNC
*/ */
return nil, errors.New("can't figure out how to open")
if err != nil {
fs.Errorf(o, "File.Open failed: %v", err)
return nil, err
}
return fh, nil
} }
// Check interface satisfied // Check interface satisfied