lkml.org 
[lkml]   [2011]   [Jul]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[055/107] NFS41: do not update isize if inode needs layoutcommit
    2.6.39-stable review patch.  If anyone has any objections, please let us know.

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

    From: Peng Tao <bergwolf@gmail.com>

    commit 0f66b5984df2fe1617c05900a39a7ef493ca9de9 upstream.

    nfs_update_inode will update isize if there is no queued pages. For pNFS,
    layoutcommit is supposed to change file size on server, the same effect as queued
    pages. nfs_update_inode may be called when dirty pages are written back (nfsi->npages==0)
    but layoutcommit is not sent, and it will change client file size according to server
    file size. Then client ends up losing what it just writes back in pNFS path.
    So we should skip updating client file size if file needs layoutcommit.

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

    ---
    fs/nfs/inode.c | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    --- a/fs/nfs/inode.c
    +++ b/fs/nfs/inode.c
    @@ -1294,7 +1294,8 @@ static int nfs_update_inode(struct inode
    if (new_isize != cur_isize) {
    /* Do we perhaps have any outstanding writes, or has
    * the file grown beyond our last write? */
    - if (nfsi->npages == 0 || new_isize > cur_isize) {
    + if ((nfsi->npages == 0 && !test_bit(NFS_INO_LAYOUTCOMMIT, &nfsi->flags)) ||
    + new_isize > cur_isize) {
    i_size_write(inode, new_isize);
    invalid |= NFS_INO_INVALID_ATTR|NFS_INO_INVALID_DATA;
    }



    \
     
     \ /
      Last update: 2011-07-08 07:15    [W:0.020 / U:1.972 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site