From patchwork Fri Sep 11 18:47:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 11771373 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 889176CA for ; Fri, 11 Sep 2020 18:47:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6DBCF22206 for ; Fri, 11 Sep 2020 18:47:55 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="euHCAfns" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725802AbgIKSry (ORCPT ); Fri, 11 Sep 2020 14:47:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37136 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725770AbgIKSrv (ORCPT ); Fri, 11 Sep 2020 14:47:51 -0400 Received: from mail-qk1-x744.google.com (mail-qk1-x744.google.com [IPv6:2607:f8b0:4864:20::744]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D1F6EC061573 for ; Fri, 11 Sep 2020 11:47:50 -0700 (PDT) Received: by mail-qk1-x744.google.com with SMTP id v123so10852699qkd.9 for ; Fri, 11 Sep 2020 11:47:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:subject:from:to:cc:date:message-id:in-reply-to:references :user-agent:mime-version:content-transfer-encoding; bh=xSfW6wIwUq3YUihnsN2UPFH/Xgm9Me+WED1TbujSKTc=; b=euHCAfnsvfIgZiOhkwSxeKDVLl0KJnkHc3MbqnmSmGLMlL+QoxA0d+MDBHIkzvnmbu nXRW6JdaLZ9mqX+J2dSfHoUG/gO4aoY/PryeK4zKjLDuktEZfIGH8iPfME54U/kiu4m/ qpDfzm7WN1+Q4utga6Ty8xpv2Ms1autl1R8TlyYzMHfGTEGJJOHkM00/ihH66NNc3wvW FQlRoO7R2U0nNzFVakEz6yip4S34T0Smr1n9MNHkHqkSciPhVNJOb4X+hu39u1QisoEf fEtp+l/j9p435tv0yyxWBS2UOU12YT5+p+jtpd5qx6Lsr0SNRz7fIWZfxjqRbj5mr4ML myPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:subject:from:to:cc:date:message-id :in-reply-to:references:user-agent:mime-version :content-transfer-encoding; bh=xSfW6wIwUq3YUihnsN2UPFH/Xgm9Me+WED1TbujSKTc=; b=Pzg3VGF59PmHhD13uyJQK114XVI98OzpYFjIH/q77pMDSN4XRMTftZA4EGhwwWbyeO nMHPS+adEjzAAcCwIGzIdWPJPSk13xqfymxiVltcA3fZTxoQdpslTHisW11ti4uEa8ZN p31gePKLnPN5S1KF5Ezluge900sK55PuIZIp98W8YNa4OGzfUujiCb9i20PNxPhbTZtg Fo2OpNfOpUdux4zw2h/MjzW9EjdMy29adgyEJSYyPumu1hBWBJrPtnpnSmo92/f3q5vo +v6DKBD7iJ61vaDyHez5LKKZyN5LNTnei1lN7RxVTsGoIFO1xzC4ngsl0rvyZzuz3zPq ApTQ== X-Gm-Message-State: AOAM532AW3FPghCuDEFi6VXmbabfbm6i7eFRWwJSvilj7i6SpKJwLHFP 4gXelfqt8BlhzJiM53UvVEJIlH4csPA= X-Google-Smtp-Source: ABdhPJxjv5b1kNEdnVxrkT3zruy3p6aX3SKxxwCK7Ru7834XGrZj4/LybQfIgd1nIRVebMFchHEMlw== X-Received: by 2002:a37:e118:: with SMTP id c24mr2969950qkm.167.1599850070167; Fri, 11 Sep 2020 11:47:50 -0700 (PDT) Received: from gateway.1015granger.net (c-68-61-232-219.hsd1.mi.comcast.net. [68.61.232.219]) by smtp.gmail.com with ESMTPSA id 15sm3371019qka.96.2020.09.11.11.47.49 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 11 Sep 2020 11:47:49 -0700 (PDT) Received: from klimt.1015granger.net (klimt.1015granger.net [192.168.1.55]) by gateway.1015granger.net (8.14.7/8.14.7) with ESMTP id 08BIlmm3000609; Fri, 11 Sep 2020 18:47:48 GMT Subject: [PATCH 1/3] NFSD: Correct type annotations in user xattr helpers From: Chuck Lever To: bfields@fieldses.org Cc: linux-nfs@vger.kernel.org Date: Fri, 11 Sep 2020 14:47:48 -0400 Message-ID: <159985006858.2942.16920859739287624589.stgit@klimt.1015granger.net> In-Reply-To: <159985000766.2942.3348280669087987448.stgit@klimt.1015granger.net> References: <159985000766.2942.3348280669087987448.stgit@klimt.1015granger.net> User-Agent: StGit/0.23 MIME-Version: 1.0 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org Squelch some sparse warnings: /home/cel/src/linux/linux/fs/nfsd/vfs.c:2264:13: warning: incorrect type in assignment (different base types) /home/cel/src/linux/linux/fs/nfsd/vfs.c:2264:13: expected int err /home/cel/src/linux/linux/fs/nfsd/vfs.c:2264:13: got restricted __be32 /home/cel/src/linux/linux/fs/nfsd/vfs.c:2266:24: warning: incorrect type in return expression (different base types) /home/cel/src/linux/linux/fs/nfsd/vfs.c:2266:24: expected restricted __be32 /home/cel/src/linux/linux/fs/nfsd/vfs.c:2266:24: got int err /home/cel/src/linux/linux/fs/nfsd/vfs.c:2288:13: warning: incorrect type in assignment (different base types) /home/cel/src/linux/linux/fs/nfsd/vfs.c:2288:13: expected int err /home/cel/src/linux/linux/fs/nfsd/vfs.c:2288:13: got restricted __be32 /home/cel/src/linux/linux/fs/nfsd/vfs.c:2290:24: warning: incorrect type in return expression (different base types) /home/cel/src/linux/linux/fs/nfsd/vfs.c:2290:24: expected restricted __be32 /home/cel/src/linux/linux/fs/nfsd/vfs.c:2290:24: got int err Signed-off-by: Chuck Lever --- fs/nfsd/vfs.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c index aba5af9df328..1ecaceebee13 100644 --- a/fs/nfsd/vfs.c +++ b/fs/nfsd/vfs.c @@ -2259,7 +2259,8 @@ nfsd_listxattr(struct svc_rqst *rqstp, struct svc_fh *fhp, char **bufp, __be32 nfsd_removexattr(struct svc_rqst *rqstp, struct svc_fh *fhp, char *name) { - int err, ret; + __be32 err; + int ret; err = fh_verify(rqstp, fhp, 0, NFSD_MAY_WRITE); if (err) @@ -2283,7 +2284,8 @@ __be32 nfsd_setxattr(struct svc_rqst *rqstp, struct svc_fh *fhp, char *name, void *buf, u32 len, u32 flags) { - int err, ret; + __be32 err; + int ret; err = fh_verify(rqstp, fhp, 0, NFSD_MAY_WRITE); if (err) From patchwork Fri Sep 11 18:47:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 11771375 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 7528659D for ; Fri, 11 Sep 2020 18:47:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5903822206 for ; Fri, 11 Sep 2020 18:47:59 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="toji0IhS" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725811AbgIKSr5 (ORCPT ); Fri, 11 Sep 2020 14:47:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37148 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725770AbgIKSr4 (ORCPT ); Fri, 11 Sep 2020 14:47:56 -0400 Received: from mail-qk1-x741.google.com (mail-qk1-x741.google.com [IPv6:2607:f8b0:4864:20::741]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1E1D3C061573 for ; Fri, 11 Sep 2020 11:47:56 -0700 (PDT) Received: by mail-qk1-x741.google.com with SMTP id q63so10089240qkf.3 for ; Fri, 11 Sep 2020 11:47:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:subject:from:to:cc:date:message-id:in-reply-to:references :user-agent:mime-version:content-transfer-encoding; bh=5v4DY0Ii1ZZbMCFEDtf37Lx0oQgQAcbuz4MOmcCwAVA=; b=toji0IhSoExezXBVWiKQLDlojZ46tVRM2tz7N4+PVnMyy9T8f6eL4UCWq9Dbr4PJz6 SwB8bqVv+rG1Gi31nS+D5zZddkBiUF/PpgXUppDFTDJEqkyH9pMAXksBQQ8wPTouDW+9 nRbznDKABDonO0vMfqyKaH9vy9KYRjruMUKM+rhisYWzkXra7QBzYhft+wFN76G8hYsG D2CU9o04nhs4rV+c/VVaGC28UBLL0Qn/rQSr357C3YhFh44vuRiYMdLUTjMwCyPyhMAG t3nQkFIXlz0le7flkoZD9NX75VTl3sla08E2XG5X4U3r3u1cHzMrtHyUMNtLReKTt7H/ qGiQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:subject:from:to:cc:date:message-id :in-reply-to:references:user-agent:mime-version :content-transfer-encoding; bh=5v4DY0Ii1ZZbMCFEDtf37Lx0oQgQAcbuz4MOmcCwAVA=; b=ilk6I/Ap7vTjoVjePmzpjei49rqlqArz69cKttFNf7jX0L5754Ltecw+kLaDBtSMrG 3qnmV1QvYo0MI5i+ihzSdH5jI8BW1YdXDCfjLxrsf00Yuc7JZ7ePfpI2Kdg3ijS43mfg XWE3SsKLULc16RtfjJMs117rE9wPIXn1T0Q5/+h704CPU6GulH0aslrWjgFnRmL9LfyF I240cBQgaPz2eW/us1o9Is1xv7YwvnZ90gJZb4KHEs0Mw3cvT3KmQkIcnkrMqpwRlPKN OBqb9iGiU/nM25Wwg0pFgIbicgmKMoWlJFxNPR/7XbrkAfaJTRTSEpChHH2VNYYg9SLG omnA== X-Gm-Message-State: AOAM533jCcfuz+4HBkDiWdGMhXROCpo5rvjJhULApYDfm2Ux/4+Bf2Zx 5EU34Lsg2CYK5aM2bUrNptQ= X-Google-Smtp-Source: ABdhPJxJobEr1P7yUO4gAsssO5Z+WulZJ8HwmdJVqRlvA42VnAttyfruijMpckcNetQ0NW/XHD0cOA== X-Received: by 2002:a37:9d8:: with SMTP id 207mr2708428qkj.465.1599850075392; Fri, 11 Sep 2020 11:47:55 -0700 (PDT) Received: from gateway.1015granger.net (c-68-61-232-219.hsd1.mi.comcast.net. [68.61.232.219]) by smtp.gmail.com with ESMTPSA id w44sm3980789qth.9.2020.09.11.11.47.54 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 11 Sep 2020 11:47:54 -0700 (PDT) Received: from klimt.1015granger.net (klimt.1015granger.net [192.168.1.55]) by gateway.1015granger.net (8.14.7/8.14.7) with ESMTP id 08BIlrB1000612; Fri, 11 Sep 2020 18:47:53 GMT Subject: [PATCH 2/3] NFSD: Correct type annotations in user xattr XDR functions From: Chuck Lever To: bfields@fieldses.org Cc: linux-nfs@vger.kernel.org Date: Fri, 11 Sep 2020 14:47:53 -0400 Message-ID: <159985007369.2942.4863257585974158408.stgit@klimt.1015granger.net> In-Reply-To: <159985000766.2942.3348280669087987448.stgit@klimt.1015granger.net> References: <159985000766.2942.3348280669087987448.stgit@klimt.1015granger.net> User-Agent: StGit/0.23 MIME-Version: 1.0 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org Squelch some sparse warnings: /home/cel/src/linux/linux/fs/nfsd/nfs4xdr.c:4692:24: warning: incorrect type in return expression (different base types) /home/cel/src/linux/linux/fs/nfsd/nfs4xdr.c:4692:24: expected int /home/cel/src/linux/linux/fs/nfsd/nfs4xdr.c:4692:24: got restricted __be32 [usertype] /home/cel/src/linux/linux/fs/nfsd/nfs4xdr.c:4702:32: warning: incorrect type in return expression (different base types) /home/cel/src/linux/linux/fs/nfsd/nfs4xdr.c:4702:32: expected int /home/cel/src/linux/linux/fs/nfsd/nfs4xdr.c:4702:32: got restricted __be32 [usertype] /home/cel/src/linux/linux/fs/nfsd/nfs4xdr.c:4739:13: warning: incorrect type in assignment (different base types) /home/cel/src/linux/linux/fs/nfsd/nfs4xdr.c:4739:13: expected restricted __be32 [usertype] err /home/cel/src/linux/linux/fs/nfsd/nfs4xdr.c:4739:13: got int /home/cel/src/linux/linux/fs/nfsd/nfs4xdr.c:4891:15: warning: incorrect type in assignment (different base types) /home/cel/src/linux/linux/fs/nfsd/nfs4xdr.c:4891:15: expected unsigned int [assigned] [usertype] count /home/cel/src/linux/linux/fs/nfsd/nfs4xdr.c:4891:15: got restricted __be32 [usertype] Signed-off-by: Chuck Lever --- fs/nfsd/nfs4xdr.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c index 259d5ad0e3f4..400b41b86595 100644 --- a/fs/nfsd/nfs4xdr.c +++ b/fs/nfsd/nfs4xdr.c @@ -4679,7 +4679,7 @@ nfsd4_encode_noop(struct nfsd4_compoundres *resp, __be32 nfserr, void *p) /* * Encode kmalloc-ed buffer in to XDR stream. */ -static int +static __be32 nfsd4_vbuf_to_stream(struct xdr_stream *xdr, char *buf, u32 buflen) { u32 cplen; @@ -4795,7 +4795,7 @@ nfsd4_encode_listxattrs(struct nfsd4_compoundres *resp, __be32 nfserr, u32 xdrlen, offset; u64 cookie; char *sp; - __be32 status; + __be32 status, tmp; __be32 *p; u32 nuser; @@ -4888,8 +4888,8 @@ nfsd4_encode_listxattrs(struct nfsd4_compoundres *resp, __be32 nfserr, cookie = offset + count; write_bytes_to_xdr_buf(xdr->buf, cookie_offset, &cookie, 8); - count = htonl(count); - write_bytes_to_xdr_buf(xdr->buf, count_offset, &count, 4); + tmp = cpu_to_be32(count); + write_bytes_to_xdr_buf(xdr->buf, count_offset, &tmp, 4); out: if (listxattrs->lsxa_len) kvfree(listxattrs->lsxa_buf); From patchwork Fri Sep 11 18:47:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 11771377 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 8E78B6CA for ; Fri, 11 Sep 2020 18:48:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 731BF2220D for ; Fri, 11 Sep 2020 18:48:03 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="sl1WOq58" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725778AbgIKSsC (ORCPT ); Fri, 11 Sep 2020 14:48:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37166 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725770AbgIKSsB (ORCPT ); Fri, 11 Sep 2020 14:48:01 -0400 Received: from mail-qk1-x741.google.com (mail-qk1-x741.google.com [IPv6:2607:f8b0:4864:20::741]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6261DC061573 for ; Fri, 11 Sep 2020 11:48:01 -0700 (PDT) Received: by mail-qk1-x741.google.com with SMTP id 16so10868925qkf.4 for ; Fri, 11 Sep 2020 11:48:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:subject:from:to:cc:date:message-id:in-reply-to:references :user-agent:mime-version:content-transfer-encoding; bh=dcpcJOAfdX7phZTBJ6X9Xgyoq5LLGtivwxggKqT1L6c=; b=sl1WOq58MJuy9+fM0M1MN2kiN31ThEJAdWt8ggH3iS7MORzOD6QyOGMUELja/vCk6H 5LJD+R+DF7rBLc5XnM7Wd8agg6K4WM2/5xDhNWbGYeRpjrZl0xVLSgPf5LNogAFY7IZE oF5BXkZQEmZaC9+WxfKjRorFXiKqGwo0Q3oMXjYjcqnRFAn47d58yPXGpbZlUT2+0Qla Bl5VcOemK1yWFsrjJcEFbAhhfq53uDCfGu3ThvGqPWR/gpMge/kVuHnb31UM/bAkde/U qPDabKxQLAoWvReQM58h/O7vvyCYIa3CSgzbVbw4EMrY3KqhFRkLUf22Jh0hxVZypaok EvAQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:subject:from:to:cc:date:message-id :in-reply-to:references:user-agent:mime-version :content-transfer-encoding; bh=dcpcJOAfdX7phZTBJ6X9Xgyoq5LLGtivwxggKqT1L6c=; b=EAffEvhVpQT00JKUZ6MIvm/D8ajW/9v/9SOpE3RNRspnLi9A57DhJCAmsfEhBYetFu pS28vq0M2UEeuhiql/mcY5YTgYXhu1oGDWFEVoMkkDdpPB8Y5bNm60xtlwoxX959IPCr MGNtCnavBBOiagJXL2w2wTSEqXTlh5acOuMKPm/reJ5BamBtq4SwVL77eqjp7e510bKd n9IJvB/Jg+D5q2GGO+Dxfzw/ugE81DeVkfYXs16eNRSTRbyqetk+Ok3PBxshwAktjiYq Rnfuv+NwojAh+PKAthkmu/G5qWfsM0A+rX3l/jK3BV99NMtIIAYsfGx2O2k6YU5B7G7a N1Kw== X-Gm-Message-State: AOAM530UY2pGx6zqEduCtMp+n2jHhF6b5PpUUCBG2qm0IOcbwQXpex07 lPVxx8QSdUSzDcLqpC7Yr0g= X-Google-Smtp-Source: ABdhPJyhOYJAUa2HOYZJXGRQUGoNVO88W6H3KGUf3YwSJtIKJgGLIzoGO5dbrT5+EYPKo9Wbq2uBNA== X-Received: by 2002:a37:381:: with SMTP id 123mr2802860qkd.320.1599850080696; Fri, 11 Sep 2020 11:48:00 -0700 (PDT) Received: from gateway.1015granger.net (c-68-61-232-219.hsd1.mi.comcast.net. [68.61.232.219]) by smtp.gmail.com with ESMTPSA id e90sm3728306qtd.4.2020.09.11.11.47.59 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 11 Sep 2020 11:48:00 -0700 (PDT) Received: from klimt.1015granger.net (klimt.1015granger.net [192.168.1.55]) by gateway.1015granger.net (8.14.7/8.14.7) with ESMTP id 08BIlx1U000615; Fri, 11 Sep 2020 18:47:59 GMT Subject: [PATCH 3/3] NFSD: Correct type annotations in COPY XDR functions From: Chuck Lever To: bfields@fieldses.org Cc: linux-nfs@vger.kernel.org Date: Fri, 11 Sep 2020 14:47:59 -0400 Message-ID: <159985007900.2942.167096627702671917.stgit@klimt.1015granger.net> In-Reply-To: <159985000766.2942.3348280669087987448.stgit@klimt.1015granger.net> References: <159985000766.2942.3348280669087987448.stgit@klimt.1015granger.net> User-Agent: StGit/0.23 MIME-Version: 1.0 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org Squelch some sparse warnings: /home/cel/src/linux/linux/fs/nfsd/nfs4xdr.c:1860:16: warning: incorrect type in assignment (different base types) /home/cel/src/linux/linux/fs/nfsd/nfs4xdr.c:1860:16: expected int status /home/cel/src/linux/linux/fs/nfsd/nfs4xdr.c:1860:16: got restricted __be32 /home/cel/src/linux/linux/fs/nfsd/nfs4xdr.c:1862:24: warning: incorrect type in return expression (different base types) /home/cel/src/linux/linux/fs/nfsd/nfs4xdr.c:1862:24: expected restricted __be32 /home/cel/src/linux/linux/fs/nfsd/nfs4xdr.c:1862:24: got int status Signed-off-by: Chuck Lever --- fs/nfsd/nfs4xdr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c index 400b41b86595..f14d90a95fe3 100644 --- a/fs/nfsd/nfs4xdr.c +++ b/fs/nfsd/nfs4xdr.c @@ -1855,7 +1855,7 @@ static __be32 nfsd4_decode_copy_notify(struct nfsd4_compoundargs *argp, struct nfsd4_copy_notify *cn) { - int status; + __be32 status; status = nfsd4_decode_stateid(argp, &cn->cpn_src_stateid); if (status)