From patchwork Sat Apr 4 05:24:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rosen Penev X-Patchwork-Id: 11474047 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E4C55913 for ; Sat, 4 Apr 2020 05:24:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C2449206D4 for ; Sat, 4 Apr 2020 05:24:57 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="ojlPDbsD" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725870AbgDDFY5 (ORCPT ); Sat, 4 Apr 2020 01:24:57 -0400 Received: from mail-pf1-f194.google.com ([209.85.210.194]:35754 "EHLO mail-pf1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725837AbgDDFY4 (ORCPT ); Sat, 4 Apr 2020 01:24:56 -0400 Received: by mail-pf1-f194.google.com with SMTP id a13so4706310pfa.2 for ; Fri, 03 Apr 2020 22:24:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=ImWtC4Jz16nGF2vzYYftcDrbYkx4HuFFHw2ldXuCG2w=; b=ojlPDbsDISs79Q12lW8gMP3OgW8HjLO9N622wnWbRe0tQuLOhkP97UAFVn+Bu12RQ4 xvdwQLVdMXHqNlnWD7+B4NWXZDZ6AXIO2kJjJ3FZKu8Y87poQzovDU5NUgQlXZgd0aef bKUOm5YGBBZMrNKwWwBpJ58+7fPChNQDQgqK7kyoklmtEVnJr1G74S0TqavLFyu78Ip7 +yWvygJJyYiaHEByNzv5ax2dG6mvw9ZLhSqJsZyWaY84ZvV6MiKnWQLtPsmJPPvSyA3o DJVbRvwWCl5Wb1F7QBi0BAlbQJcYsRbU+IQNpt4r8pIVqsydao53d8Rp7Xc6jkL4HWu8 J1bA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=ImWtC4Jz16nGF2vzYYftcDrbYkx4HuFFHw2ldXuCG2w=; b=eBl2fBxfIW4zOQEem9/bQrwrROo952wwCp2K6Z82a4y4DpwjP8r/+SMi1c2lYhIsdT VWlhPI8D1FtQRJLoTd94tVjblifOsc+ow8V7FVg2Tg/i/J/7ReTenVQ/9ufm1yQp+UBs oD/QHPFomt2tsUyTcFnLi3opvxU2oZtyg4cguaA5eRR/nqhUq5holURp10ESSw/Q4fDg hCxVCpH2Mu8+oplESXIjQDEKMlFW0gf63WfPKZrq5vHl7FOQvUNkuXzKXc58QITgS2D6 gNh/QNiShlRCJpU5UHkc3kV9KuvWPbj1El7H8+8IGqNV4hcmLNy7AKcJTUOvNfpEaUZI keUQ== X-Gm-Message-State: AGi0Pubi48Jt9hhfnQ5nwLnG2XTWz4ldYLOf0i9HCckut4yGAmqpSp4z JoC3JYsHRBJ7E0rMwUyh9ZMvoWDW5Tw= X-Google-Smtp-Source: APiQypJ1f0QvTQhXx8BHsNGSkGJZfaqhG7najpiRz2VmjykHlYNIURk8xn7P2HKqtGZg+guD+VjNvQ== X-Received: by 2002:a63:705d:: with SMTP id a29mr11142673pgn.304.1585977895337; Fri, 03 Apr 2020 22:24:55 -0700 (PDT) Received: from localhost.localdomain (astound-69-42-19-227.ca.astound.net. [69.42.19.227]) by smtp.gmail.com with ESMTPSA id n100sm6835531pjc.38.2020.04.03.22.24.54 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Apr 2020 22:24:54 -0700 (PDT) From: Rosen Penev To: linux-nfs@vger.kernel.org Subject: [PATCH 1/2] nfs-utils: print time in 64-bit Date: Fri, 3 Apr 2020 22:24:52 -0700 Message-Id: <20200404052453.2631191-1-rosenp@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org musl 1.2.0 defines time_t as 64-bit, even under 32-bit OSes. Fixes -Wformat errors. Signed-off-by: Rosen Penev --- support/nfs/cacheio.c | 3 ++- utils/idmapd/idmapd.c | 11 ++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/support/nfs/cacheio.c b/support/nfs/cacheio.c index 7c4cf373..126c1283 100644 --- a/support/nfs/cacheio.c +++ b/support/nfs/cacheio.c @@ -20,6 +20,7 @@ #endif #include +#include #include #include #include @@ -238,7 +239,7 @@ cache_flush(int force) stb.st_mtime > now) stb.st_mtime = time(0); - sprintf(stime, "%ld\n", stb.st_mtime); + sprintf(stime, "%" PRId64 "\n", (int64_t)stb.st_mtime); for (c=0; cachelist[c]; c++) { int fd; sprintf(path, "/proc/net/rpc/%s/flush", cachelist[c]); diff --git a/utils/idmapd/idmapd.c b/utils/idmapd/idmapd.c index c187e7d7..893159f1 100644 --- a/utils/idmapd/idmapd.c +++ b/utils/idmapd/idmapd.c @@ -54,6 +54,7 @@ #include #include #include +#include #include #include #include @@ -172,7 +173,7 @@ flush_nfsd_cache(char *path, time_t now) int fd; char stime[32]; - sprintf(stime, "%ld\n", now); + sprintf(stime, "%" PRId64 "\n", (int64_t)now); fd = open(path, O_RDWR); if (fd == -1) return -1; @@ -625,8 +626,8 @@ nfsdcb(int UNUSED(fd), short which, void *data) /* Name */ addfield(&bp, &bsiz, im.im_name); /* expiry */ - snprintf(buf1, sizeof(buf1), "%lu", - time(NULL) + cache_entry_expiration); + snprintf(buf1, sizeof(buf1), "%" PRId64, + (int64_t)time(NULL) + cache_entry_expiration); addfield(&bp, &bsiz, buf1); /* Note that we don't want to write the id if the mapping * failed; instead, by leaving it off, we write a negative @@ -653,8 +654,8 @@ nfsdcb(int UNUSED(fd), short which, void *data) snprintf(buf1, sizeof(buf1), "%u", im.im_id); addfield(&bp, &bsiz, buf1); /* expiry */ - snprintf(buf1, sizeof(buf1), "%lu", - time(NULL) + cache_entry_expiration); + snprintf(buf1, sizeof(buf1), "%" PRId64, + (int64_t)time(NULL) + cache_entry_expiration); addfield(&bp, &bsiz, buf1); /* Note we're ignoring the status field in this case; we'll * just map to nobody instead. */ From patchwork Sat Apr 4 05:24:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rosen Penev X-Patchwork-Id: 11474049 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id EB77B15AB for ; Sat, 4 Apr 2020 05:24:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C943C206F5 for ; Sat, 4 Apr 2020 05:24:58 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="DL/91K8D" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725871AbgDDFY6 (ORCPT ); Sat, 4 Apr 2020 01:24:58 -0400 Received: from mail-pg1-f193.google.com ([209.85.215.193]:37362 "EHLO mail-pg1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725837AbgDDFY5 (ORCPT ); Sat, 4 Apr 2020 01:24:57 -0400 Received: by mail-pg1-f193.google.com with SMTP id r4so3195219pgg.4 for ; Fri, 03 Apr 2020 22:24:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=JKl0SvnLAUkLiqnBo6JOuGYJiEqEsbOssjtoOxkju/U=; b=DL/91K8D8v+zhKRjYhY35qeKLAD+IelwhM/uOs1DZRvcs4k/52dVZoEsfiwBx2GcUf sJ3Ry8VHtNxuR3rNVwmiVFfYc/owzbCH949pi9SiQ3fBYmmjIFVWeJ7v/7xzulGjXGny GO/vKtZslXQxBvCca60tW1rURCme6WeX0RiR7MVneh8rBQ5VTtvBiuFi3jN5zf+rlyWz 4+Tqmu0u6QN5lkKDcq6O+tZ2Jxq+2KO4OF0/G5ZhzSWYM7CAn2i1JnyAvrgoSrYt51lc 8Da5HUYBmwjUfqb8OrV8Bmj9Rf5QnGS+qMyQ1tR1O+wcOQ4RRmc/5jkCYDAKe1Blxr2c xoJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=JKl0SvnLAUkLiqnBo6JOuGYJiEqEsbOssjtoOxkju/U=; b=DaBdZRHdSv7WMwQ4eedoIBKOIfIZA7oHKuJvk1Vm6mskO28lZ1GhS5mXnKWN7Qm3rj QKHS22NewGretNE5Mb7uWNHi0G/63nZoaffPIQl85YidaDDzYCCRMh8cpeNZL1nXenHz 9ADAjG9+YNrt47BJdpFJvOwnIMLtOq7kzeR+ClmcOOP9zqD7om7Bgjp3FsgUEMs43DFC vHmJCArIONmB50PipAWzbMrDN409WgvNZLhhmXbnmLNffUAvKDoqOu9siGD+AaLICsV/ c/rnpzopbMpw1hJGoCtfdmQdOON4qNw8u20NYatybO+8sfQdc3APDS6Hp2yAKuzP0DG5 Fcnw== X-Gm-Message-State: AGi0PuYJW0GA9ZS4iD6iHeMz5cmnC30Bd1nCYEF3Pz8rDCKZdBMBYxbG wD+MP2K/9oX96WFTAyTzwm/74q0QT0k= X-Google-Smtp-Source: APiQypJbN1EDYg2uxYzYdfY7wRtuOOjAG4303cjQ6jL1epbdz23MBlCywS9RHo0GrtUcWIEMzNFQxg== X-Received: by 2002:a63:8b42:: with SMTP id j63mr10791334pge.27.1585977896425; Fri, 03 Apr 2020 22:24:56 -0700 (PDT) Received: from localhost.localdomain (astound-69-42-19-227.ca.astound.net. [69.42.19.227]) by smtp.gmail.com with ESMTPSA id n100sm6835531pjc.38.2020.04.03.22.24.55 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Apr 2020 22:24:55 -0700 (PDT) From: Rosen Penev To: linux-nfs@vger.kernel.org Subject: [PATCH 2/2] nfs-utils: tools: use nls.h Date: Fri, 3 Apr 2020 22:24:53 -0700 Message-Id: <20200404052453.2631191-2-rosenp@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200404052453.2631191-1-rosenp@gmail.com> References: <20200404052453.2631191-1-rosenp@gmail.com> MIME-Version: 1.0 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org libintl.h is not available everywhere. This fixes compilation. Signed-off-by: Rosen Penev --- tools/rpcgen/rpc_main.c | 2 +- tools/rpcgen/rpc_scan.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/rpcgen/rpc_main.c b/tools/rpcgen/rpc_main.c index 1b26e522..e97940b9 100644 --- a/tools/rpcgen/rpc_main.c +++ b/tools/rpcgen/rpc_main.c @@ -42,7 +42,6 @@ #include #include #include -#include #include #include #include @@ -54,6 +53,7 @@ #include "rpc_util.h" #include "rpc_scan.h" #include "proto.h" +#include "nls.h" #ifndef _ #define _(String) gettext (String) diff --git a/tools/rpcgen/rpc_scan.c b/tools/rpcgen/rpc_scan.c index 79eba964..7de61120 100644 --- a/tools/rpcgen/rpc_scan.c +++ b/tools/rpcgen/rpc_scan.c @@ -37,11 +37,11 @@ #include #include #include -#include #include "rpc_scan.h" #include "rpc_parse.h" #include "rpc_util.h" #include "proto.h" +#include "nls.h" #ifndef _ #define _(String) gettext (String)