lkml.org 
[lkml]   [2011]   [Jul]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patches in this message
    /
    Date
    From
    Subjectlinux-next: build failure after merge of the vfs tree
    Hi Al,

    After merging the vfs tree, today's linux-next build (powerpc
    ppc64_defconfig) failed like this:

    fs/nfs/read.c: In function 'nfs_do_read':
    fs/nfs/read.c:246:42: error: 'struct nfs_open_context' has no member named 'path'

    Caused by commit 6e4efd568574 ("NFS: Clean up nfs_read_rpcsetup and
    nfs_write_rpcsetup") from the nfs tree interacting with commit
    b98aad31afdc ("nfs_open_context doesn't need struct path either").

    I have applied the following merge fixup patch:

    From: Stephen Rothwell <sfr@canb.auug.org.au>
    Date: Sat, 16 Jul 2011 16:32:06 +1000
    Subject: [PATCH] vfs/nfs: fixup for nfs_open_context change

    Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
    ---
    fs/nfs/read.c | 2 +-
    1 files changed, 1 insertions(+), 1 deletions(-)

    diff --git a/fs/nfs/read.c b/fs/nfs/read.c
    index 3170712..2171c04 100644
    --- a/fs/nfs/read.c
    +++ b/fs/nfs/read.c
    @@ -243,7 +243,7 @@ static void nfs_read_rpcsetup(struct nfs_page *req, struct nfs_read_data *data,
    static int nfs_do_read(struct nfs_read_data *data,
    const struct rpc_call_ops *call_ops)
    {
    - struct inode *inode = data->args.context->path.dentry->d_inode;
    + struct inode *inode = data->args.context->dentry->d_inode;

    return nfs_initiate_read(data, NFS_CLIENT(inode), call_ops);
    }
    --
    1.7.5.4
    I then got:

    fs/nfs/write.c: In function 'nfs_do_write':
    fs/nfs/write.c:892:42: error: 'struct nfs_open_context' has no member named 'path'

    So I added the following patch as well:

    From: Stephen Rothwell <sfr@canb.auug.org.au>
    Date: Sat, 16 Jul 2011 16:39:22 +1000
    Subject: [PATCH] vfs/nfs: another fixup for nfs_open_context change

    Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
    ---
    fs/nfs/write.c | 2 +-
    1 files changed, 1 insertions(+), 1 deletions(-)
    diff --git a/fs/nfs/write.c b/fs/nfs/write.c
    index 2d2c773..ebed518 100644
    --- a/fs/nfs/write.c
    +++ b/fs/nfs/write.c
    @@ -889,7 +889,7 @@ static int nfs_do_write(struct nfs_write_data *data,
    const struct rpc_call_ops *call_ops,
    int how)
    {
    - struct inode *inode = data->args.context->path.dentry->d_inode;
    + struct inode *inode = data->args.context->dentry->d_inode;

    return nfs_initiate_write(data, NFS_CLIENT(inode), call_ops, how);
    }
    --
    1.7.5.4
    --
    Cheers,
    Stephen Rothwell sfr@canb.auug.org.au
    http://www.canb.auug.org.au/~sfr/


    \
     
     \ /
      Last update: 2011-07-16 14:41    [W:0.027 / U:2.720 seconds]
    ©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site