From 092e59ef7637e4f4e6ec2d426d21be2267ef4317 Mon Sep 17 00:00:00 2001 From: Kir Kolyshkin Date: Mon, 18 Dec 2017 10:23:49 -0800 Subject: [PATCH] projectquota: treat ENOSYS as quota unsupported If mknod() returns ENOSYS, it most probably means quota is not supported here, so return the appropriate error. This is a conservative* fix to regression in vfs graph driver introduced by commit 7a1618ced359a3ac92 ("add quota support to VFS graphdriver"). On some filesystems, vfs fails to init with the following error: > Error starting daemon: error initializing graphdriver: Failed to mknod > /go/src/github.com/docker/docker/bundles/test-integration/d6bcf6de610e9/root/vfs/backingFsBlockDev: > function not implemented Reported-by: Brian Goff Signed-off-by: Kir Kolyshkin (cherry picked from commit 2dd39b7841bdb9968884bbedc5db97ff77d4fe3e) Signed-off-by: Sebastiaan van Stijn --- .../engine/daemon/graphdriver/quota/projectquota.go | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/components/engine/daemon/graphdriver/quota/projectquota.go b/components/engine/daemon/graphdriver/quota/projectquota.go index e25965baf3..8efe5cd8a1 100644 --- a/components/engine/daemon/graphdriver/quota/projectquota.go +++ b/components/engine/daemon/graphdriver/quota/projectquota.go @@ -350,11 +350,17 @@ func makeBackingFsDev(home string) (string, error) { backingFsBlockDev := path.Join(home, "backingFsBlockDev") // Re-create just in case someone copied the home directory over to a new device unix.Unlink(backingFsBlockDev) - if err := unix.Mknod(backingFsBlockDev, unix.S_IFBLK|0600, int(stat.Dev)); err != nil { + err := unix.Mknod(backingFsBlockDev, unix.S_IFBLK|0600, int(stat.Dev)) + switch err { + case nil: + return backingFsBlockDev, nil + + case unix.ENOSYS: + return "", ErrQuotaNotSupported + + default: return "", fmt.Errorf("Failed to mknod %s: %v", backingFsBlockDev, err) } - - return backingFsBlockDev, nil } func hasQuotaSupport(backingFsBlockDev string) (bool, error) {