From: Bob Liu <lliubbo@gmail.com>
To: xen-devel@lists.xenproject.org
Cc: keir@xen.org, ian.campbell@citrix.com, andrew.cooper3@citrix.com,
JBeulich@suse.com
Subject: [PATCH 12/14] tmem: cleanup: refactor function tmemc_shared_pool_auth()
Date: Tue, 28 Jan 2014 12:28:31 +0800 [thread overview]
Message-ID: <1390883313-19313-13-git-send-email-bob.liu@oracle.com> (raw)
In-Reply-To: <1390883313-19313-1-git-send-email-bob.liu@oracle.com>
Make function tmemc_shared_pool_auth() more readable.
Signed-off-by: Bob Liu <bob.liu@oracle.com>
---
xen/common/tmem.c | 38 +++++++++++++++++++++++++-------------
1 file changed, 25 insertions(+), 13 deletions(-)
diff --git a/xen/common/tmem.c b/xen/common/tmem.c
index eea3cbb..37f4e8f 100644
--- a/xen/common/tmem.c
+++ b/xen/common/tmem.c
@@ -2252,27 +2252,39 @@ static int tmemc_shared_pool_auth(domid_t cli_id, uint64_t uuid_lo,
client = tmem_client_from_cli_id(cli_id);
if ( client == NULL )
return -EINVAL;
+
for ( i = 0; i < MAX_GLOBAL_SHARED_POOLS; i++)
{
- if ( (client->shared_auth_uuid[i][0] == uuid_lo) &&
- (client->shared_auth_uuid[i][1] == uuid_hi) )
+ if ( auth == 0 )
{
- if ( auth == 0 )
- client->shared_auth_uuid[i][0] =
- client->shared_auth_uuid[i][1] = -1L;
- return 1;
+ if ( (client->shared_auth_uuid[i][0] == uuid_lo) &&
+ (client->shared_auth_uuid[i][1] == uuid_hi) )
+ {
+ client->shared_auth_uuid[i][0] = -1L;
+ client->shared_auth_uuid[i][1] = -1L;
+ return 1;
+ }
}
- if ( (auth == 1) && (client->shared_auth_uuid[i][0] == -1L) &&
- (client->shared_auth_uuid[i][1] == -1L) && (free == -1) )
- free = i;
+ else
+ {
+ if ( (client->shared_auth_uuid[i][0] == -1L) &&
+ (client->shared_auth_uuid[i][1] == -1L) )
+ {
+ free = i;
+ break;
+ }
+ }
}
if ( auth == 0 )
return 0;
- if ( auth == 1 && free == -1 )
+ else if ( free == -1)
return -ENOMEM;
- client->shared_auth_uuid[free][0] = uuid_lo;
- client->shared_auth_uuid[free][1] = uuid_hi;
- return 1;
+ else
+ {
+ client->shared_auth_uuid[free][0] = uuid_lo;
+ client->shared_auth_uuid[free][1] = uuid_hi;
+ return 1;
+ }
}
static int tmemc_save_subop(int cli_id, uint32_t pool_id,
--
1.7.10.4
next prev parent reply other threads:[~2014-01-28 4:32 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-28 4:28 [PATCH RESEND 00/14] xen: new patches for tmem Bob Liu
2014-01-28 4:28 ` [PATCH 01/14] tmem: remove pageshift from struct tmem_pool Bob Liu
2014-01-28 4:28 ` [PATCH 02/14] tmem: refactor function do_tmem_op() Bob Liu
2014-01-28 4:28 ` [PATCH 03/14] tmem: cleanup: drop unneeded client/pool initialization Bob Liu
2014-01-28 4:28 ` [PATCH 04/14] tmem: bugfix in obj allocate path Bob Liu
2014-01-28 4:28 ` [PATCH 05/14] tmem: cleanup: remove unneed parameter from pgp_delist() Bob Liu
2014-01-28 4:28 ` [PATCH 06/14] tmem: cleanup: remove unneed parameter from pgp_free() Bob Liu
2014-01-28 4:28 ` [PATCH 07/14] tmem: cleanup the pgp free path Bob Liu
2014-01-28 4:28 ` [PATCH 08/14] tmem: drop oneline function client_freeze() Bob Liu
2014-01-28 4:28 ` [PATCH 09/14] tmem: remove unneeded parameters from obj destroy path Bob Liu
2014-01-28 4:28 ` [PATCH 10/14] tmem: cleanup: drop global_pool_list Bob Liu
2014-01-28 4:28 ` [PATCH 11/14] tmem: fix the return value of tmemc_set_var() Bob Liu
2014-01-28 4:28 ` Bob Liu [this message]
2014-01-28 4:28 ` [PATCH 13/14] tmem: reorg the shared pool allocate path Bob Liu
2014-03-05 22:03 ` Konrad Rzeszutek Wilk
2014-01-28 4:28 ` [PATCH 14/14] tmem: remove useless parameter from client and pool flush Bob Liu
2014-03-19 17:04 ` [PATCH RESEND 00/14] xen: new patches for tmem Konrad Rzeszutek Wilk
-- strict thread matches above, loose matches on Subject: below --
2013-12-18 6:52 [PATCH 00/14] xen: new patches for tmem cleanup Bob Liu
2013-12-18 6:52 ` [PATCH 12/14] tmem: cleanup: refactor function tmemc_shared_pool_auth() Bob Liu
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=1390883313-19313-13-git-send-email-bob.liu@oracle.com \
--to=lliubbo@gmail.com \
--cc=JBeulich@suse.com \
--cc=andrew.cooper3@citrix.com \
--cc=ian.campbell@citrix.com \
--cc=keir@xen.org \
--cc=xen-devel@lists.xenproject.org \
/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).