lkml.org 
[lkml]   [2008]   [Aug]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 12/25] NFS: Ensure we zap only the access and acl caches when setting new acls
    2.6.26-stable review patch.  If anyone has any objections, please let us
    know.

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

    From: Trond Myklebust <Trond.Myklebust@netapp.com>

    commit f41f741838480aeaa3a189cff6e210503cf9c42d upstream

    ...and ensure that we obey the NFS_INO_INVALID_ACL flag when retrieving the
    acls.

    Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    fs/nfs/inode.c | 4 +---
    fs/nfs/internal.h | 1 +
    fs/nfs/nfs3acl.c | 9 ++++++---
    fs/nfs/nfs4proc.c | 5 ++++-
    4 files changed, 12 insertions(+), 7 deletions(-)

    --- a/fs/nfs/inode.c
    +++ b/fs/nfs/inode.c
    @@ -57,8 +57,6 @@ static int enable_ino64 = NFS_64_BIT_INO
    static void nfs_invalidate_inode(struct inode *);
    static int nfs_update_inode(struct inode *, struct nfs_fattr *);

    -static void nfs_zap_acl_cache(struct inode *);
    -
    static struct kmem_cache * nfs_inode_cachep;

    static inline unsigned long
    @@ -167,7 +165,7 @@ void nfs_zap_mapping(struct inode *inode
    }
    }

    -static void nfs_zap_acl_cache(struct inode *inode)
    +void nfs_zap_acl_cache(struct inode *inode)
    {
    void (*clear_acl_cache)(struct inode *);

    --- a/fs/nfs/internal.h
    +++ b/fs/nfs/internal.h
    @@ -150,6 +150,7 @@ extern void nfs_clear_inode(struct inode
    #ifdef CONFIG_NFS_V4
    extern void nfs4_clear_inode(struct inode *);
    #endif
    +void nfs_zap_acl_cache(struct inode *inode);

    /* super.c */
    extern struct file_system_type nfs_xdev_fs_type;
    --- a/fs/nfs/nfs3acl.c
    +++ b/fs/nfs/nfs3acl.c
    @@ -5,6 +5,8 @@
    #include <linux/posix_acl_xattr.h>
    #include <linux/nfsacl.h>

    +#include "internal.h"
    +
    #define NFSDBG_FACILITY NFSDBG_PROC

    ssize_t nfs3_listxattr(struct dentry *dentry, char *buffer, size_t size)
    @@ -205,6 +207,8 @@ struct posix_acl *nfs3_proc_getacl(struc
    status = nfs_revalidate_inode(server, inode);
    if (status < 0)
    return ERR_PTR(status);
    + if (NFS_I(inode)->cache_validity & NFS_INO_INVALID_ACL)
    + nfs_zap_acl_cache(inode);
    acl = nfs3_get_cached_acl(inode, type);
    if (acl != ERR_PTR(-EAGAIN))
    return acl;
    @@ -319,9 +323,8 @@ static int nfs3_proc_setacls(struct inod
    dprintk("NFS call setacl\n");
    msg.rpc_proc = &server->client_acl->cl_procinfo[ACLPROC3_SETACL];
    status = rpc_call_sync(server->client_acl, &msg, 0);
    - spin_lock(&inode->i_lock);
    - NFS_I(inode)->cache_validity |= NFS_INO_INVALID_ACCESS;
    - spin_unlock(&inode->i_lock);
    + nfs_access_zap_cache(inode);
    + nfs_zap_acl_cache(inode);
    dprintk("NFS reply setacl: %d\n", status);

    /* pages may have been allocated at the xdr layer. */
    --- a/fs/nfs/nfs4proc.c
    +++ b/fs/nfs/nfs4proc.c
    @@ -2706,6 +2706,8 @@ static ssize_t nfs4_proc_get_acl(struct
    ret = nfs_revalidate_inode(server, inode);
    if (ret < 0)
    return ret;
    + if (NFS_I(inode)->cache_validity & NFS_INO_INVALID_ACL)
    + nfs_zap_acl_cache(inode);
    ret = nfs4_read_cached_acl(inode, buf, buflen);
    if (ret != -ENOENT)
    return ret;
    @@ -2733,7 +2735,8 @@ static int __nfs4_proc_set_acl(struct in
    nfs_inode_return_delegation(inode);
    buf_to_pages(buf, buflen, arg.acl_pages, &arg.acl_pgbase);
    ret = rpc_call_sync(NFS_CLIENT(inode), &msg, 0);
    - nfs_zap_caches(inode);
    + nfs_access_zap_cache(inode);
    + nfs_zap_acl_cache(inode);
    return ret;
    }

    --


    \
     
     \ /
      Last update: 2008-08-04 23:43    [W:0.043 / U:0.536 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site