瀏覽代碼

devicemapper: actually remove DmLogInitVerbose

e07d3cd9a ("devmapper: Fix libdm logging") removed all of the callers of
DmLogInitVerbose, but we still kept around the wrapper. However, the
libdm dm_log_init_verbose API changes the verbosity of the *default*
libdm logger. Because pkg/devicemapper internally *relies* on using
logging callbacks to understand what errors were encountered by libdm,
this wrapper is useless (it only makes sense for the default logger
which we do not user).

Any user not inside Docker of this function almost certainly was not
using this API correctly, because pkg/devicemapper will misbehave if our
logging callbacks were not registered.

Signed-off-by: Aleksa Sarai <asarai@suse.de>
Aleksa Sarai 8 年之前
父節點
當前提交
c654147f06
共有 2 個文件被更改,包括 0 次插入10 次删除
  1. 0 5
      pkg/devicemapper/devmapper.go
  2. 0 5
      pkg/devicemapper/devmapper_wrapper.go

+ 0 - 5
pkg/devicemapper/devmapper.go

@@ -264,11 +264,6 @@ func UdevWait(cookie *uint) error {
 	return nil
 	return nil
 }
 }
 
 
-// LogInitVerbose is an interface to initialize the verbose logger for the device mapper library.
-func LogInitVerbose(level int) {
-	DmLogInitVerbose(level)
-}
-
 var dmLogger DevmapperLogger
 var dmLogger DevmapperLogger
 
 
 // LogInit initializes the logger for the device mapper library.
 // LogInit initializes the logger for the device mapper library.

+ 0 - 5
pkg/devicemapper/devmapper_wrapper.go

@@ -58,7 +58,6 @@ const (
 var (
 var (
 	DmGetLibraryVersion       = dmGetLibraryVersionFct
 	DmGetLibraryVersion       = dmGetLibraryVersionFct
 	DmGetNextTarget           = dmGetNextTargetFct
 	DmGetNextTarget           = dmGetNextTargetFct
-	DmLogInitVerbose          = dmLogInitVerboseFct
 	DmSetDevDir               = dmSetDevDirFct
 	DmSetDevDir               = dmSetDevDirFct
 	DmTaskAddTarget           = dmTaskAddTargetFct
 	DmTaskAddTarget           = dmTaskAddTargetFct
 	DmTaskCreate              = dmTaskCreateFct
 	DmTaskCreate              = dmTaskCreateFct
@@ -228,10 +227,6 @@ func dmCookieSupportedFct() int {
 	return int(C.dm_cookie_supported())
 	return int(C.dm_cookie_supported())
 }
 }
 
 
-func dmLogInitVerboseFct(level int) {
-	C.dm_log_init_verbose(C.int(level))
-}
-
 func logWithErrnoInitFct() {
 func logWithErrnoInitFct() {
 	C.log_with_errno_init()
 	C.log_with_errno_init()
 }
 }