From: NeilBrown <neilb@suse.de>
Date: Sat, 14 Aug 2010 10:08:53 +0000 (+1000)
Subject: Give to_clean.ss a meaningful name.
X-Git-Url: http://git.neil.brown.name/?a=commitdiff_plain;h=4bd2f0832cc4ed07f65dbc66f1604b03823328fb;p=LaFS.git

Give to_clean.ss a meaningful name.

It is a flag set when we have a valid segment address.

Signed-off-by: NeilBrown <neilb@suse.de>
---

diff --git a/clean.c b/clean.c
index 8df9ce2..7cff7c3 100644
--- a/clean.c
+++ b/clean.c
@@ -146,7 +146,7 @@ static int try_clean(struct fs *fs, struct toclean *tc)
 
 	mutex_lock(&fs->cleaner.lock);
 	dprintk("try_clean: state = %d\n", tc->ac.state);
-	if (tc->ch == NULL && tc->ss) {
+	if (tc->ch == NULL && tc->have_addr) {
 		/* Need to read in the cluster header */
 		int err;
 		err = lafs_load_page_async(fs, tc->chead,
@@ -163,7 +163,7 @@ static int try_clean(struct fs *fs, struct toclean *tc)
 			// FIXME adjust youth to so as not to touch this again
 		bad_header:
 			tc->ac.state = 0;
-			tc->ss = 0;
+			tc->have_addr = 0;
 			rv = 0;
 			goto out;
 		}
@@ -209,7 +209,7 @@ static int try_clean(struct fs *fs, struct toclean *tc)
 				tc->ac.state = 1;
 			} else {
 				tc->ac.state = 0;
-				tc->ss = 0;
+				tc->have_addr = 0;
 			}
 			tc->ch = NULL;
 			lafs_wake_thread(fs);
@@ -402,7 +402,7 @@ static int try_clean(struct fs *fs, struct toclean *tc)
 		if (rv)
 			goto out;
 	}
-	rv = tc->ch == NULL && tc->ss == 0 &&
+	rv = tc->ch == NULL && !tc->have_addr &&
 		list_empty(&tc->cleaning);
 out:
 	mutex_unlock(&fs->cleaner.lock);
@@ -542,8 +542,8 @@ unsigned long lafs_do_clean(struct fs *fs)
 				continue;
 
 			/* OK, we are good to keep cleaning */
-			tc->ss = lafs_get_cleanable(fs, &tc->dev, &tc->seg);
-			if (!tc->ss) {
+			tc->have_addr = lafs_get_cleanable(fs, &tc->dev, &tc->seg);
+			if (!tc->have_addr) {
 				dprintk("CLEANER: Nothing found to clean at %d :-(\n",
 					i);
 				break;
@@ -567,7 +567,7 @@ unsigned long lafs_do_clean(struct fs *fs)
 		int doflush = 1;
 		for (i = 0; i < 4 ; i++) {
 			struct toclean *tc = &fs->cleaner.seg[i];
-			if (tc->ss || !list_empty(&tc->cleaning)) {
+			if (tc->have_addr || !list_empty(&tc->cleaning)) {
 				/* Might be something to do here */
 				int done = try_clean(fs, tc);
 				if (done < 0)
diff --git a/state.h b/state.h
index a82418a..f0be1d3 100644
--- a/state.h
+++ b/state.h
@@ -135,7 +135,7 @@ struct fs {
 						   3=loaded, 4 = ioerror */
 				struct fs *fs;
 			} ac;
-			int ss;	/* true if dev/seg are value */
+			int have_addr;	/* true if dev/seg are valid */
 			struct list_head cleaning;
 			struct page *chead;
 		} seg[4];