From 6fcbdd56074592a0e9d3a61474f66da0ff4c47f6 Mon Sep 17 00:00:00 2001 From: Harshavardhana Date: Mon, 21 Sep 2020 09:41:39 -0700 Subject: [PATCH] remove unused putObjectDir code (#10528) --- cmd/erasure-object.go | 42 ------------------------------------------ 1 file changed, 42 deletions(-) diff --git a/cmd/erasure-object.go b/cmd/erasure-object.go index c7f6bdcba..438265a55 100644 --- a/cmd/erasure-object.go +++ b/cmd/erasure-object.go @@ -37,30 +37,6 @@ import ( // list all errors which can be ignored in object operations. var objectOpIgnoredErrs = append(baseIgnoredErrs, errDiskAccessDenied, errUnformattedDisk) -// putObjectDir hints the bottom layer to create a new directory. -func (er erasureObjects) putObjectDir(ctx context.Context, bucket, object string, writeQuorum int) error { - storageDisks := er.getDisks() - - g := errgroup.WithNErrs(len(storageDisks)) - - // Prepare object creation in all disks - for index := range storageDisks { - if storageDisks[index] == nil { - continue - } - index := index - g.Go(func() error { - err := storageDisks[index].MakeVol(ctx, pathJoin(bucket, object)) - if err != nil && err != errVolumeExists { - return err - } - return nil - }, index) - } - - return reduceWriteQuorumErrs(ctx, g.Wait(), objectOpIgnoredErrs, writeQuorum) -} - /// Object Operations // CopyObject - copy object source object to destination object. @@ -650,24 +626,6 @@ func (er erasureObjects) putObject(ctx context.Context, bucket string, object st // object to delete. defer er.deleteObject(context.Background(), minioMetaTmpBucket, tempObj, writeQuorum) - // This is a special case with size as '0' and object ends with - // a slash separator, we treat it like a valid operation and - // return success. - if isObjectDir(object, data.Size()) { - // Check if an object is present as one of the parent dir. - // -- FIXME. (needs a new kind of lock). - // -- FIXME (this also causes performance issue when disks are down). - if er.parentDirIsObject(ctx, bucket, path.Dir(object)) { - return ObjectInfo{}, toObjectErr(errFileParentIsFile, bucket, object) - } - - if err = er.putObjectDir(ctx, bucket, object, writeQuorum); err != nil { - return ObjectInfo{}, toObjectErr(err, bucket, object) - } - - return dirObjectInfo(bucket, object, data.Size(), opts.UserDefined), nil - } - // Validate input data size and it can never be less than zero. if data.Size() < -1 { logger.LogIf(ctx, errInvalidArgument, logger.Application)