Merge pull request moby#10197 from vbatts/vbatts-dm_cookie_support

crosbymichael · crosbymichael · commit c81fb7fa4a41 · 2015-01-27T11:44:03.000-08:00
devicemapper: API for cookie support
diff --git a/pkg/devicemapper/devmapper.go b/pkg/devicemapper/devmapper.go
@@ -339,6 +339,13 @@ func UdevSetSyncSupport(enable bool) bool {
 	return UdevSyncSupported()
 }
 
+// CookieSupported returns whether the version of device-mapper supports the
+// use of cookie's in the tasks.
+// This is largely a lower level call that other functions use.
+func CookieSupported() bool {
+	return DmCookieSupported() != 0
+}
+
 // Useful helper for cleanup
 func RemoveDevice(name string) error {
 	log.Debugf("[devmapper] RemoveDevice START(%s)", name)
diff --git a/pkg/devicemapper/devmapper_wrapper.go b/pkg/devicemapper/devmapper_wrapper.go
@@ -110,6 +110,7 @@ var (
 	DmUdevWait             = dmUdevWaitFct
 	DmUdevSetSyncSupport   = dmUdevSetSyncSupportFct
 	DmUdevGetSyncSupport   = dmUdevGetSyncSupportFct
+	DmCookieSupported      = dmCookieSupportedFct
 	LogWithErrnoInit       = logWithErrnoInitFct
 )
 
@@ -246,6 +247,10 @@ func dmUdevWaitFct(cookie uint) int {
 	return int(C.dm_udev_wait(C.uint32_t(cookie)))
 }
 
+func dmCookieSupportedFct() int {
+	return int(C.dm_cookie_supported())
+}
+
 func dmLogInitVerboseFct(level int) {
 	C.dm_log_init_verbose(C.int(level))
 }

Original file line number	Diff line number	Diff line change
`@@ -110,6 +110,7 @@ var (`
`110`	`110`	`DmUdevWait = dmUdevWaitFct`
`111`	`111`	`DmUdevSetSyncSupport = dmUdevSetSyncSupportFct`
`112`	`112`	`DmUdevGetSyncSupport = dmUdevGetSyncSupportFct`
	`113`	`+ DmCookieSupported = dmCookieSupportedFct`
`113`	`114`	`LogWithErrnoInit = logWithErrnoInitFct`
`114`	`115`	`)`
`115`	`116`
`@@ -246,6 +247,10 @@ func dmUdevWaitFct(cookie uint) int {`
`246`	`247`	`return int(C.dm_udev_wait(C.uint32_t(cookie)))`
`247`	`248`	`}`
`248`	`249`
	`250`	`+func dmCookieSupportedFct() int {`
	`251`	`+ return int(C.dm_cookie_supported())`
	`252`	`+}`
	`253`	`+`
`249`	`254`	`func dmLogInitVerboseFct(level int) {`
`250`	`255`	`C.dm_log_init_verbose(C.int(level))`
`251`	`256`	`}`