evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

NFSv4/pnfs: Ensure we don't miss a file extension

Browse source 
pNFS writes don't return attributes, however that doesn't mean that we
should ignore the fact that they may be extending the file. This patch
ensures that if a write is seen to extend the file, then we always set
an attribute barrier, and update the cached file size.

Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
This commit is contained in:
Trond Myklebust 2015-07-05 20:06:38 -04:00
parent 3c38cbe2ad
commit 2b83d3de4c
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
fs/nfs/write.c
View file

@ -1378,24 +1378,27 @@ static void nfs_writeback_check_extend(struct nfs_pgio_header *hdr,
{ {
struct nfs_pgio_args *argp = &hdr->args; struct nfs_pgio_args *argp = &hdr->args;
struct nfs_pgio_res *resp = &hdr->res; struct nfs_pgio_res *resp = &hdr->res;
u64 size = argp->offset + resp->count;
if (!(fattr->valid & NFS_ATTR_FATTR_SIZE)) if (!(fattr->valid & NFS_ATTR_FATTR_SIZE))
fattr->size = size;
if (nfs_size_to_loff_t(fattr->size) < i_size_read(hdr->inode)) {
fattr->valid &= ~NFS_ATTR_FATTR_SIZE;
return; return;
if (argp->offset + resp->count != fattr->size) }
return; if (size != fattr->size)
if (nfs_size_to_loff_t(fattr->size) < i_size_read(hdr->inode))
return; return;
/* Set attribute barrier */ /* Set attribute barrier */
nfs_fattr_set_barrier(fattr); nfs_fattr_set_barrier(fattr);
/* ...and update size */
fattr->valid |= NFS_ATTR_FATTR_SIZE;
} }
void nfs_writeback_update_inode(struct nfs_pgio_header *hdr) void nfs_writeback_update_inode(struct nfs_pgio_header *hdr)
{ {
struct nfs_fattr *fattr = hdr->res.fattr; struct nfs_fattr *fattr = &hdr->fattr;
struct inode *inode = hdr->inode; struct inode *inode = hdr->inode;
if (fattr == NULL)
return;
spin_lock(&inode->i_lock); spin_lock(&inode->i_lock);
nfs_writeback_check_extend(hdr, fattr); nfs_writeback_check_extend(hdr, fattr);
nfs_post_op_update_inode_force_wcc_locked(inode, fattr); nfs_post_op_update_inode_force_wcc_locked(inode, fattr);