From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jeff Liu Date: Fri, 15 Nov 2013 12:32:52 +0800 Subject: [Cluster-devel] [PATCH 3/6] gfs2: simplify current_tail() via list_last_entry_or_null() Message-ID: <5285A3F4.4040000@oracle.com> List-Id: To: cluster-devel.redhat.com MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit From: Jie Liu Simplify the code in current_tail() via list_last_entry_or_null(). Signed-off-by: Jie Liu --- fs/gfs2/log.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/fs/gfs2/log.c b/fs/gfs2/log.c index 610613f..555f767 100644 --- a/fs/gfs2/log.c +++ b/fs/gfs2/log.c @@ -441,13 +441,9 @@ static unsigned int current_tail(struct gfs2_sbd *sdp) spin_lock(&sdp->sd_ail_lock); - if (list_empty(&sdp->sd_ail1_list)) { - tail = sdp->sd_log_head; - } else { - tr = list_entry(sdp->sd_ail1_list.prev, struct gfs2_trans, - tr_list); - tail = tr->tr_first; - } + tr = list_last_entry_or_null(&sdp->sd_ail1_list, struct gfs2_trans, + tr_list); + tail = tr ? tr->tr_first : sdp->sd_log_head; spin_unlock(&sdp->sd_ail_lock); -- 1.8.3.2 From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from userp1040.oracle.com ([156.151.31.81]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VhB5u-00051p-O7 for linux-mtd@lists.infradead.org; Fri, 15 Nov 2013 04:33:23 +0000 Message-ID: <5285A3F4.4040000@oracle.com> Date: Fri, 15 Nov 2013 12:32:52 +0800 From: Jeff Liu MIME-Version: 1.0 To: linux-kernel@vger.kernel.org Subject: [PATCH 3/6] gfs2: simplify current_tail() via list_last_entry_or_null() Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: jfs-discussion@lists.sourceforge.net, jiri@resnulli.us, gregkh@linuxfoundation.org, oleg@redhat.com, "xfs@oss.sgi.com" , cluster-devel@redhat.com, linux-mtd@lists.infradead.org, akpm@linux-foundation.org List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Jie Liu Simplify the code in current_tail() via list_last_entry_or_null(). Signed-off-by: Jie Liu --- fs/gfs2/log.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/fs/gfs2/log.c b/fs/gfs2/log.c index 610613f..555f767 100644 --- a/fs/gfs2/log.c +++ b/fs/gfs2/log.c @@ -441,13 +441,9 @@ static unsigned int current_tail(struct gfs2_sbd *sdp) spin_lock(&sdp->sd_ail_lock); - if (list_empty(&sdp->sd_ail1_list)) { - tail = sdp->sd_log_head; - } else { - tr = list_entry(sdp->sd_ail1_list.prev, struct gfs2_trans, - tr_list); - tail = tr->tr_first; - } + tr = list_last_entry_or_null(&sdp->sd_ail1_list, struct gfs2_trans, + tr_list); + tail = tr ? tr->tr_first : sdp->sd_log_head; spin_unlock(&sdp->sd_ail_lock); -- 1.8.3.2 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from relay.sgi.com (relay2.corp.sgi.com [137.38.102.29]) by oss.sgi.com (Postfix) with ESMTP id 27E5F7F72 for ; Thu, 14 Nov 2013 22:33:31 -0600 (CST) Received: from cuda.sgi.com (cuda2.sgi.com [192.48.176.25]) by relay2.corp.sgi.com (Postfix) with ESMTP id 10ECE304048 for ; Thu, 14 Nov 2013 20:33:31 -0800 (PST) Received: from userp1040.oracle.com (userp1040.oracle.com [156.151.31.81]) by cuda.sgi.com with ESMTP id g0Mols0Pta9HfODU (version=TLSv1 cipher=AES256-SHA bits=256 verify=NO) for ; Thu, 14 Nov 2013 20:33:30 -0800 (PST) Message-ID: <5285A3F4.4040000@oracle.com> Date: Fri, 15 Nov 2013 12:32:52 +0800 From: Jeff Liu MIME-Version: 1.0 Subject: [PATCH 3/6] gfs2: simplify current_tail() via list_last_entry_or_null() List-Id: XFS Filesystem from SGI List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: xfs-bounces@oss.sgi.com Sender: xfs-bounces@oss.sgi.com To: linux-kernel@vger.kernel.org Cc: jfs-discussion@lists.sourceforge.net, jiri@resnulli.us, gregkh@linuxfoundation.org, oleg@redhat.com, "xfs@oss.sgi.com" , cluster-devel@redhat.com, linux-mtd@lists.infradead.org, akpm@linux-foundation.org From: Jie Liu Simplify the code in current_tail() via list_last_entry_or_null(). Signed-off-by: Jie Liu --- fs/gfs2/log.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/fs/gfs2/log.c b/fs/gfs2/log.c index 610613f..555f767 100644 --- a/fs/gfs2/log.c +++ b/fs/gfs2/log.c @@ -441,13 +441,9 @@ static unsigned int current_tail(struct gfs2_sbd *sdp) spin_lock(&sdp->sd_ail_lock); - if (list_empty(&sdp->sd_ail1_list)) { - tail = sdp->sd_log_head; - } else { - tr = list_entry(sdp->sd_ail1_list.prev, struct gfs2_trans, - tr_list); - tail = tr->tr_first; - } + tr = list_last_entry_or_null(&sdp->sd_ail1_list, struct gfs2_trans, + tr_list); + tail = tr ? tr->tr_first : sdp->sd_log_head; spin_unlock(&sdp->sd_ail_lock); -- 1.8.3.2 _______________________________________________ xfs mailing list xfs@oss.sgi.com http://oss.sgi.com/mailman/listinfo/xfs From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757478Ab3KOEdk (ORCPT ); Thu, 14 Nov 2013 23:33:40 -0500 Received: from userp1040.oracle.com ([156.151.31.81]:43755 "EHLO userp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757176Ab3KOEdc (ORCPT ); Thu, 14 Nov 2013 23:33:32 -0500 Message-ID: <5285A3F4.4040000@oracle.com> Date: Fri, 15 Nov 2013 12:32:52 +0800 From: Jeff Liu User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.1.0 MIME-Version: 1.0 To: linux-kernel@vger.kernel.org CC: akpm@linux-foundation.org, "xfs@oss.sgi.com" , cluster-devel@redhat.com, linux-mtd@lists.infradead.org, jfs-discussion@lists.sourceforge.net, oleg@redhat.com, jiri@resnulli.us, gregkh@linuxfoundation.org Subject: [PATCH 3/6] gfs2: simplify current_tail() via list_last_entry_or_null() Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-Source-IP: acsinet21.oracle.com [141.146.126.237] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jie Liu Simplify the code in current_tail() via list_last_entry_or_null(). Signed-off-by: Jie Liu --- fs/gfs2/log.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/fs/gfs2/log.c b/fs/gfs2/log.c index 610613f..555f767 100644 --- a/fs/gfs2/log.c +++ b/fs/gfs2/log.c @@ -441,13 +441,9 @@ static unsigned int current_tail(struct gfs2_sbd *sdp) spin_lock(&sdp->sd_ail_lock); - if (list_empty(&sdp->sd_ail1_list)) { - tail = sdp->sd_log_head; - } else { - tr = list_entry(sdp->sd_ail1_list.prev, struct gfs2_trans, - tr_list); - tail = tr->tr_first; - } + tr = list_last_entry_or_null(&sdp->sd_ail1_list, struct gfs2_trans, + tr_list); + tail = tr ? tr->tr_first : sdp->sd_log_head; spin_unlock(&sdp->sd_ail_lock); -- 1.8.3.2