On Wed, 03 Sep 2014 02:30:57 +0900 (JST), Ryusuke Konishi wrote:
> On Mon, 1 Sep 2014 14:48:46 -0500, Dan McGee wrote:
>> 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@xxxxxxxxxxxxx>
>> ---
>>
>> 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(-)
>>
>> diff --git a/bin/lscp.c b/bin/lscp.c
>> index 2de81b6..6803657 100644
>> --- a/bin/lscp.c
>> +++ b/bin/lscp.c
>> @@ -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
I merged this patch anyway fixing the above checkpatch warning, and
added a complemental change to apply the same change for the reverse
mode ("lscp -r").
Regards,
Ryusuke Konishi
--
To unsubscribe from this list: send the line "unsubscribe linux-nilfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
