projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1ccbad9
)
nfs: remove WARN_ON_ONCE from nfs_direct_good_bytes
author
Peng Tao
<
[email protected]
>
Thu, 9 Apr 2015 15:02:17 +0000
(23:02 +0800)
committer
Trond Myklebust
<
[email protected]
>
Thu, 23 Apr 2015 19:05:19 +0000
(15:05 -0400)
For flexfiles driver, we might choose to read from mirror index other
than 0 while mirror_count is always 1 for read.
Reported-by: Jean Spector <
[email protected]
>
Cc: <
[email protected]
> # v3.19+
Cc: Weston Andros Adamson <
[email protected]
>
Signed-off-by: Peng Tao <
[email protected]
>
Signed-off-by: Trond Myklebust <
[email protected]
>
fs/nfs/direct.c
patch
|
blob
|
history
diff --git
a/fs/nfs/direct.c
b/fs/nfs/direct.c
index e97a67e40b48e0ceed6b13a286a82dabf4921b72..eeb52b434e6fb0e40ed81a905e1574968d395858 100644
(file)
--- a/
fs/nfs/direct.c
+++ b/
fs/nfs/direct.c
@@
-129,8
+129,6
@@
nfs_direct_good_bytes(struct nfs_direct_req *dreq, struct nfs_pgio_header *hdr)
int i;
ssize_t count;
- WARN_ON_ONCE(hdr->pgio_mirror_idx >= dreq->mirror_count);
-
if (dreq->mirror_count == 1) {
dreq->mirrors[hdr->pgio_mirror_idx].count += hdr->good_bytes;
dreq->count += hdr->good_bytes;