hc
2024-01-05 071106ecf68c401173c58808b1cf5f68cc50d390
kernel/drivers/md/dm-snap-persistent.c
....@@ -252,7 +252,7 @@
252252
253253 /*
254254 * Issue the synchronous I/O from a different thread
255
- * to avoid generic_make_request recursion.
255
+ * to avoid submit_bio_noacct recursion.
256256 */
257257 INIT_WORK_ONSTACK(&req.work, do_metadata);
258258 queue_work(ps->metadata_wq, &req.work);
....@@ -284,16 +284,9 @@
284284 */
285285 static int area_io(struct pstore *ps, int op, int op_flags)
286286 {
287
- int r;
288
- chunk_t chunk;
287
+ chunk_t chunk = area_location(ps, ps->current_area);
289288
290
- chunk = area_location(ps, ps->current_area);
291
-
292
- r = chunk_io(ps, ps->area, chunk, op, op_flags, 0);
293
- if (r)
294
- return r;
295
-
296
- return 0;
289
+ return chunk_io(ps, ps->area, chunk, op, op_flags, 0);
297290 }
298291
299292 static void zero_memory_area(struct pstore *ps)
....@@ -613,7 +606,7 @@
613606 chunk_t old, chunk_t new),
614607 void *callback_context)
615608 {
616
- int r, uninitialized_var(new_snapshot);
609
+ int r, new_snapshot;
617610 struct pstore *ps = get_info(store);
618611
619612 /*