diff options
| author | Weston Andros Adamson <dros@primarydata.com> | 2014-10-01 18:58:25 +0200 |
|---|---|---|
| committer | Tom Haynes <loghyr@primarydata.com> | 2015-02-03 20:06:46 +0100 |
| commit | 80c76fe314c2859d5aac94b5d66d2b9895aa73d4 (patch) | |
| tree | d816f0646dda34dabf183fe1f61954dba340d1be /fs/nfs/direct.c | |
| parent | nfs: mirroring support for direct io (diff) | |
| download | linux-80c76fe314c2859d5aac94b5d66d2b9895aa73d4.tar.xz linux-80c76fe314c2859d5aac94b5d66d2b9895aa73d4.zip | |
pnfs: fail comparison when bucket verifier not set
This skips the WARN_ON_ONCE, but doesnt change behavior (the memcmp would
fail).
Signed-off-by: Weston Andros Adamson <dros@primarydata.com>
Signed-off-by: Tom Haynes <Thomas.Haynes@primarydata.com>
Diffstat (limited to '')
| -rw-r--r-- | fs/nfs/direct.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c index 651387bbfd9f..eb814789f700 100644 --- a/fs/nfs/direct.c +++ b/fs/nfs/direct.c @@ -222,7 +222,11 @@ static int nfs_direct_cmp_commit_data_verf(struct nfs_direct_req *dreq, verfp = nfs_direct_select_verf(dreq, data->ds_clp, data->ds_commit_index); - WARN_ON_ONCE(verfp->committed < 0); + + /* verifier not set so always fail */ + if (verfp->committed < 0) + return 1; + return memcmp(verfp, &data->verf, sizeof(struct nfs_writeverf)); } |