Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 1e302a929e2da6e8448e2058e4b07b07252b57fe

Authored by Jonathan Brassow
Committed by Alasdair G Kergon
1 parent fee1998e9c
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

dm snapshot: move status to exception store 

Let the exception store types print out their status through
the new API, rather than having the snapshot code do it.

Adjust the buffer position to allow for the preceding DMEMIT in the
arguments to type->status().

Signed-off-by: Jonathan Brassow <jbrassow@redhat.com>
Signed-off-by: Alasdair G Kergon <agk@redhat.com>

Showing 4 changed files with 29 additions and 16 deletions Side-by-side Diff

drivers/md/dm-exception-store.h
Diff comments   View file @ 1e302a9
... ... @@ -79,8 +79,9 @@
79 79 */
80 80 void (*drop_snapshot) (struct dm_exception_store *store);
81 81  
82   - int (*status) (struct dm_exception_store *store, status_type_t status,
83   - char *result, unsigned int maxlen);
  82 + unsigned (*status) (struct dm_exception_store *store,
  83 + status_type_t status, char *result,
  84 + unsigned maxlen);
84 85  
85 86 /*
86 87 * Return how full the snapshot is.
drivers/md/dm-snap-persistent.c
Diff comments   View file @ 1e302a9
... ... @@ -688,11 +688,19 @@
688 688 return 0;
689 689 }
690 690  
691   -static int persistent_status(struct dm_exception_store *store,
692   - status_type_t status, char *result,
693   - unsigned int maxlen)
  691 +static unsigned persistent_status(struct dm_exception_store *store,
  692 + status_type_t status, char *result,
  693 + unsigned maxlen)
694 694 {
695   - int sz = 0;
  695 + unsigned sz = 0;
  696 +
  697 + switch (status) {
  698 + case STATUSTYPE_INFO:
  699 + break;
  700 + case STATUSTYPE_TABLE:
  701 + DMEMIT(" %s P %llu", store->cow->name,
  702 + (unsigned long long)store->chunk_size);
  703 + }
696 704  
697 705 return sz;
698 706 }
drivers/md/dm-snap-transient.c
Diff comments   View file @ 1e302a9
... ... @@ -81,11 +81,19 @@
81 81 return 0;
82 82 }
83 83  
84   -static int transient_status(struct dm_exception_store *store,
85   - status_type_t status, char *result,
86   - unsigned maxlen)
  84 +static unsigned transient_status(struct dm_exception_store *store,
  85 + status_type_t status, char *result,
  86 + unsigned maxlen)
87 87 {
88   - int sz = 0;
  88 + unsigned sz = 0;
  89 +
  90 + switch (status) {
  91 + case STATUSTYPE_INFO:
  92 + break;
  93 + case STATUSTYPE_TABLE:
  94 + DMEMIT(" %s N %llu", store->cow->name,
  95 + (unsigned long long)store->chunk_size);
  96 + }
89 97  
90 98 return sz;
91 99 }
drivers/md/dm-snap.c
Diff comments   View file @ 1e302a9
... ... @@ -70,9 +70,6 @@
70 70 /* Origin writes don't trigger exceptions until this is set */
71 71 int active;
72 72  
73   - /* Used for display of table */
74   - char type;
75   -
76 73 mempool_t *pending_pool;
77 74  
78 75 atomic_t pending_exceptions_count;
... ... @@ -1166,9 +1163,8 @@
1166 1163 * make sense.
1167 1164 */
1168 1165 DMEMIT("%s", snap->origin->name);
1169   - DMEMIT(" %s %s %llu", snap->store->cow->name,
1170   - snap->store->type->name,
1171   - (unsigned long long)snap->store->chunk_size);
  1166 + snap->store->type->status(snap->store, type, result + sz,
  1167 + maxlen - sz);
1172 1168 break;
1173 1169 }
1174 1170