lkml.org 
[lkml]   [2012]   [Oct]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[ 03/76] NFS41: fix error of setting blocklayoutdriver
    Date
    3.6-stable review patch.  If anyone has any objections, please let me know.

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

    From: Peng Tao <bergwolf@gmail.com>

    commit dc182549d439f60c332bf74d7f220a1bccf37da6 upstream.

    After commit e38eb650 (NFS: set_pnfs_layoutdriver() from
    nfs4_proc_fsinfo()), set_pnfs_layoutdriver() is called inside
    nfs4_proc_fsinfo(), but pnfs_blksize is not set. It causes setting
    blocklayoutdriver failure and pnfsblock mount failure.

    Signed-off-by: Peng Tao <tao.peng@emc.com>
    Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    fs/nfs/client.c | 1 -
    fs/nfs/nfs4proc.c | 5 ++++-
    2 files changed, 4 insertions(+), 2 deletions(-)

    --- a/fs/nfs/client.c
    +++ b/fs/nfs/client.c
    @@ -855,7 +855,6 @@ static void nfs_server_set_fsinfo(struct
    if (server->wsize > NFS_MAX_FILE_IO_SIZE)
    server->wsize = NFS_MAX_FILE_IO_SIZE;
    server->wpages = (server->wsize + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT;
    - server->pnfs_blksize = fsinfo->blksize;

    server->wtmult = nfs_block_bits(fsinfo->wtmult, NULL);

    --- a/fs/nfs/nfs4proc.c
    +++ b/fs/nfs/nfs4proc.c
    @@ -3362,8 +3362,11 @@ static int nfs4_proc_fsinfo(struct nfs_s

    nfs_fattr_init(fsinfo->fattr);
    error = nfs4_do_fsinfo(server, fhandle, fsinfo);
    - if (error == 0)
    + if (error == 0) {
    + /* block layout checks this! */
    + server->pnfs_blksize = fsinfo->blksize;
    set_pnfs_layoutdriver(server, fhandle, fsinfo->layouttype);
    + }

    return error;
    }



    \
     
     \ /
      Last update: 2012-10-19 06:21    [W:4.212 / U:0.164 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site