From patchwork Mon Nov 22 16:38:16 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 347871 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 oAMGcNP3019749 for ; Mon, 22 Nov 2010 16:38:24 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751810Ab0KVQiW (ORCPT ); Mon, 22 Nov 2010 11:38:22 -0500 Received: from mail-yx0-f174.google.com ([209.85.213.174]:61924 "EHLO mail-yx0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751885Ab0KVQiV (ORCPT ); Mon, 22 Nov 2010 11:38:21 -0500 Received: by yxl31 with SMTP id 31so11203yxl.19 for ; Mon, 22 Nov 2010 08:38:21 -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:user-agent:mime-version:content-type :content-transfer-encoding; bh=Ma8fVH3vTx0hUaDJr0iLNGMVuacq4hZf5xC5fZhUHPM=; b=mfhx9nEGpf1vGSpnMyQJjrROwP5U+SRaZ05JbC6JnNX3+nxI8jb/FqUP6zK8hQ5QFf XfMdaGNRqfHMtfks4j4hMmu/q10xGUcNGuJ4S4nTSlnxn/f00WLYnttAX8Ie1EvcGfhw T9ESaldDyv3VyGZ59lGH/C1xfv+ZWcfgYS78w= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:from:subject:to:cc:date:message-id:user-agent:mime-version :content-type:content-transfer-encoding; b=R61Igyu6nhTclG/54ILaXReS+LHawGJ3Mqd5t8Q0xX1YfcR2T5TeVJ2pTJEi57bffT enUI4woWOjD/wbb4zBtL/5tT1A2CLEQ+Kzo7jXktiBGhhB6u/ZdsUjqcxadUKcrJHRnZ OfOdbCnxqICbqregBjuoDBkWSFDPZuysXxPWM= Received: by 10.150.189.13 with SMTP id m13mr9724077ybf.15.1290443900665; Mon, 22 Nov 2010 08:38:20 -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 52sm3376087yhl.17.2010.11.22.08.38.18 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 22 Nov 2010 08:38:19 -0800 (PST) From: Chuck Lever Subject: [PATCH] NSM: Replace __attribute_noinline__ To: gzp@papp.hu Cc: linux-nfs@vger.kernel.org Date: Mon, 22 Nov 2010 11:38:16 -0500 Message-ID: <20101122163637.17565.13193.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, 22 Nov 2010 16:38:25 +0000 (UTC) === cut here === This is curious, because this is a modern compiler (gcc 4.4.5) with an old version of glibc. I wouldn't expect a compiler attribute complaint due to an old version of the C library, but what do I know. To try to address this, 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. Signed-off-by: Chuck Lever --- Gabor- Can you try this out? Either it will fix the problem, or it will tell us more about the issue. 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 f4baeb9..fd9171e 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) { @@ -634,7 +634,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) @@ -784,7 +784,7 @@ out: return result; } -__attribute_noinline__ +__attribute__((noinline)) static _Bool nsm_parse_line(char *line, struct sockaddr_in *sin, struct mon *m) {