qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
To: qemu-block@nongnu.org
Cc: qemu-devel@nongnu.org, armbru@redhat.com, fam@euphon.net,
	stefanha@redhat.com, vsementsov@virtuozzo.com, jsnow@redhat.com,
	mreitz@redhat.com, kwolf@redhat.com
Subject: [PATCH v3 32/36] block: inline bdrv_check_perm_common()
Date: Wed, 17 Mar 2021 17:35:25 +0300	[thread overview]
Message-ID: <20210317143529.615584-33-vsementsov@virtuozzo.com> (raw)
In-Reply-To: <20210317143529.615584-1-vsementsov@virtuozzo.com>

bdrv_check_perm_common() has only one caller, so no more sense in
"common".

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
---
 block.c | 32 +++-----------------------------
 1 file changed, 3 insertions(+), 29 deletions(-)

diff --git a/block.c b/block.c
index b39e6455b2..29e00c4708 100644
--- a/block.c
+++ b/block.c
@@ -2339,33 +2339,13 @@ static int bdrv_node_check_perm(BlockDriverState *bs, BlockReopenQueue *q,
     return 0;
 }
 
-/*
- * If use_cumulative_perms is true, use cumulative_perms and
- * cumulative_shared_perms for first element of the list. Otherwise just refresh
- * all permissions.
- */
-static int bdrv_check_perm_common(GSList *list, BlockReopenQueue *q,
-                                  bool use_cumulative_perms,
-                                  uint64_t cumulative_perms,
-                                  uint64_t cumulative_shared_perms,
-                                  Transaction *tran, Error **errp)
+static int bdrv_list_refresh_perms(GSList *list, BlockReopenQueue *q,
+                                   Transaction *tran, Error **errp)
 {
     int ret;
+    uint64_t cumulative_perms, cumulative_shared_perms;
     BlockDriverState *bs;
 
-    if (use_cumulative_perms) {
-        bs = list->data;
-
-        ret = bdrv_node_check_perm(bs, q, cumulative_perms,
-                                   cumulative_shared_perms,
-                                   tran, errp);
-        if (ret < 0) {
-            return ret;
-        }
-
-        list = list->next;
-    }
-
     for ( ; list; list = list->next) {
         bs = list->data;
 
@@ -2387,12 +2367,6 @@ static int bdrv_check_perm_common(GSList *list, BlockReopenQueue *q,
     return 0;
 }
 
-static int bdrv_list_refresh_perms(GSList *list, BlockReopenQueue *q,
-                                   Transaction *tran, Error **errp)
-{
-    return bdrv_check_perm_common(list, q, false, 0, 0, tran, errp);
-}
-
 static void bdrv_node_set_perm(BlockDriverState *bs)
 {
     BlockDriver *drv = bs->drv;
-- 
2.29.2



  parent reply	other threads:[~2021-03-17 14:59 UTC|newest]

Thread overview: 62+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-03-17 14:34 [PATCH v3 00/36] block: update graph permissions update Vladimir Sementsov-Ogievskiy
2021-03-17 14:34 ` [PATCH v3 01/36] tests/test-bdrv-graph-mod: add test_parallel_exclusive_write Vladimir Sementsov-Ogievskiy
2021-04-23 12:25   ` Kevin Wolf
2021-04-23 12:46     ` Vladimir Sementsov-Ogievskiy
2021-04-23 12:59       ` Kevin Wolf
2021-04-23 13:03         ` Vladimir Sementsov-Ogievskiy
2021-03-17 14:34 ` [PATCH v3 02/36] tests/test-bdrv-graph-mod: add test_parallel_perm_update Vladimir Sementsov-Ogievskiy
2021-03-17 14:34 ` [PATCH v3 03/36] tests/test-bdrv-graph-mod: add test_append_greedy_filter Vladimir Sementsov-Ogievskiy
2021-03-17 14:34 ` [PATCH v3 04/36] block: bdrv_append(): don't consume reference Vladimir Sementsov-Ogievskiy
2021-04-07 17:46   ` Alberto Garcia
2021-04-23 14:11   ` Kevin Wolf
2021-03-17 14:34 ` [PATCH v3 05/36] block: BdrvChildClass: add .get_parent_aio_context handler Vladimir Sementsov-Ogievskiy
2021-04-12 15:06   ` Alberto Garcia
2021-03-17 14:34 ` [PATCH v3 06/36] block: drop ctx argument from bdrv_root_attach_child Vladimir Sementsov-Ogievskiy
2021-04-12 14:23   ` Alberto Garcia
2021-03-17 14:35 ` [PATCH v3 07/36] block: make bdrv_reopen_{prepare, commit, abort} private Vladimir Sementsov-Ogievskiy via
2021-03-17 14:35 ` [PATCH v3 08/36] util: add transactions.c Vladimir Sementsov-Ogievskiy
2021-04-23 14:43   ` Kevin Wolf
2021-03-17 14:35 ` [PATCH v3 09/36] block: bdrv_refresh_perms: check for parents permissions conflict Vladimir Sementsov-Ogievskiy
2021-04-12 15:57   ` Alberto Garcia
2021-03-17 14:35 ` [PATCH v3 10/36] block: refactor bdrv_child* permission functions Vladimir Sementsov-Ogievskiy
2021-03-17 14:35 ` [PATCH v3 11/36] block: rewrite bdrv_child_try_set_perm() using bdrv_refresh_perms() Vladimir Sementsov-Ogievskiy
2021-03-17 14:35 ` [PATCH v3 12/36] block: inline bdrv_child_*() permission functions calls Vladimir Sementsov-Ogievskiy
2021-03-17 14:35 ` [PATCH v3 13/36] block: use topological sort for permission update Vladimir Sementsov-Ogievskiy
2021-03-17 16:50   ` Alberto Garcia
2021-03-17 14:35 ` [PATCH v3 14/36] block: add bdrv_drv_set_perm transaction action Vladimir Sementsov-Ogievskiy
2021-03-17 14:35 ` [PATCH v3 15/36] block: add bdrv_list_* permission update functions Vladimir Sementsov-Ogievskiy
2021-03-17 14:35 ` [PATCH v3 16/36] block: add bdrv_replace_child_safe() transaction action Vladimir Sementsov-Ogievskiy
2021-03-17 14:35 ` [PATCH v3 17/36] block: fix bdrv_replace_node_common Vladimir Sementsov-Ogievskiy
2021-03-17 14:35 ` [PATCH v3 18/36] block: add bdrv_attach_child_common() transaction action Vladimir Sementsov-Ogievskiy
2021-04-26 16:14   ` Kevin Wolf
2021-04-26 16:56     ` Vladimir Sementsov-Ogievskiy
2021-03-17 14:35 ` [PATCH v3 19/36] block: add bdrv_attach_child_noperm() " Vladimir Sementsov-Ogievskiy
2021-03-17 14:35 ` [PATCH v3 20/36] block: split out bdrv_replace_node_noperm() Vladimir Sementsov-Ogievskiy
2021-03-17 14:35 ` [PATCH v3 21/36] block: adapt bdrv_append() for inserting filters Vladimir Sementsov-Ogievskiy
2021-03-17 14:35 ` [PATCH v3 22/36] block: add bdrv_remove_filter_or_cow transaction action Vladimir Sementsov-Ogievskiy
2021-04-26 16:26   ` Kevin Wolf
2021-04-26 17:18     ` Vladimir Sementsov-Ogievskiy
2021-04-27 11:09       ` Kevin Wolf
2021-04-27 11:41         ` Vladimir Sementsov-Ogievskiy
2021-03-17 14:35 ` [PATCH v3 23/36] block: introduce bdrv_drop_filter() Vladimir Sementsov-Ogievskiy
2021-03-17 14:35 ` [PATCH v3 24/36] block/backup-top: drop .active Vladimir Sementsov-Ogievskiy
2021-03-17 14:35 ` [PATCH v3 25/36] block: drop ignore_children for permission update functions Vladimir Sementsov-Ogievskiy
2021-03-17 14:35 ` [PATCH v3 26/36] block: make bdrv_unset_inherits_from to be a transaction action Vladimir Sementsov-Ogievskiy
2021-03-17 14:35 ` [PATCH v3 27/36] block: make bdrv_refresh_limits() " Vladimir Sementsov-Ogievskiy
2021-03-17 14:35 ` [PATCH v3 28/36] block: add bdrv_set_backing_noperm() " Vladimir Sementsov-Ogievskiy
2021-03-17 14:35 ` [PATCH v3 29/36] block: bdrv_reopen_multiple(): move bdrv_flush to separate pre-prepare Vladimir Sementsov-Ogievskiy
2021-03-17 14:35 ` [PATCH v3 30/36] block: bdrv_reopen_multiple: refresh permissions on updated graph Vladimir Sementsov-Ogievskiy
2021-03-17 14:35 ` [PATCH v3 31/36] block: drop unused permission update functions Vladimir Sementsov-Ogievskiy
2021-03-17 14:35 ` Vladimir Sementsov-Ogievskiy [this message]
2021-03-17 14:35 ` [PATCH v3 33/36] block: inline bdrv_replace_child() Vladimir Sementsov-Ogievskiy
2021-03-17 14:35 ` [PATCH v3 34/36] block: refactor bdrv_child_set_perm_safe() transaction action Vladimir Sementsov-Ogievskiy
2021-03-17 14:35 ` [PATCH v3 35/36] block: rename bdrv_replace_child_safe() to bdrv_replace_child() Vladimir Sementsov-Ogievskiy
2021-03-17 14:35 ` [PATCH v3 36/36] block: refactor bdrv_node_check_perm() Vladimir Sementsov-Ogievskiy
2021-03-17 15:21 ` [PATCH v3 00/36] block: update graph permissions update no-reply
2021-03-17 15:38   ` Vladimir Sementsov-Ogievskiy
2021-03-17 17:33     ` Eric Blake
2021-03-17 17:42       ` Eric Blake
2021-03-18  8:04       ` Vladimir Sementsov-Ogievskiy
2021-04-23  8:34         ` Kevin Wolf
2021-04-23 16:16 ` Kevin Wolf
2021-04-28 11:28 ` Kevin Wolf

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210317143529.615584-33-vsementsov@virtuozzo.com \
    --to=vsementsov@virtuozzo.com \
    --cc=armbru@redhat.com \
    --cc=fam@euphon.net \
    --cc=jsnow@redhat.com \
    --cc=kwolf@redhat.com \
    --cc=mreitz@redhat.com \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    --cc=stefanha@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).