From 8f07c9efcc5132051667ae6333b8c0dfb9026dd9 Mon Sep 17 00:00:00 2001 From: Madhu Rajanna Date: Mon, 4 Mar 2019 09:40:44 +0530 Subject: [PATCH] remove unused param from function Signed-off-by: Madhu Rajanna --- pkg/cephfs/nodeserver.go | 2 +- pkg/cephfs/volume.go | 2 +- pkg/cephfs/volumemounter.go | 14 +++++++------- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkg/cephfs/nodeserver.go b/pkg/cephfs/nodeserver.go index 4c97a80f2..51c44933a 100644 --- a/pkg/cephfs/nodeserver.go +++ b/pkg/cephfs/nodeserver.go @@ -150,7 +150,7 @@ func (*NodeServer) mount(volOptions *volumeOptions, req *csi.NodeStageVolumeRequ klog.V(4).Infof("cephfs: mounting volume %s with %s", volID, m.name()) - if err = m.mount(stagingTargetPath, cr, volOptions, volID); err != nil { + if err = m.mount(stagingTargetPath, cr, volOptions); err != nil { klog.Errorf("failed to mount volume %s: %v", volID, err) return status.Error(codes.Internal, err.Error()) } diff --git a/pkg/cephfs/volume.go b/pkg/cephfs/volume.go index 7b8dea03a..caf9887dc 100644 --- a/pkg/cephfs/volume.go +++ b/pkg/cephfs/volume.go @@ -137,7 +137,7 @@ func mountCephRoot(volID volumeID, volOptions *volumeOptions, adminCr *credentia return fmt.Errorf("failed to create mounter: %v", err) } - if err = m.mount(cephRoot, adminCr, volOptions, volID); err != nil { + if err = m.mount(cephRoot, adminCr, volOptions); err != nil { return fmt.Errorf("error mounting ceph root: %v", err) } diff --git a/pkg/cephfs/volumemounter.go b/pkg/cephfs/volumemounter.go index 035a161a4..6a91afafc 100644 --- a/pkg/cephfs/volumemounter.go +++ b/pkg/cephfs/volumemounter.go @@ -67,7 +67,7 @@ func loadAvailableMounters() error { } type volumeMounter interface { - mount(mountPoint string, cr *credentials, volOptions *volumeOptions, volID volumeID) error + mount(mountPoint string, cr *credentials, volOptions *volumeOptions) error name() string } @@ -111,7 +111,7 @@ func newMounter(volOptions *volumeOptions) (volumeMounter, error) { type fuseMounter struct{} -func mountFuse(mountPoint string, cr *credentials, volOptions *volumeOptions, volID volumeID) error { +func mountFuse(mountPoint string, cr *credentials, volOptions *volumeOptions) error { args := [...]string{ mountPoint, "-m", volOptions.Monitors, @@ -147,19 +147,19 @@ func mountFuse(mountPoint string, cr *credentials, volOptions *volumeOptions, vo return nil } -func (m *fuseMounter) mount(mountPoint string, cr *credentials, volOptions *volumeOptions, volID volumeID) error { +func (m *fuseMounter) mount(mountPoint string, cr *credentials, volOptions *volumeOptions) error { if err := createMountPoint(mountPoint); err != nil { return err } - return mountFuse(mountPoint, cr, volOptions, volID) + return mountFuse(mountPoint, cr, volOptions) } func (m *fuseMounter) name() string { return "Ceph FUSE driver" } type kernelMounter struct{} -func mountKernel(mountPoint string, cr *credentials, volOptions *volumeOptions, volID volumeID) error { +func mountKernel(mountPoint string, cr *credentials, volOptions *volumeOptions) error { if err := execCommandErr("modprobe", "ceph"); err != nil { return err } @@ -172,12 +172,12 @@ func mountKernel(mountPoint string, cr *credentials, volOptions *volumeOptions, ) } -func (m *kernelMounter) mount(mountPoint string, cr *credentials, volOptions *volumeOptions, volID volumeID) error { +func (m *kernelMounter) mount(mountPoint string, cr *credentials, volOptions *volumeOptions) error { if err := createMountPoint(mountPoint); err != nil { return err } - return mountKernel(mountPoint, cr, volOptions, volID) + return mountKernel(mountPoint, cr, volOptions) } func (m *kernelMounter) name() string { return "Ceph kernel client" }