Skip to contentSkip to conversation

cachefiles: Explicitly cast enumerated type in put_object

PATCH In review Nathan Chancellor 2 participants 3 messages Sep 24, 2018 – Nov 5, 2018 Cachefiles: fs-cache backend for caching on mounted filesystems

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 cachefiles: Explicitly cast enumerated type in put_object

Clang warns when one enumerated type is implicitly converted to another.

fs/cachefiles/namei.c:247:50: warning: implicit conversion from enumeration type 'enum cachefiles_obj_ref_trace' to different enumeration type 'enum fscache_obj_ref_trace' [-Wenum-conversion]

        cache->cache.ops->put_object(&xobject->fscache,

cachefiles_obj_put_wait_retry);

Silence this warning by explicitly casting to fscache_obj_ref_trace, which is also done in put_object.

---
 fs/cachefiles/namei.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
fs/cachefiles/namei.c +4 -2
index af2b17b21b94..15e5988a83de 100644
@@ -244,11 +244,13 @@ static int cachefiles_mark_object_active(struct cachefiles_cache *cache,
 
 	ASSERT(!test_bit(CACHEFILES_OBJECT_ACTIVE, &xobject->flags));
 
-	cache->cache.ops->put_object(&xobject->fscache, cachefiles_obj_put_wait_retry);
+	cache->cache.ops->put_object(&xobject->fscache,
+		(enum fscache_obj_ref_trace)cachefiles_obj_put_wait_retry);
 	goto try_again;
 
 requeue:
-	cache->cache.ops->put_object(&xobject->fscache, cachefiles_obj_put_wait_timeo);
+	cache->cache.ops->put_object(&xobject->fscache,
+		(enum fscache_obj_ref_trace)cachefiles_obj_put_wait_timeo);
 	_leave(" = -ETIMEDOUT");
 	return -ETIMEDOUT;
 }
Signature · 1 line
2.19.0
Reviewed-by on v1 1/1
#1 lore raw
Quoted 8 lines · Nathan Chancellor

Clang warns when one enumerated type is implicitly converted to another.

fs/cachefiles/namei.c:247:50: warning: implicit conversion from enumeration type 'enum cachefiles_obj_ref_trace' to different enumeration type 'enum fscache_obj_ref_trace' [-Wenum-conversion]

        cache->cache.ops->put_object(&xobject->fscache,

cachefiles_obj_put_wait_retry);

That's an interesting pattern; cachefiles_obj_ref_trace's first enumeration's value is set to the final enumeration's value in fscache_obj_ref_trace. This fix is ok to me; though I would ask the maintainer consider just merging the enums into one (unless there are more than one other enums doing the same pattern (which doesn't seem to be the case)). Thanks for the patch.

Quoted 33 lines

Silence this warning by explicitly casting to fscache_obj_ref_trace, which is also done in put_object.

---
 fs/cachefiles/namei.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
fs/cachefiles/namei.c +4 -3
index af2b17b21b94..15e5988a83de 100644
@@ -244,11 +244,13 @@ static int cachefiles_mark_object_active(struct cachefiles_cache *cache,
 
        ASSERT(!test_bit(CACHEFILES_OBJECT_ACTIVE, &xobject->flags));
 
-       cache->cache.ops->put_object(&xobject->fscache, cachefiles_obj_put_wait_retry);
+       cache->cache.ops->put_object(&xobject->fscache,
+               (enum fscache_obj_ref_trace)cachefiles_obj_put_wait_retry);
        goto try_again;
 
 requeue:
-       cache->cache.ops->put_object(&xobject->fscache, cachefiles_obj_put_wait_timeo);
+       cache->cache.ops->put_object(&xobject->fscache,
+               (enum fscache_obj_ref_trace)cachefiles_obj_put_wait_timeo);
        _leave(" = -ETIMEDOUT");
        return -ETIMEDOUT;
 }
--

2.19.0

Signature · 2 lines
Thanks,
~Nick Desaulniers
#2 lore raw
In reply to Nathan Chancellor
Quoted 40 lines · Nathan Chancellor

Clang warns when one enumerated type is implicitly converted to another.

fs/cachefiles/namei.c:247:50: warning: implicit conversion from enumeration type 'enum cachefiles_obj_ref_trace' to different enumeration type 'enum fscache_obj_ref_trace' [-Wenum-conversion]

        cache->cache.ops->put_object(&xobject->fscache,

cachefiles_obj_put_wait_retry);

Silence this warning by explicitly casting to fscache_obj_ref_trace, which is also done in put_object.

---
 fs/cachefiles/namei.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
fs/cachefiles/namei.c +4 -2
index af2b17b21b94..15e5988a83de 100644
@@ -244,11 +244,13 @@ static int cachefiles_mark_object_active(struct cachefiles_cache *cache,
 
 	ASSERT(!test_bit(CACHEFILES_OBJECT_ACTIVE, &xobject->flags));
 
-	cache->cache.ops->put_object(&xobject->fscache, cachefiles_obj_put_wait_retry);
+	cache->cache.ops->put_object(&xobject->fscache,
+		(enum fscache_obj_ref_trace)cachefiles_obj_put_wait_retry);
 	goto try_again;
 
 requeue:
-	cache->cache.ops->put_object(&xobject->fscache, cachefiles_obj_put_wait_timeo);
+	cache->cache.ops->put_object(&xobject->fscache,
+		(enum fscache_obj_ref_trace)cachefiles_obj_put_wait_timeo);
 	_leave(" = -ETIMEDOUT");
 	return -ETIMEDOUT;
 }
Signature · 1 line
2.19.0

Hi David,

Have you had a chance to take a look at this patch?

Thanks,
Nathan