Changing bitflag checking style to preferred style. Fixes #11668

Signed-off-by: Jimmy Puckett <jimmy.puckett@spinen.com>

daemon/daemon.go

@@ -445,8 +445,8 @@ func (daemon *Daemon) setupResolvconfWatcher() error {
 			select {
 			case event := <-watcher.Events:
 				if event.Name == "/etc/resolv.conf" &&
-					(event.Op&fsnotify.Write == fsnotify.Write ||
-						event.Op&fsnotify.Create == fsnotify.Create) {
+					(event.Op&fsnotify.Write != 0 ||
+						event.Op&fsnotify.Create != 0) {
 					// verify a real change happened before we go further--a file write may have happened
 					// without an actual change to the file
 					updatedResolvConf, newResolvConfHash, err := resolvconf.GetIfChanged()

daemon/graphdriver/aufs/migrate.go

@@ -162,7 +162,7 @@ func tryRelocate(oldPath, newPath string) error {
 	}
 	// If the destination is a symlink then we already tried to relocate once before
 	// and it failed so we delete it and try to remove
-	if s != nil && s.Mode()&os.ModeSymlink == os.ModeSymlink {
+	if s != nil && s.Mode()&os.ModeSymlink != 0 {
 		if err := os.RemoveAll(newPath); err != nil {
 			return err
 		}