lkml.org 
[lkml]   [2006]   [Jul]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 14/30] NFS: Make better use of inode* dereferencing macros [try #11]
    Date
    Make better use of inode* dereferencing macros to hide dereferencing chains
    (including NFS_PROTO and NFS_CLIENT).

    Signed-Off-By: David Howells <dhowells@redhat.com>
    Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
    ---

    fs/nfs/file.c | 2 +-
    fs/nfs/nfs4proc.c | 10 +++++-----
    2 files changed, 6 insertions(+), 6 deletions(-)

    diff --git a/fs/nfs/file.c b/fs/nfs/file.c
    index cc2b874..52f161d 100644
    --- a/fs/nfs/file.c
    +++ b/fs/nfs/file.c
    @@ -111,7 +111,7 @@ nfs_file_open(struct inode *inode, struc

    nfs_inc_stats(inode, NFSIOS_VFSOPEN);
    lock_kernel();
    - res = NFS_SERVER(inode)->rpc_ops->file_open(inode, filp);
    + res = NFS_PROTO(inode)->file_open(inode, filp);
    unlock_kernel();
    return res;
    }
    diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
    index a3adfb1..74b9163 100644
    --- a/fs/nfs/nfs4proc.c
    +++ b/fs/nfs/nfs4proc.c
    @@ -1268,7 +1268,7 @@ nfs4_atomic_open(struct inode *dir, stru
    BUG_ON(nd->intent.open.flags & O_CREAT);
    }

    - cred = rpcauth_lookupcred(NFS_SERVER(dir)->client->cl_auth, 0);
    + cred = rpcauth_lookupcred(NFS_CLIENT(dir)->cl_auth, 0);
    if (IS_ERR(cred))
    return (struct dentry *)cred;
    state = nfs4_do_open(dir, dentry, nd->intent.open.flags, &attr, cred);
    @@ -1291,7 +1291,7 @@ nfs4_open_revalidate(struct inode *dir,
    struct rpc_cred *cred;
    struct nfs4_state *state;

    - cred = rpcauth_lookupcred(NFS_SERVER(dir)->client->cl_auth, 0);
    + cred = rpcauth_lookupcred(NFS_CLIENT(dir)->cl_auth, 0);
    if (IS_ERR(cred))
    return PTR_ERR(cred);
    state = nfs4_open_delegated(dentry->d_inode, openflags, cred);
    @@ -1565,7 +1565,7 @@ nfs4_proc_setattr(struct dentry *dentry,

    nfs_fattr_init(fattr);

    - cred = rpcauth_lookupcred(NFS_SERVER(inode)->client->cl_auth, 0);
    + cred = rpcauth_lookupcred(NFS_CLIENT(inode)->cl_auth, 0);
    if (IS_ERR(cred))
    return PTR_ERR(cred);

    @@ -1927,7 +1927,7 @@ nfs4_proc_create(struct inode *dir, stru
    struct rpc_cred *cred;
    int status = 0;

    - cred = rpcauth_lookupcred(NFS_SERVER(dir)->client->cl_auth, 0);
    + cred = rpcauth_lookupcred(NFS_CLIENT(dir)->cl_auth, 0);
    if (IS_ERR(cred)) {
    status = PTR_ERR(cred);
    goto out;
    @@ -2803,7 +2803,7 @@ static int nfs4_proc_set_acl(struct inod
    return -EOPNOTSUPP;
    nfs_inode_return_delegation(inode);
    buf_to_pages(buf, buflen, arg.acl_pages, &arg.acl_pgbase);
    - ret = rpc_call_sync(NFS_SERVER(inode)->client, &msg, 0);
    + ret = rpc_call_sync(NFS_CLIENT(inode), &msg, 0);
    if (ret == 0)
    nfs4_write_cached_acl(inode, buf, buflen);
    return ret;
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/
    \
     
     \ /
      Last update: 2006-07-27 23:09    [W:0.044 / U:148.560 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site