Merge pull request #50503 from karataliu/mount_clean

Automatic merge from submit-queue (batch tested with PRs 43016, 50503, 51281, 51518, 51582). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.. Clean up diskLooksUnformatted literal **What this PR does / why we need it**: #16948 moved the `formatAndMount` function to mount_linux.go, but `diskLooksUnformatted` does not necessarily need to appear in mount_unsupported.go #31515 Renames `diskLooksUnformatted` to `getDiskFormat`, but did not update the comment This is to do the small cleanup. **Which issue this PR fixes** **Special notes for your reviewer**: **Release note**:

Merge pull request #50503 from karataliu/mount_clean
980a8e63 · Kubernetes Submit Queue · GitHub · 1c0f22ea · a6ff000e · 980a8e63
Commit 980a8e63 authored Sep 22, 2017 by Kubernetes Submit Queue Committed by GitHub Sep 22, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 5 deletions

mount_linux.go pkg/util/mount/mount_linux.go +1 -1

mount_unsupported.go pkg/util/mount/mount_unsupported.go +0 -4

No files found.
--- a/pkg/util/mount/mount_linux.go
+++ b/pkg/util/mount/mount_linux.go
@@ -424,7 +424,7 @@ func (mounter *SafeFormatAndMount) formatAndMount(source string, target string, 
 	return mountErr
 }

-// diskLooksUnformatted uses 'lsblk' to see if the given disk is unformated
+// getDiskFormat uses 'lsblk' to see if the given disk is unformated
 func (mounter *SafeFormatAndMount) getDiskFormat(disk string) (string, error) {
 	args := []string{"-n", "-o", "FSTYPE", disk}
 	glog.V(4).Infof("Attempting to determine if disk %q is formatted using lsblk with args: (%v)", disk, args)

--- a/pkg/util/mount/mount_unsupported.go
+++ b/pkg/util/mount/mount_unsupported.go
@@ -74,7 +74,3 @@ func (mounter *Mounter) MakeRShared(path string) error {
 func (mounter *SafeFormatAndMount) formatAndMount(source string, target string, fstype string, options []string) error {
 	return nil
 }
-
-func (mounter *SafeFormatAndMount) diskLooksUnformatted(disk string) (bool, error) {
-	return true, nil
-}