Skip to content

Commit

Permalink
cephfs: try fix lint
Browse files Browse the repository at this point in the history
  • Loading branch information
thmour committed Dec 7, 2021
1 parent 4e717d5 commit 915e508
Show file tree
Hide file tree
Showing 10 changed files with 24 additions and 21 deletions.
2 changes: 1 addition & 1 deletion pkg/storage/fs/cephfs/cephfs.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
// granted to it by virtue of its status as an Intergovernmental Organization
// or submit itself to any jurisdiction.

//+build ceph
// +build ceph

package cephfs

Expand Down
2 changes: 1 addition & 1 deletion pkg/storage/fs/cephfs/chunking.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
// granted to it by virtue of its status as an Intergovernmental Organization
// or submit itself to any jurisdiction.

//+build ceph
// +build ceph

package cephfs

Expand Down
6 changes: 3 additions & 3 deletions pkg/storage/fs/cephfs/connections.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
// granted to it by virtue of its status as an Intergovernmental Organization
// or submit itself to any jurisdiction.

//+build ceph
// +build ceph

package cephfs

Expand Down Expand Up @@ -110,8 +110,8 @@ type adminConn struct {
indexPoolName string
subvolAdmin *admin.FSAdmin
adminMount Mount
radosConn *rados2.Conn
radosIO *rados2.IOContext
radosConn *rados2.Conn
radosIO *rados2.IOContext
}

func newAdminConn(poolName string) *adminConn {
Expand Down
3 changes: 2 additions & 1 deletion pkg/storage/fs/cephfs/errors.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
// granted to it by virtue of its status as an Intergovernmental Organization
// or submit itself to any jurisdiction.

//+build ceph
// +build ceph

package cephfs

Expand All @@ -28,6 +28,7 @@ package cephfs
import "C"
import (
"fmt"

"github.com/cs3org/reva/pkg/errtypes"
)

Expand Down
19 changes: 10 additions & 9 deletions pkg/storage/fs/cephfs/options.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,24 +16,25 @@
// granted to it by virtue of its status as an Intergovernmental Organization
// or submit itself to any jurisdiction.

//+build ceph
// +build ceph

package cephfs

import (
"github.com/cs3org/reva/pkg/sharedconf"
"path/filepath"

"github.com/cs3org/reva/pkg/sharedconf"
)

// Options for the cephfs module
type Options struct {
GatewaySvc string `mapstructure:"gatewaysvc"`
IndexPool string `mapstructure:"index_pool"`
Root string `mapstructure:"root"`
ShadowFolder string `mapstructure:"shadow_folder"`
ShareFolder string `mapstructure:"share_folder"`
UploadFolder string `mapstructure:"uploads"`
UserLayout string `mapstructure:"user_layout"`
GatewaySvc string `mapstructure:"gatewaysvc"`
IndexPool string `mapstructure:"index_pool"`
Root string `mapstructure:"root"`
ShadowFolder string `mapstructure:"shadow_folder"`
ShareFolder string `mapstructure:"share_folder"`
UploadFolder string `mapstructure:"uploads"`
UserLayout string `mapstructure:"user_layout"`

DisableHome bool `mapstructure:"disable_home"`
UserQuotaBytes uint64 `mapstructure:"user_quota_bytes"`
Expand Down
2 changes: 1 addition & 1 deletion pkg/storage/fs/cephfs/permissions.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
// granted to it by virtue of its status as an Intergovernmental Organization
// or submit itself to any jurisdiction.

//+build ceph
// +build ceph

package cephfs

Expand Down
2 changes: 1 addition & 1 deletion pkg/storage/fs/cephfs/unsupported.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
// granted to it by virtue of its status as an Intergovernmental Organization
// or submit itself to any jurisdiction.

//+build !ceph
// +build !ceph

package cephfs

Expand Down
2 changes: 1 addition & 1 deletion pkg/storage/fs/cephfs/upload.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
// granted to it by virtue of its status as an Intergovernmental Organization
// or submit itself to any jurisdiction.

//+build ceph
// +build ceph

package cephfs

Expand Down
5 changes: 3 additions & 2 deletions pkg/storage/fs/cephfs/user.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,20 @@
// granted to it by virtue of its status as an Intergovernmental Organization
// or submit itself to any jurisdiction.

//+build ceph
// +build ceph

package cephfs

import (
"context"
"fmt"
"github.com/cs3org/reva/pkg/errtypes"
"path/filepath"
"strconv"
"strings"
"syscall"

"github.com/cs3org/reva/pkg/errtypes"

cephfs2 "github.com/ceph/go-ceph/cephfs"
userv1beta1 "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1"
provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1"
Expand Down
2 changes: 1 addition & 1 deletion pkg/storage/fs/cephfs/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
// granted to it by virtue of its status as an Intergovernmental Organization
// or submit itself to any jurisdiction.

//+build ceph
// +build ceph

package cephfs

Expand Down

0 comments on commit 915e508

Please sign in to comment.