aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTrond Myklebust <trond.myklebust@primarydata.com>2015-12-30 10:57:01 -0500
committerTrond Myklebust <trond.myklebust@primarydata.com>2015-12-30 10:57:01 -0500
commit86fb449b07b8215443a30782dca5755d5b8b0577 (patch)
tree3e23f1984b6c71a23a2cb68d4fc15e62a5aadb0c
parentade14a7df796d4e86bd9d181193c883a57b13db0 (diff)
pNFS/flexfiles: Fix an Oopsable typo in ff_mirror_match_fh()
Jeff reports seeing an Oops in ff_layout_alloc_lseg. Turns out copy+paste has played cruel tricks on a nested loop. Reported-by: Jeff Layton <jeff.layton@primarydata.com> Cc: stable@vger.kernel.org # 4.3+ Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
-rw-r--r--fs/nfs/flexfilelayout/flexfilelayout.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/flexfilelayout/flexfilelayout.c b/fs/nfs/flexfilelayout/flexfilelayout.c
index 03516c80855a..405f46ba490e 100644
--- a/fs/nfs/flexfilelayout/flexfilelayout.c
+++ b/fs/nfs/flexfilelayout/flexfilelayout.c
@@ -145,7 +145,7 @@ static bool ff_mirror_match_fh(const struct nfs4_ff_layout_mirror *m1,
145 return false; 145 return false;
146 for (i = 0; i < m1->fh_versions_cnt; i++) { 146 for (i = 0; i < m1->fh_versions_cnt; i++) {
147 bool found_fh = false; 147 bool found_fh = false;
148 for (j = 0; j < m2->fh_versions_cnt; i++) { 148 for (j = 0; j < m2->fh_versions_cnt; j++) {
149 if (nfs_compare_fh(&m1->fh_versions[i], 149 if (nfs_compare_fh(&m1->fh_versions[i],
150 &m2->fh_versions[j]) == 0) { 150 &m2->fh_versions[j]) == 0) {
151 found_fh = true; 151 found_fh = true;