lscp: always show snapshots, even if marked minor

When the average user types lscp and doesn't see the snapshot they just tried to make, it can be very confusing. Add an additional check to ensure snapshots are never omitted from lscp output.

Signed-off-by Dan McGee <dan-fd97jBR+K/[email protected]>

---

Thoughts? I notice this quite often due to a "snapshot-on-shutdown" job I have running on my machine, and it is very odd to not see this snapshot listed next time I boot up and run lscp -r | less.

 bin/lscp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

bin/lscp.c +0 -0

index 2de81b6..6803657 100644

Quoted 19 lines · Dan McGee

When the average user types lscp and doesn't see the snapshot they just tried to make, it can be very confusing. Add an additional check to ensure snapshots are never omitted from lscp output.

Signed-off-by Dan McGee <dan-fd97jBR+K/[email protected]>

---

Thoughts? I notice this quite often due to a "snapshot-on-shutdown" job I have running on my machine, and it is very odd to not see this snapshot listed next time I boot up and run lscp -r | less.

 bin/lscp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

bin/lscp.c +0 -0

index 2de81b6..6803657 100644

bin/lscp.c static int lscp_forward_cpinfo(struct nilfs *nilfs, · line 165

Quoted 8 lines

bin/lscp.c +1 -1

@@ -159,7 +159,7 @@ static int lscp_forward_cpinfo(struct nilfs *nilfs,
 			break;
 
 		for (cpi = cpinfos; cpi < cpinfos + n; cpi++) {
-			if (show_all || !nilfs_cpinfo_minor(cpi)) {
+			if (show_all || nilfs_cpinfo_snapshot(cpi) || !nilfs_cpinfo_minor(cpi)) {
 				lscp_print_cpinfo(cpi);
 				rest--;
 			}

"lscp -r" still doesn't show snapshots on minor checkpoints. The same change looks to be needed for lscp_backward_cpinfo().

Also, this patch suffered a checkpatch warning:

 $ scripts/checkpatch.pl ~/lscp-always-show-snapshots-even-if-marked-minor.patch
 WARNING: line over 80 characters
 #75: FILE: bin/lscp.c:162:
 +		if (show_all || nilfs_cpinfo_snapshot(cpi) || !nilfs_cpinfo_minor(cpi)) {

total: 0 errors, 1 warnings, 8 lines checked