sorry, the link should be http://www.spinics.net/lists/linux-nfs/msg21586.html On 6/8/11, Peng Tao <bergwolf@xxxxxxxxx> wrote: > On 6/8/11, Benny Halevy <bhalevy@xxxxxxxxxxx> wrote: >> Better send generic patches separately. >> This patch needs to go upstream and to stable 2.6.39 > It has been sent separately before. please see > http://www.spinics.net/list/linux-nfs/msg21586.html > >> >> Benny >> >> On 2011-06-07 13:36, Jim Rees wrote: >>> From: Peng Tao <bergwolf@xxxxxxxxx> >>> >>> Layout commit is supposed to set server file size similiar to nfs pages. >>> We should not update client file size for the same reason. >>> Otherwise we will lose what we have at hand. >>> >>> Signed-off-by: Peng Tao <peng_tao@xxxxxxx> >>> Signed-off-by: Jim Rees <rees@xxxxxxxxx> >>> --- >>> fs/nfs/inode.c | 3 ++- >>> 1 files changed, 2 insertions(+), 1 deletions(-) >>> >>> diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c >>> index 144f2a3..3f1eb81 100644 >>> --- a/fs/nfs/inode.c >>> +++ b/fs/nfs/inode.c >>> @@ -1294,7 +1294,8 @@ static int nfs_update_inode(struct inode *inode, >>> struct nfs_fattr *fattr) >>> 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; >>> } >> -- >> To unsubscribe from this list: send the line "unsubscribe linux-nfs" in >> the body of a message to majordomo@xxxxxxxxxxxxxxx >> More majordomo info at http://vger.kernel.org/majordomo-info.html >> > > > -- > Thanks, > -Bergwolf > -- Thanks, -Bergwolf -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
