aboutsummaryrefslogtreecommitdiffstats
path: root/module/zfs
diff options
context:
space:
mode:
authorBrian Behlendorf <[email protected]>2010-08-26 10:18:06 -0700
committerBrian Behlendorf <[email protected]>2010-08-31 08:38:44 -0700
commit5631c038895ea97fde261831887226ee56d06dd5 (patch)
treeb6d5d08d6a05e58b6cb7ce361ae04cfef3f5d2f7 /module/zfs
parent090ff0929ec7a2e2e65efaaddb9981d15964f7d9 (diff)
Fix variables named current
In the linux kernel 'current' is defined to mean the current process and can never be used as a local variable in a function. Simply replace all usage of 'current' with 'curr' in this function. Signed-off-by: Brian Behlendorf <[email protected]>
Diffstat (limited to 'module/zfs')
-rw-r--r--module/zfs/vdev_raidz.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/module/zfs/vdev_raidz.c b/module/zfs/vdev_raidz.c
index ef2054233..b987ac40b 100644
--- a/module/zfs/vdev_raidz.c
+++ b/module/zfs/vdev_raidz.c
@@ -1719,7 +1719,7 @@ vdev_raidz_combrec(zio_t *zio, int total_errors, int data_errors)
void *orig[VDEV_RAIDZ_MAXPARITY];
int tstore[VDEV_RAIDZ_MAXPARITY + 2];
int *tgts = &tstore[1];
- int current, next, i, c, n;
+ int curr, next, i, c, n;
int code, ret = 0;
ASSERT(total_errors < rm->rm_firstdatacol);
@@ -1767,12 +1767,12 @@ vdev_raidz_combrec(zio_t *zio, int total_errors, int data_errors)
orig[n - 1] = zio_buf_alloc(rm->rm_col[0].rc_size);
- current = 0;
- next = tgts[current];
+ curr = 0;
+ next = tgts[curr];
- while (current != n) {
- tgts[current] = next;
- current = 0;
+ while (curr != n) {
+ tgts[curr] = next;
+ curr = 0;
/*
* Save off the original data that we're going to
@@ -1820,34 +1820,34 @@ vdev_raidz_combrec(zio_t *zio, int total_errors, int data_errors)
do {
/*
- * Find the next valid column after the current
+ * Find the next valid column after the curr
* position..
*/
- for (next = tgts[current] + 1;
+ for (next = tgts[curr] + 1;
next < rm->rm_cols &&
rm->rm_col[next].rc_error != 0; next++)
continue;
- ASSERT(next <= tgts[current + 1]);
+ ASSERT(next <= tgts[curr + 1]);
/*
* If that spot is available, we're done here.
*/
- if (next != tgts[current + 1])
+ if (next != tgts[curr + 1])
break;
/*
* Otherwise, find the next valid column after
* the previous position.
*/
- for (c = tgts[current - 1] + 1;
+ for (c = tgts[curr - 1] + 1;
rm->rm_col[c].rc_error != 0; c++)
continue;
- tgts[current] = c;
- current++;
+ tgts[curr] = c;
+ curr++;
- } while (current != n);
+ } while (curr != n);
}
}
n--;