lkml.org 
[lkml]   [2021]   [Oct]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[PATCH 41/67] afs: Render cache cookie key as big endian
    From
    Date
    Render the parts of the cookie key for an afs inode cookie as big endian.

    Signed-off-by: David Howells <dhowells@redhat.com>
    cc: Marc Dionne <marc.dionne@auristor.com>
    cc: linux-afs@lists.infradead.org
    ---

    fs/afs/file.c | 2 +-
    fs/afs/inode.c | 16 ++++++++--------
    fs/afs/internal.h | 8 +++++++-
    3 files changed, 16 insertions(+), 10 deletions(-)

    diff --git a/fs/afs/file.c b/fs/afs/file.c
    index b4666da93b54..5e29d433960d 100644
    --- a/fs/afs/file.c
    +++ b/fs/afs/file.c
    @@ -189,7 +189,7 @@ int afs_release(struct inode *inode, struct file *file)

    if ((file->f_mode & FMODE_WRITE)) {
    i_size = i_size_read(&vnode->vfs_inode);
    - aux.data_version = vnode->status.data_version;
    + afs_set_cache_aux(vnode, &aux);
    fscache_unuse_cookie(afs_vnode_cache(vnode), &aux, &i_size);
    } else {
    fscache_unuse_cookie(afs_vnode_cache(vnode), NULL, NULL);
    diff --git a/fs/afs/inode.c b/fs/afs/inode.c
    index c21c1352b149..842570e4470f 100644
    --- a/fs/afs/inode.c
    +++ b/fs/afs/inode.c
    @@ -413,9 +413,9 @@ static void afs_get_inode_cache(struct afs_vnode *vnode)
    {
    #ifdef CONFIG_AFS_FSCACHE
    struct {
    - u32 vnode_id;
    - u32 unique;
    - u32 vnode_id_ext[2]; /* Allow for a 96-bit key */
    + __be32 vnode_id;
    + __be32 unique;
    + __be32 vnode_id_ext[2]; /* Allow for a 96-bit key */
    } __packed key;
    struct afs_vnode_cache_aux aux;

    @@ -424,11 +424,11 @@ static void afs_get_inode_cache(struct afs_vnode *vnode)
    return;
    }

    - key.vnode_id = vnode->fid.vnode;
    - key.unique = vnode->fid.unique;
    - key.vnode_id_ext[0] = vnode->fid.vnode >> 32;
    - key.vnode_id_ext[1] = vnode->fid.vnode_hi;
    - aux.data_version = vnode->status.data_version;
    + key.vnode_id = htonl(vnode->fid.vnode);
    + key.unique = htonl(vnode->fid.unique);
    + key.vnode_id_ext[0] = htonl(vnode->fid.vnode >> 32);
    + key.vnode_id_ext[1] = htonl(vnode->fid.vnode_hi);
    + afs_set_cache_aux(vnode, &aux);

    vnode->cache = fscache_acquire_cookie(
    vnode->volume->cache,
    diff --git a/fs/afs/internal.h b/fs/afs/internal.h
    index 8e168c3fa5d1..3180ba6bd46d 100644
    --- a/fs/afs/internal.h
    +++ b/fs/afs/internal.h
    @@ -869,9 +869,15 @@ struct afs_operation {
    * Cache auxiliary data.
    */
    struct afs_vnode_cache_aux {
    - u64 data_version;
    + __be64 data_version;
    } __packed;

    +static inline void afs_set_cache_aux(struct afs_vnode *vnode,
    + struct afs_vnode_cache_aux *aux)
    +{
    + aux->data_version = cpu_to_be64(vnode->status.data_version);
    +}
    +
    /*
    * We use page->private to hold the amount of the page that we've written to,
    * splitting the field into two parts. However, we need to represent a range

    \
     
     \ /
      Last update: 2021-10-18 17:04    [W:4.512 / U:0.432 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site