Skip to content

Commit

Permalink
cleanup readdirnames() function (#801)
Browse files Browse the repository at this point in the history
Signed-off-by: Bala.FA <bala@minio.io>
  • Loading branch information
balamurugana authored Jun 13, 2023
1 parent 0ed3d97 commit d49add7
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions pkg/device/sysfs_linux.go
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ func getSize(name string) (uint64, error) {
}

func getPartitions(name string) ([]string, error) {
names, err := readdirnames("/sys/block/"+name, false)
names, err := readdirnames("/sys/block/" + name)
if err != nil {
return nil, err
}
Expand All @@ -100,7 +100,7 @@ func getPartitions(name string) ([]string, error) {
}

func getHolders(name string) ([]string, error) {
return readdirnames("/sys/class/block/"+name+"/holders", false)
return readdirnames("/sys/class/block/" + name + "/holders")
}

func getDMName(name string) (string, error) {
Expand Down
4 changes: 2 additions & 2 deletions pkg/device/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ import (
"strings"
)

func readdirnames(dirname string, errorIfNotExist bool) ([]string, error) {
func readdirnames(dirname string) ([]string, error) {
dir, err := os.Open(dirname)
if err != nil {
if errors.Is(err, os.ErrNotExist) && !errorIfNotExist {
if errors.Is(err, os.ErrNotExist) {
err = nil
}
return nil, err
Expand Down

0 comments on commit d49add7

Please sign in to comment.