@@ -7,11 +7,14 @@ import (

 	"github.com/docker/docker/daemon/graphdriver"

 	"github.com/docker/docker/daemon/graphdriver/quota"

+	"github.com/docker/docker/errdefs"

 	"github.com/docker/docker/pkg/containerfs"

 	"github.com/docker/docker/pkg/idtools"

+	"github.com/docker/docker/pkg/parsers"

 	"github.com/docker/docker/pkg/system"

 	"github.com/docker/go-units"

 	"github.com/opencontainers/selinux/go-selinux/label"

+	"github.com/pkg/errors"

 )

 var (

@@ -30,6 +33,11 @@ func Init(home string, options []string, uidMaps, gidMaps []idtools.IDMap) (grap

 		home:      home,

 		idMapping: idtools.NewIDMappingsFromMaps(uidMaps, gidMaps),

 	}

+

+	if err := d.parseOptions(options); err != nil {

+		return nil, err

+	}

+

 	rootIDs := d.idMapping.RootPair()

 	if err := idtools.MkdirAllAndChown(home, 0700, rootIDs); err != nil {

 		return nil, err

@@ -37,6 +45,10 @@ func Init(home string, options []string, uidMaps, gidMaps []idtools.IDMap) (grap

 	setupDriverQuota(d)

+	if size := d.getQuotaOpt(); !d.quotaSupported() && size > 0 {

+		return nil, quota.ErrQuotaNotSupported

+	}

+

 	return graphdriver.NewNaiveDiffDriver(d, uidMaps, gidMaps), nil

 }

@@ -69,11 +81,32 @@ func (d *Driver) Cleanup() error {

 	return nil

 }

+func (d *Driver) parseOptions(options []string) error {

+	for _, option := range options {

+		key, val, err := parsers.ParseKeyValueOpt(option)

+		if err != nil {

+			return errdefs.InvalidParameter(err)

+		}

+		switch key {

+		case "size":

+			size, err := units.RAMInBytes(val)

+			if err != nil {

+				return errdefs.InvalidParameter(err)

+			}

+			if err = d.setQuotaOpt(uint64(size)); err != nil {

+				return errdefs.InvalidParameter(errors.Wrap(err, "failed to set option size for vfs"))

+			}

+		default:

+			return errdefs.InvalidParameter(errors.Errorf("unknown option %s for vfs", key))

+		}

+	}

+	return nil

+}

+

 // CreateReadWrite creates a layer that is writable for use as a container

 // file system.

 func (d *Driver) CreateReadWrite(id, parent string, opts *graphdriver.CreateOpts) error {

-	var err error

-	var size int64

+	quotaSize := d.getQuotaOpt()

 	if opts != nil {

 		for key, val := range opts.StorageOpt {

@@ -82,16 +115,18 @@ func (d *Driver) CreateReadWrite(id, parent string, opts *graphdriver.CreateOpts

 				if !d.quotaSupported() {

 					return quota.ErrQuotaNotSupported

 				}

-				if size, err = units.RAMInBytes(val); err != nil {

-					return err

+				size, err := units.RAMInBytes(val)

+				if err != nil {

+					return errdefs.InvalidParameter(err)

 				}

+				quotaSize = uint64(size)

 			default:

-				return fmt.Errorf("Storage opt %s not supported", key)

+				return errdefs.InvalidParameter(errors.Errorf("Storage opt %s not supported", key))

 			}

 		}

 	}

-	return d.create(id, parent, uint64(size))

+	return d.create(id, parent, quotaSize)

 }

 // Create prepares the filesystem for the VFS driver and copies the directory for the given id under the parent.

@@ -7,6 +7,7 @@ import (

 type driverQuota struct {

 	quotaCtl *quota.Control

+	quotaOpt quota.Quota

 }

 func setupDriverQuota(driver *Driver) {

@@ -17,6 +18,15 @@ func setupDriverQuota(driver *Driver) {

 	}

 }

+func (d *Driver) setQuotaOpt(size uint64) error {

+	d.quotaOpt.Size = size

+	return nil

+}

+

+func (d *Driver) getQuotaOpt() uint64 {

+	return d.quotaOpt.Size

+}

+

 func (d *Driver) setupQuota(dir string, size uint64) error {

 	return d.quotaCtl.SetQuota(dir, quota.Quota{Size: size})

 }

@@ -11,6 +11,14 @@ func setupDriverQuota(driver *Driver) error {

 	return nil

 }

+func (d *Driver) setQuotaOpt(size uint64) error {

+	return quota.ErrQuotaNotSupported

+}

+

+func (d *Driver) getQuotaOpt() uint64 {

+	return 0

+}

+

 func (d *Driver) setupQuota(dir string, size uint64) error {

 	return quota.ErrQuotaNotSupported

 }