From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757988Ab3KOEgG (ORCPT ); Thu, 14 Nov 2013 23:36:06 -0500 Received: from userp1040.oracle.com ([156.151.31.81]:44299 "EHLO userp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756870Ab3KOEf5 (ORCPT ); Thu, 14 Nov 2013 23:35:57 -0500 Message-ID: <5285A483.3040009@oracle.com> Date: Fri, 15 Nov 2013 12:35:15 +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 6/6] jfs: simplify lmLogSync() via list_last_entry_or_null() Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-Source-IP: ucsinet21.oracle.com [156.151.31.93] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jie Liu Simplify the code in lmLogSync() via list_last_entry_or_null(). Signed-off-by: Jie Liu --- fs/jfs/jfs_logmgr.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/fs/jfs/jfs_logmgr.c b/fs/jfs/jfs_logmgr.c index 7b565d0..2f90779 100644 --- a/fs/jfs/jfs_logmgr.c +++ b/fs/jfs/jfs_logmgr.c @@ -963,13 +963,9 @@ static int lmLogSync(struct jfs_log * log, int hard_sync) if (log->sync == log->syncpt) { LOGSYNC_LOCK(log, flags); - if (list_empty(&log->synclist)) - log->sync = log->lsn; - else { - lp = list_entry(log->synclist.next, - struct logsyncblk, synclist); - log->sync = lp->lsn; - } + lp = list_last_entry_or_null(&log->synclist, struct logsyncblk, + synclist); + log->sync = lp ? lp->lsn : log->lsn; LOGSYNC_UNLOCK(log, flags); } -- 1.8.3.2