lkml.org 
[lkml]   [2018]   [Dec]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 118/142] cachefiles: Explicitly cast enumerated type in put_object
    Date
    4.19-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    [ Upstream commit b7e768b7e3522695ed36dcb48ecdcd344bd30a9b ]

    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.

    Reported-by: Nick Desaulniers <ndesaulniers@google.com>
    Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
    Signed-off-by: David Howells <dhowells@redhat.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    fs/cachefiles/namei.c | 6 ++++--
    1 file changed, 4 insertions(+), 2 deletions(-)

    diff --git a/fs/cachefiles/namei.c b/fs/cachefiles/namei.c
    index 95983c744164..5ab411d4bc59 100644
    --- a/fs/cachefiles/namei.c
    +++ b/fs/cachefiles/namei.c
    @@ -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.1


    \
     
     \ /
      Last update: 2018-12-14 13:37    [W:2.423 / U:0.064 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site