Commit 18dd78c427513fb0f89365138be66e6ee8700d1b
Committed by
Trond Myklebust
1 parent
a497c3ba1d
Exists in
ti-lsk-linux-4.1.y
and in
10 other branches
nfs: Fix cache_validity check in nfs_write_pageuptodate()
NFS_INO_INVALID_DATA cannot be ignored, even if we have a delegation. We're still having some problems with data corruption when multiple clients are appending to a file and those clients are being granted write delegations on open. To reproduce: Client A: vi /mnt/`hostname -s` while :; do echo "XXXXXXXXXXXXXXX" >>/mnt/file; sleep $(( $RANDOM % 5 )); done Client B: vi /mnt/`hostname -s` while :; do echo "YYYYYYYYYYYYYYY" >>/mnt/file; sleep $(( $RANDOM % 5 )); done What's happening is that in nfs_update_inode() we're recognizing that the file size has changed and we're setting NFS_INO_INVALID_DATA accordingly, but then we ignore the cache_validity flags in nfs_write_pageuptodate() because we have a delegation. As a result, in nfs_updatepage() we're extending the write to cover the full page even though we've not read in the data to begin with. Signed-off-by: Scott Mayhew <smayhew@redhat.com> Cc: <stable@vger.kernel.org> # v3.11+ Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Showing 1 changed file with 3 additions and 1 deletions Side-by-side Diff
fs/nfs/write.c
... | ... | @@ -934,12 +934,14 @@ |
934 | 934 | |
935 | 935 | if (nfs_have_delegated_attributes(inode)) |
936 | 936 | goto out; |
937 | - if (nfsi->cache_validity & (NFS_INO_INVALID_DATA|NFS_INO_REVAL_PAGECACHE)) | |
937 | + if (nfsi->cache_validity & NFS_INO_REVAL_PAGECACHE) | |
938 | 938 | return false; |
939 | 939 | smp_rmb(); |
940 | 940 | if (test_bit(NFS_INO_INVALIDATING, &nfsi->flags)) |
941 | 941 | return false; |
942 | 942 | out: |
943 | + if (nfsi->cache_validity & NFS_INO_INVALID_DATA) | |
944 | + return false; | |
943 | 945 | return PageUptodate(page) != 0; |
944 | 946 | } |
945 | 947 |