From b793f53d488c639cd6aa74a33273b645ad96cd32 Mon Sep 17 00:00:00 2001 From: Harshavardhana Date: Wed, 17 Jun 2015 20:35:35 -0700 Subject: [PATCH 1/2] Minior change filter() to filterObjects() --- pkg/storage/drivers/fs/fs_bucket.go | 2 +- pkg/storage/drivers/fs/fs_filter.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/storage/drivers/fs/fs_bucket.go b/pkg/storage/drivers/fs/fs_bucket.go index 25b1cf277..c57a9047c 100644 --- a/pkg/storage/drivers/fs/fs_bucket.go +++ b/pkg/storage/drivers/fs/fs_bucket.go @@ -192,7 +192,7 @@ func (fs *fsDriver) ListObjects(bucket string, resources drivers.BucketResources break } if name > resources.Marker { - metadata, resources, err = fs.filter(bucket, name, p.files[name], resources) + metadata, resources, err = fs.filterObjects(bucket, name, p.files[name], resources) if err != nil { return []drivers.ObjectMetadata{}, resources, iodine.New(err, nil) } diff --git a/pkg/storage/drivers/fs/fs_filter.go b/pkg/storage/drivers/fs/fs_filter.go index 1fdbdfee2..2bfd06036 100644 --- a/pkg/storage/drivers/fs/fs_filter.go +++ b/pkg/storage/drivers/fs/fs_filter.go @@ -24,7 +24,7 @@ import ( "github.com/minio/minio/pkg/storage/drivers" ) -func (fs *fsDriver) filter(bucket, name string, file os.FileInfo, resources drivers.BucketResourcesMetadata) (drivers.ObjectMetadata, drivers.BucketResourcesMetadata, error) { +func (fs *fsDriver) filterObjects(bucket, name string, file os.FileInfo, resources drivers.BucketResourcesMetadata) (drivers.ObjectMetadata, drivers.BucketResourcesMetadata, error) { var err error var metadata drivers.ObjectMetadata From e9a3fd677ac1b21641c03575e8cd68087f1a71f1 Mon Sep 17 00:00:00 2001 From: Harshavardhana Date: Wed, 17 Jun 2015 20:37:45 -0700 Subject: [PATCH 2/2] Hold lock on GetGlobalStateKey() - fixes #652 --- pkg/iodine/iodine.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkg/iodine/iodine.go b/pkg/iodine/iodine.go index b8ffd17b4..5dd3b4490 100644 --- a/pkg/iodine/iodine.go +++ b/pkg/iodine/iodine.go @@ -87,7 +87,9 @@ func GetGlobalState() map[string]string { // GetGlobalStateKey - get value for key from globalState struct func GetGlobalStateKey(k string) string { + globalState.RLock() result, ok := globalState.m[k] + globalState.RUnlock() if !ok { return "" }