From mboxrd@z Thu Jan  1 00:00:00 1970
From: Bob Liu <bob.liu@oracle.com>
Subject: Re: [PATCH] tmem: propagate ENOMEM result in error
	handling
Date: Mon, 31 Mar 2014 05:09:33 +0800
Message-ID: <5338880D.50709@oracle.com>
References: <1396069649-5773-1-git-send-email-mattd@bugfuzz.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <xen-devel-bounces@lists.xen.org>
Received: from mail6.bemta4.messagelabs.com ([85.158.143.247])
	by lists.xen.org with esmtp (Exim 4.72)
	(envelope-from <bob.liu@oracle.com>) id 1WUMzB-0005J4-9t
	for xen-devel@lists.xenproject.org; Sun, 30 Mar 2014 21:09:45 +0000
In-Reply-To: <1396069649-5773-1-git-send-email-mattd@bugfuzz.com>
List-Unsubscribe: <http://lists.xen.org/cgi-bin/mailman/options/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xen.org>
List-Help: <mailto:xen-devel-request@lists.xen.org?subject=help>
List-Subscribe: <http://lists.xen.org/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=subscribe>
Sender: xen-devel-bounces@lists.xen.org
Errors-To: xen-devel-bounces@lists.xen.org
To: Matthew Daley <mattd@bugfuzz.com>
Cc: xen-devel@lists.xenproject.org, xen-devel@lists.xen.org
List-Id: xen-devel@lists.xenproject.org


On 03/29/2014 01:07 PM, Matthew Daley wrote:
> ...otherwise if pcd_associate fails due to out-of-memory, the caller of
> do_tmem_put will think the call was successful.
> 

Good catch! Thanks a lot!

> While at it, fix up the style issue.
> 
> Signed-off-by: Matthew Daley <mattd@bugfuzz.com>

Reviewed-by: Bob Liu <bob.liu@oracle.com>

> ---
>  xen/common/tmem.c | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/xen/common/tmem.c b/xen/common/tmem.c
> index 02e7e2e..9cebe11 100644
> --- a/xen/common/tmem.c
> +++ b/xen/common/tmem.c
> @@ -1646,8 +1646,11 @@ copy_uncompressed:
>  
>      if ( tmem_dedup_enabled() && !is_persistent(pool) )
>      {
> -        if ( pcd_associate(pgp,NULL,0) == -ENOMEM )
> +        if ( pcd_associate(pgp, NULL, 0) == -ENOMEM )
> +        {
> +            ret = -ENOMEM;
>              goto del_pgp_from_obj;
> +        }
>      }
>  
>  insert_page:
>