From patchwork Mon May 6 23:50:13 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Colin Cross X-Patchwork-Id: 2529091 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 15D803FD85 for ; Mon, 6 May 2013 23:55:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932418Ab3EFXyq (ORCPT ); Mon, 6 May 2013 19:54:46 -0400 Received: from mail-yh0-f74.google.com ([209.85.213.74]:37443 "EHLO mail-yh0-f74.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932391Ab3EFXu3 (ORCPT ); Mon, 6 May 2013 19:50:29 -0400 Received: by mail-yh0-f74.google.com with SMTP id t59so449568yho.1 for ; Mon, 06 May 2013 16:50:28 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:x-gm-message-state; bh=TdawKHo7T93s9D5dcvRVmjeWSto0Eg5ASXtwF+oSto0=; b=coWIn8X70cvADnK3K0UmLi3HgtDmdVmaPGd8dmo6PbGMjepRRdGqYAVm3c29Hfxk1Y IO6CBE0394PbflMJ6qtSe4vlwJATI92zuhPDQ3dtLY3oUaODOoR/MzQecg6f94YMwYgL rbR/MPuPhmgkXpiCrywfbws9AwKlAM3IMk0Yy7Ac3kgvtvYkQxHisZgN2vRSEmrO4qOy RTkT/McW1vMKp3alDSKUwVTpPcKfELDtCpfur9VI3t2pwWcdMN/KGVGEXBgqVPxl7Vcq 0Bgi+mW7c3mnIueyoSPFLdF28ElmbRN00Tg2CzvnBdjD1QooCc2NFXWR+G1P5zI8Cq8e 4hZA== X-Received: by 10.236.130.165 with SMTP id k25mr17119230yhi.14.1367884228088; Mon, 06 May 2013 16:50:28 -0700 (PDT) Received: from corp2gmr1-2.hot.corp.google.com (corp2gmr1-2.hot.corp.google.com [172.24.189.93]) by gmr-mx.google.com with ESMTPS id n23si2636342yhi.7.2013.05.06.16.50.28 for (version=TLSv1.1 cipher=AES128-SHA bits=128/128); Mon, 06 May 2013 16:50:28 -0700 (PDT) Received: from walnut.mtv.corp.google.com (walnut.mtv.corp.google.com [172.18.105.48]) by corp2gmr1-2.hot.corp.google.com (Postfix) with ESMTP id E55295A4005; Mon, 6 May 2013 16:50:27 -0700 (PDT) Received: by walnut.mtv.corp.google.com (Postfix, from userid 99897) id C6B881613FF; Mon, 6 May 2013 16:50:27 -0700 (PDT) From: Colin Cross To: linux-kernel@vger.kernel.org Cc: Pavel Machek , "Rafael J. Wysocki" , Peter Zijlstra , Ingo Molnar , Andrew Morton , Mandeep Singh Baines , Colin Cross , Oleg Nesterov , linux-nfs@vger.kernel.org, linux-pm@vger.kernel.org, netdev@vger.kernel.org, Linus Torvalds , Tejun Heo , Len Brown Subject: [PATCH v3 08/16] freezer: convert freezable helpers to static inline where possible Date: Mon, 6 May 2013 16:50:13 -0700 Message-Id: <1367884221-20462-9-git-send-email-ccross@android.com> X-Mailer: git-send-email 1.8.2.1 In-Reply-To: <1367884221-20462-1-git-send-email-ccross@android.com> References: <1367884221-20462-1-git-send-email-ccross@android.com> X-Gm-Message-State: ALoCoQkDGhSh8DOsfcZD7/LBwyAGcdk40IO8G71lgdXK+8s5HMPqEvMj/ei++gJmNNrXE0DakrvZCgWIDrCc2uouWan54CWaa+AM4grH14xQmnZmbmgQM1C252jPSf5o9Dqs29cUJ4ix3rsb6i/Zt82RE1K3ZtuWB1rkdRCnNMlCp9uw7LmnxNwOTDDXBRvhS2NzNR2ohW07Vkxgmbcap2Ofm5irgrTevg== Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org Some of the freezable helpers have to be macros because their condition argument needs to get evaluated every time through the wait loop. Convert the others to static inline to make future changes easier. Signed-off-by: Colin Cross --- include/linux/freezer.h | 58 ++++++++++++++++++++++++------------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/include/linux/freezer.h b/include/linux/freezer.h index c71337af..8430d4c5 100644 --- a/include/linux/freezer.h +++ b/include/linux/freezer.h @@ -159,46 +159,46 @@ static inline bool freezer_should_skip(struct task_struct *p) } /* - * These macros are intended to be used whenever you want allow a sleeping + * These functions are intended to be used whenever you want allow a sleeping * task to be frozen. Note that neither return any clear indication of * whether a freeze event happened while in this function. */ /* Like schedule(), but should not block the freezer. */ -#define freezable_schedule() \ -({ \ - freezer_do_not_count(); \ - schedule(); \ - freezer_count(); \ -}) +static inline void freezable_schedule(void) +{ + freezer_do_not_count(); + schedule(); + freezer_count(); +} /* DO NOT ADD ANY NEW CALLERS OF THIS FUNCTION */ -#define freezable_schedule_unsafe() \ -({ \ - freezer_do_not_count(); \ - schedule(); \ - freezer_count_unsafe(); \ -}) +static inline void freezable_schedule_unsafe(void) +{ + freezer_do_not_count(); + schedule(); + freezer_count_unsafe(); +} /* Like schedule_timeout_killable(), but should not block the freezer. */ -#define freezable_schedule_timeout_killable(timeout) \ -({ \ - long __retval; \ - freezer_do_not_count(); \ - __retval = schedule_timeout_killable(timeout); \ - freezer_count(); \ - __retval; \ -}) +static inline long freezable_schedule_timeout_killable(long timeout) +{ + long __retval; + freezer_do_not_count(); + __retval = schedule_timeout_killable(timeout); + freezer_count(); + return __retval; +} /* DO NOT ADD ANY NEW CALLERS OF THIS FUNCTION */ -#define freezable_schedule_timeout_killable_unsafe(timeout) \ -({ \ - long __retval; \ - freezer_do_not_count(); \ - __retval = schedule_timeout_killable(timeout); \ - freezer_count_unsafe(); \ - __retval; \ -}) +static inline long freezable_schedule_timeout_killable_unsafe(long timeout) +{ + long __retval; + freezer_do_not_count(); + __retval = schedule_timeout_killable(timeout); + freezer_count_unsafe(); + return __retval; +} /* * Freezer-friendly wrappers around wait_event_interruptible(),