From patchwork Mon Dec 6 16:09:53 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 378672 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oB6G9dCu026638 for ; Mon, 6 Dec 2010 16:09:57 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752162Ab0LFQJ5 (ORCPT ); Mon, 6 Dec 2010 11:09:57 -0500 Received: from mail-iw0-f174.google.com ([209.85.214.174]:62204 "EHLO mail-iw0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751120Ab0LFQJ4 (ORCPT ); Mon, 6 Dec 2010 11:09:56 -0500 Received: by iwn9 with SMTP id 9so376222iwn.19 for ; Mon, 06 Dec 2010 08:09:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:sender:from:subject:to:cc :date:message-id:in-reply-to:references:user-agent:mime-version :content-type:content-transfer-encoding; bh=1YOEFhvlp/fz4WAY++stCQGSKE8Tih1NuU1XF0zUq0o=; b=atj2w5xgfxSGMzYVJIecjIIhk6QhGu5N0aKYpPaQchzdPPAv+8dpxduKDiXWYqlq1r c9RKoGPGtMQn7qzM5CYcX6Sq241awQQ/3zRul860mSe6jTZ3CZrlccxpPqG2aevHK63E Irtv/u3dOaw/DT6RJyc3M4WD1t8wiu/31pHDI= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:from:subject:to:cc:date:message-id:in-reply-to:references :user-agent:mime-version:content-type:content-transfer-encoding; b=ChnoO24ayRWOhbEeZ4TJ1Xi8lj7uDFWs1Ba9tM63YoJsKw3n9GmM4cbzoCFlHLTPbH VOZanWWgXwRFRUbjJOhMB7vAPOegmxYZs8M1Sb+LfTAJ9jiENyQxn3UKFEPBg2bxVmLa WTk+/HqW9n8quLz244lkxYagxga8kn/M7swbQ= Received: by 10.231.39.137 with SMTP id g9mr6075454ibe.101.1291651795846; Mon, 06 Dec 2010 08:09:55 -0800 (PST) Received: from matisse.1015granger.net (adsl-99-26-161-222.dsl.sfldmi.sbcglobal.net [99.26.161.222]) by mx.google.com with ESMTPS id 8sm5141207iba.10.2010.12.06.08.09.54 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 06 Dec 2010 08:09:55 -0800 (PST) From: Chuck Lever Subject: [PATCH 2/3] libnsm.a: Replace __attribute_noinline__ To: steved@redhat.com Cc: linux-nfs@vger.kernel.org Date: Mon, 06 Dec 2010 11:09:53 -0500 Message-ID: <20101206160953.18361.21885.stgit@matisse.1015granger.net> In-Reply-To: <20101206160206.18361.26178.stgit@matisse.1015granger.net> References: <20101206160206.18361.26178.stgit@matisse.1015granger.net> User-Agent: StGIT/0.14.3 MIME-Version: 1.0 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Mon, 06 Dec 2010 16:09:57 +0000 (UTC) === cut here === sys/cdefs.c in glibc 2.2.5 does not define __attribute_noinline__. Replace the __attribute_noinline__ form with __attribute__((__noinline__)). Even though the compiler didn't complain about __attribute_malloc__, also replace those in order to maintain consistent style throughout the source file. Fix for: https://bugzilla.linux-nfs.org/show_bug.cgi?id=194 Reported-by: "Gabor Z. Papp" Signed-off-by: Chuck Lever --- support/nsm/file.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/support/nsm/file.c b/support/nsm/file.c index ba2a9ce..6ea6ab6 100644 --- a/support/nsm/file.c +++ b/support/nsm/file.c @@ -126,7 +126,7 @@ exact_error_check(const ssize_t len, const size_t buflen) * containing an appropriate pathname, or NULL if an error * occurs. Caller must free the returned result with free(3). */ -__attribute_malloc__ +__attribute__((__malloc__)) static char * nsm_make_record_pathname(const char *directory, const char *hostname) { @@ -174,7 +174,7 @@ nsm_make_record_pathname(const char *directory, const char *hostname) * containing an appropriate pathname, or NULL if an error * occurs. Caller must free the returned result with free(3). */ -__attribute_malloc__ +__attribute__((__malloc__)) static char * nsm_make_pathname(const char *directory) { @@ -204,7 +204,7 @@ nsm_make_pathname(const char *directory) * containing an appropriate pathname, or NULL if an error * occurs. Caller must free the returned result with free(3). */ -__attribute_malloc__ +__attribute__((__malloc__)) static char * nsm_make_temp_pathname(const char *pathname) { @@ -650,7 +650,7 @@ nsm_priv_to_hex(const char *priv, char *buf, const size_t buflen) /* * Returns the length in bytes of the created record. */ -__attribute_noinline__ +__attribute__((__noinline__)) static size_t nsm_create_monitor_record(char *buf, const size_t buflen, const struct sockaddr *sap, const struct mon *m) @@ -800,7 +800,7 @@ out: return result; } -__attribute_noinline__ +__attribute__((__noinline__)) static _Bool nsm_parse_line(char *line, struct sockaddr_in *sin, struct mon *m) {