From patchwork Tue Mar 29 19:36:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 12795209 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 28BAAC433EF for ; Tue, 29 Mar 2022 19:36:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234810AbiC2Tht (ORCPT ); Tue, 29 Mar 2022 15:37:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39844 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234102AbiC2Tht (ORCPT ); Tue, 29 Mar 2022 15:37:49 -0400 Received: from NAM04-BN8-obe.outbound.protection.outlook.com (mail-bn8nam08on2100.outbound.protection.outlook.com [40.107.100.100]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 59295986D7; Tue, 29 Mar 2022 12:36:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HlsbG2YWtr3A3W6ScELNcAtSFqAWX3r/sP4dXG+34alsGDldP2IiBwr7Yq4MCAKFBQsVS/LyIp+7IDz0O7+9NqQsHrU2nJ9vYmAeQdWvnXIkyrOIjCliomqHpiSMlUDRpmFK9OwpQHdAkG1HHgNjTHIr74NxyrkIUHvO1ZMEjEHrD1OeIcCpAVOQzHam/mCQuq287tuwTkfojBqJxXb2H/rsVlERpb53npJHfEzjYxM5j4GoCqwpFoT3wgyqLnj+9NgBERnV8M/H71SLT9Arl1cxMAtipGqY60zrOj7As8A/jOpthNihWQoIMZ2M7WBZzQ4LWHny+qfhewvwixnjCg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=oYuCFnPJczvaxfCZ4QDK+Issum4r61sQj91EcKcg2Vc=; b=B/unINA2cDerDHgd9Zpcfwcyhkpor5KNQLoNlLh3dICQqNv5z/8OkYS63q1sjlMV0vVtWGa084MDBq5Wnfx38z0GF9AOkbE9zMmJ+6yF3BPdAt/LTWBR/o6eiHZU9+IIELh4Nd7dCxWr1o/nCXsqoA+KD8qso6B2O1zhHGjvDLeHzX3ORx72iRKQ6ETRyojKZUxjFu25jc8ZbnD95jzJU7W5lH67UIN8//nQdjiVeppZcJ0Hq4kQnJsC4gpZ4hXKeJbBVbQ1vmD/2WHQRFmTUt9ewG2xWsKDN7e7JQhyglm7ndwQY3wBcgVzvQd8Xu3QrzYxmy1cELp8Xi8eKkdOlA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=hammerspace.com; dmarc=pass action=none header.from=hammerspace.com; dkim=pass header.d=hammerspace.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hammerspace.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=oYuCFnPJczvaxfCZ4QDK+Issum4r61sQj91EcKcg2Vc=; b=cLlyJXFxt9GqtypQD2BdrKjzuoHRLUpJJUu4IX49R+fLO41u7vvrDG7HNyIH2dybKvZjLjWN7M4LqGyUqo+X53e93dYHnEqG6yM2LWwvktiHro5gYF4+6oLKNFhTw7PnlXB+2Fbh1aCWU0llhjo6t81PM+LnHaMvgIEBThH+WFQ= Received: from CH0PR13MB5084.namprd13.prod.outlook.com (2603:10b6:610:111::7) by DM6PR13MB4558.namprd13.prod.outlook.com (2603:10b6:5:20d::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5123.8; Tue, 29 Mar 2022 19:36:00 +0000 Received: from CH0PR13MB5084.namprd13.prod.outlook.com ([fe80::c0b:4fda:5713:9006]) by CH0PR13MB5084.namprd13.prod.outlook.com ([fe80::c0b:4fda:5713:9006%7]) with mapi id 15.20.5123.016; Tue, 29 Mar 2022 19:36:00 +0000 From: Trond Myklebust To: "torvalds@linux-foundation.org" CC: "linux-nfs@vger.kernel.org" , "linux-kernel@vger.kernel.org" Subject: [GIT PULL] Please pull NFS client changes for Linux 5.18 Thread-Topic: [GIT PULL] Please pull NFS client changes for Linux 5.18 Thread-Index: AQHYQ6Q4oVl0Qpju8kuE1WA18VVEPQ== Date: Tue, 29 Mar 2022 19:36:00 +0000 Message-ID: <7b0576d8d49bbd358767620218c1966e8fe9a883.camel@hammerspace.com> Accept-Language: en-US, en-GB Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=hammerspace.com; x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: d78928c0-a4bf-4fc4-85a8-08da11bb5acd x-ms-traffictypediagnostic: DM6PR13MB4558:EE_ x-microsoft-antispam-prvs: x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: T05atY2zU+8vz2O75WsCuObcIX/7oYNeL3U53yWKJwmZDRhBdfw3doOUJ3Gca32hxRNCxgw1LfOgZdTr+UKoNS/rih7ad/qbnGR4fSHaRkuO/XmqXh9/FvhMO/yJmBo8xQGkc611elO0kDymjqFCJvH/C3q89YcO6kse9i4DC6HI5BHwX4Cnd/nZ5FHB4jpl5YPDP2+DcRGJ48G7UzJ1ZVNZNtKhCanF5pqelHOzOks5uMC/Ni8ME4kg+sbDTZYXOpIOhUdkydBuQGX5Q913Mg9OWG9rN8Upzx8ZZ6pnDJF+Xms+CtjAToccFk2IuAHIBWJGcT+fYImD1PlH4MvUxpEtXeoiSteq8rlSVYGk8ICgUGnhoCbiwAivkrl1bo9JnIo1HHzwjSqRWVHD69V0+pD8zApOmK+VzH0DL7Zlq125mgpmGqYdNkyu1EDWQSpJ4v3OKCAY02pduyl2hHY+Q2x/ncyRGMiTZAU5/9xZrlq8+raf4jadA9PSAvXYoT1sZ8xGEnhxHikC3jfSD+4KgAZKwhSEsYFXWfYCYWR1SVSsIGVI1FYdtOgCPtpioEYcxxhsLQoBt4YeER/WrJmHPhhRniwsf62DtuhUdSFajrztqSVWA25FZk3DN2YiY+uzvS8BtXwzJ0sPIVIw4V310+RNArao9iD8SQAb53f2hTaXMZjVMxYkJ0B1xsjxkLF006hCRmAU2wbksP2/G5qdjg== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CH0PR13MB5084.namprd13.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(36756003)(66556008)(66476007)(66946007)(316002)(66446008)(71200400001)(6486002)(86362001)(54906003)(64756008)(6916009)(76116006)(6512007)(6506007)(508600001)(2906002)(38100700002)(186003)(122000001)(38070700005)(83380400001)(8936002)(2616005)(8676002)(5660300002)(4326008)(26005);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?q?q7wQXRVtKtWBCHtK8sT0YcvvTwz3?= =?utf-8?q?PT2mejtz05rKzDGO/RRj0V+Hj0m+0W4ZtFxbIGF+kOeXs7yJdODlaZfINNXZhNQzR?= =?utf-8?q?mTp+Jh+3aE50ddmUZYo3uPlITVGm76PjA4QwiYIw6b0g+1p4f0J5It9vWHrYqO7Mo?= =?utf-8?q?WXgzQM7tlCtuue4iZetv09lkszPDSEWbL2hsMa6jiG4L37TxU3Iul2ZU3KI3v8zQg?= =?utf-8?q?cqdYcHwl6yLF8YzHV82phWjU6Hqa7O4EGQLuX9i0Nl6v5JlqodKYO3qjWv1Mvy/iF?= =?utf-8?q?3iSnos5i3bIiGTviLzm7LdH1L+3oG9RCk5CGEaeQCTl/J/9xQYOZ0PkSkzpvAMFnQ?= =?utf-8?q?DtljRVg/IYQhhVMLd5gRWqD1TT6DJJFKabtb4O+1eg5sW4CIjmzEzri44SHO2Erwr?= =?utf-8?q?iMqJKEA4GPo0D7ZOfa15jOilBXDtCNe2CEZ0DIJyalZf98hbVakmDE5io2n43H5Cd?= =?utf-8?q?Q50Yq0VJNuoS3qzxb7tVM27ZmtZMeBtayz0I2aakX2rhN170xCfQWtTQcLE2V7R+/?= =?utf-8?q?f9oSs0CeGflkgXHZ+loAbm/0yNqPyIwePzPHkDmPfe2psHBKuKLjiZRkrzzMfHNgZ?= =?utf-8?q?WHAkz8UTHCMv7dr7ch7R+xljLoHzxXJeMVMttWKK7indkWPQde+tpjHxw2f2CpkHV?= =?utf-8?q?S8FEXSHE0YewL1dTHkh1Hc6EgnB2Y4ELx55KG1V4eJPBsAxIsHo6h2ljbb7oWjett?= =?utf-8?q?VhQqKjVmOFYCvUMYaRRBDGvDUOvm7+6KyjqHrU2SPIy+nXHxGX4nCAuA+VPQ6O/VR?= =?utf-8?q?Ik4vehE+iFAIMiPylNg5XCgCpJo1cW/tTtRl3MQ7tzVdpjk+IKDrx/MZOi2eexUpH?= =?utf-8?q?dyo9Vl5th1g1t0KHLGYcTKRbQcNEwMOT1cgd7k4nMmG2HxxqmXNSpDEEky3vuuHdb?= =?utf-8?q?ieENaNBtcnRj3+DkU3bfiqol+6dH5iVKMS02I8djIAV6ur9NvWmzes8RHWANRu4Tz?= =?utf-8?q?q+zvksaPijylxoyTiqwrQl/Wc8gog6goWEaPgQxp4UbYEpo24859XX+3Z0bHI+xl6?= =?utf-8?q?ukjrnzCvUC42setCPAl3otfKJrgKQGoYpgGiqUXMDXM+fqMtDMJr7g5Ih8P6rseLw?= =?utf-8?q?GgEHrlwXoMZlrxmzibZkNZ2Lyb7GA6FeJJU2Xz5au0DOsATM8aTcfsrIlQOZnQLYB?= =?utf-8?q?a1gCxAlGBx3Gp6mLhXsXQzr6sAGb3/T8fEiYRRdu1nuYthC8x0hafP9rGHBENwnex?= =?utf-8?q?+ufF3tvvj/bMAwwy7WIYcYTc4DrXDTdgJbsyKc0HGr31p8OaoW8gLUnIWiEecOa7S?= =?utf-8?q?S2/QDyiDGJ/WCbBgniNmUXCVusaViw1q5twJhUMDmaCuTWD903pp8ZHTEg9yTd6EV?= =?utf-8?q?6Kl+vVhUSXFTUAkn4BZ2uziiuMTUEYRDX+kyP3Od+cFWXBw8z6MgrX+8W08hKQbU1?= =?utf-8?q?36kCsb9Lu9HKXJprUMaeeXmnmI0ZflaQ+KTqAbdKrfd8Cvnti4eLehRKrfKw2jWve?= =?utf-8?q?d6Tv6020vVoO1jFZoB7Qzz5f4tljpqgmpDP4rM1sTEWHobvxIDy+TjtVANlMIAoJw?= =?utf-8?q?H7NQxKjMT/ASh9QqbWzqdz1/vzO7SoebjPSVu257IuxKCSXKDnIn+NuymK5GJXMG+?= =?utf-8?q?WS74CnoUuNfoP3gCRs9Gf2pesRJTN9W3AJAucxzaeX0RUKD6M0MvvJzOOPFOenVAh?= =?utf-8?q?YkiVjTT1Dxc+93YSPdcQMeLFF2xtTLgnNo8WptqC8qgv2AdOJntnQ=3D?= Content-ID: MIME-Version: 1.0 X-OriginatorOrg: hammerspace.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: CH0PR13MB5084.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: d78928c0-a4bf-4fc4-85a8-08da11bb5acd X-MS-Exchange-CrossTenant-originalarrivaltime: 29 Mar 2022 19:36:00.4915 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 0d4fed5c-3a70-46fe-9430-ece41741f59e X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: J4Jz+RAjrDkV7GT16EYCo9D2Y+r7jTCdnZJJ67Z/UEXXvlokqkOJipJKKebWKdWjiMT9koDfZ69dcB9PQjfGtA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR13MB4558 Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org Hi Linus, The following changes since commit 53ab78cd6d5aba25575a7cfb95729336ba9497d8: Merge tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux (2022-02-24 17:35:22 -0800) are available in the Git repository at: git://git.linux-nfs.org/projects/trondmy/linux-nfs.git tags/nfs-for-5.18-1 for you to fetch changes up to 7c9d845f0612e5bcd23456a2ec43be8ac43458f1: NFSv4/pNFS: Fix another issue with a list iterator pointing to the head (2022-03-28 08:36:34 -0400) Please note that Stephen Rothwell has reported a conflict between this branch and upstream: On Tue, 15 Mar 2022 20:45:40 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the folio tree got a conflict in: > > fs/nfs/file.c > > between commit: > > 8786fde8421c ("Convert NFS from readpages to readahead") > > from the nfs tree and commit: > > 821405cf3ebb ("fs: Convert trivial uses of __set_page_dirty_nobuffers to filemap_dirty_folio") > > from the folio tree. The fix should be trivial. Thanks, Trond ---------------------------------------------------------------- NFS client updates for Linux 5.18 Highlights include: Features: - Switch NFS to use readahead instead of the obsolete readpages. - Readdir fixes to improve cacheability of large directories when there are multiple readers and writers. - Readdir performance improvements when doing a seekdir() immediately after opening the directory (common when re-exporting NFS). - NFS swap improvements from Neil Brown. - Loosen up memory allocation to permit direct reclaim and write back in cases where there is no danger of deadlocking the writeback code or NFS swap. - Avoid sillyrename when the NFSv4 server claims to support the necessary features to recover the unlinked but open file after reboot. Bugfixes: - Patch from Olga to add a mount option to control NFSv4.1 session trunking discovery, and default it to being off. - Fix a lockup in nfs_do_recoalesce(). - Two fixes for list iterator variables being used when pointing to the list head. - Fix a kernel memory scribble when reading from a non-socket transport in /sys/kernel/sunrpc. - Fix a race where reconnecting to a server could leave the TCP socket stuck forever in the connecting state. - Patch from Neil to fix a shutdown race which can leave the SUNRPC transport timer primed after we free the struct xprt itself. - Patch from Xin Xiong to fix reference count leaks in the NFSv4.2 copy offload. - Sunrpc patch from Olga to avoid resending a task on an offlined transport. Cleanups: - Patches from Dave Wysochanski to clean up the fscache code ---------------------------------------------------------------- Alexey Khoroshilov (1): NFS: remove unneeded check in decode_devicenotify_args() Benjamin Coddington (1): NFSv4: use unique client identifiers in network namespaces Colin Ian King (1): SUNRPC: remove redundant pointer plainhdr Dave Wysochanski (4): NFS: Cleanup usage of nfs_inode in fscache interface NFS: Rename fscache read and write pages functions NFS: Replace dfprintks with tracepoints in fscache read and write page functions NFS: Remove remaining dfprintks related to fscache and remove NFSDBG_FSCACHE Jakob Koschel (1): NFS: replace usage of found with dedicated list iterator variable Matthew Wilcox (Oracle) (1): Convert NFS from readpages to readahead NeilBrown (12): NFS: remove IS_SWAPFILE hack SUNRPC/call_alloc: async tasks mustn't block waiting for memory SUNRPC/auth: async tasks mustn't block waiting for memory SUNRPC/xprt: async tasks mustn't block waiting for memory SUNRPC: remove scheduling boost for "SWAPPER" tasks. NFS: discard NFS_RPC_SWAPFLAGS and RPC_TASK_ROOTCREDS SUNRPC: improve 'swap' handling: scheduling and PF_MEMALLOC NFSv4: keep state manager thread active if swap is enabled NFS: swap IO handling is slightly different for O_DIRECT IO NFS: swap-out must always use STABLE writes. SUNRPC: change locking for xs_swap_enable/disable SUNRPC: avoid race between mod_timer() and del_timer_sync() Olga Kornievskaia (5): NFSv4.1 support for NFS4_RESULT_PRESERVER_UNLINKED NFSv4.1 restrict GETATTR fs_location query to the main transport NFSv4.1 provide mount option to toggle trunking discovery SUNRPC don't resend a task on an offlined transport NFSv4.1: don't retry BIND_CONN_TO_SESSION on session error Tom Rix (1): NFS: simplify check for freeing cn_resp Trond Myklebust (63): NFSv4: Protect the state recovery thread against direct reclaim NFS: Charge open/lock file contexts to kmemcg NFSv4: Charge NFSv4 open state trackers to kmemcg NFSv4.2: Fix up an invalid combination of memory allocation flags NFS: Convert GFP_NOFS to GFP_KERNEL NFSv4/flexfiles: Convert GFP_NOFS to GFP_KERNEL NFSv4.2/copyoffload: Convert GFP_NOFS to GFP_KERNEL SUNRPC: Convert GFP_NOFS to GFP_KERNEL SUNRPC/auth_gss: Convert GFP_NOFS to GFP_KERNEL SUNRPC/xprtrdma: Convert GFP_NOFS to GFP_KERNEL NFS: Replace last uses of NFS_INO_REVAL_PAGECACHE NFS: Remove unused flag NFS_INO_REVAL_PAGECACHE NFS: NFSv2/v3 clients should never be setting NFS_CAP_XATTR NFS: Remove unnecessary XATTR cache invalidation in nfs_fhget() NFS: Clean up NFSv4.2 xattrs NFS: Use of mapping_set_error() results in spurious errors Revert "NFSv4: use unique client identifiers in network namespaces" NFS: Return valid errors from nfs2/3_decode_dirent() NFS: constify nfs_server_capable() and nfs_have_writebacks() NFS: Trace lookup revalidation failure NFS: Initialise the readdir verifier as best we can in nfs_opendir() NFS: Use kzalloc() to avoid initialising the nfs_open_dir_context NFS: Calculate page offsets algorithmically NFS: Store the change attribute in the directory page cache NFS: Don't re-read the entire page cache to find the next cookie NFS: Don't advance the page pointer unless the page is full NFS: Adjust the amount of readahead performed by NFS readdir NFS: If the cookie verifier changes, we must invalidate the page cache NFS: Simplify nfs_readdir_xdr_to_array() NFS: Reduce use of uncached readdir NFS: Improve heuristic for readdirplus NFS: Don't ask for readdirplus unless it can help nfs_getattr() NFSv4: Ask for a full XDR buffer of readdir goodness NFS: Readdirplus can't help lookup for case insensitive filesystems NFS: Don't request readdirplus when revalidation was forced NFS: Add basic readdir tracing NFS: Trace effects of readdirplus on the dcache NFS: Trace effects of the readdirplus heuristic NFS: Clean up page array initialisation/free NFS: Convert readdir page cache to use a cookie based index NFS: Fix up forced readdirplus NFS: Optimise away the previous cookie field NFS: Cache all entries in the readdirplus reply NFS: Don't deadlock when cookie hashes collide NFS: Fix revalidation of empty readdir pages SUNRPC: Don't call connect() more than once on a TCP socket SUNRPC: Only save the TCP source port after the connection is complete SUNRPC: Fix socket waits for write buffer space SUNRPC: Replace internal use of SOCKWQ_ASYNC_NOSPACE SUNRPC: Improve accuracy of socket ENOBUFS determination NFS: Fix memory allocation in rpc_malloc() NFS: Fix memory allocation in rpc_alloc_task() SUNRPC: Fix unx_lookup_cred() allocation SUNRPC: Make the rpciod and xprtiod slab allocation modes consistent NFS: nfsiod should not block forever in mempool_alloc() NFS: Avoid writeback threads getting stuck in mempool_alloc() NFSv4/pnfs: Ensure pNFS allocation modes are consistent with nfsiod pNFS/flexfiles: Ensure pNFS allocation modes are consistent with nfsiod pNFS/files: Ensure pNFS allocation modes are consistent with nfsiod SUNRPC: Do not dereference non-socket transports in sysfs SUNRPC: Don't return error values in sysfs read of closed files NFS: Don't loop forever in nfs_do_recoalesce() NFSv4/pNFS: Fix another issue with a list iterator pointing to the head Xin Xiong (1): NFSv4.2: fix reference count leaks in _nfs42_proc_copy_notify() fs/nfs/Kconfig | 4 + fs/nfs/callback_proc.c | 29 +- fs/nfs/callback_xdr.c | 4 - fs/nfs/client.c | 3 +- fs/nfs/delegation.c | 2 +- fs/nfs/dir.c | 626 +++++++++++++++++++------------- fs/nfs/direct.c | 48 ++- fs/nfs/file.c | 26 +- fs/nfs/filelayout/filelayout.c | 2 +- fs/nfs/flexfilelayout/flexfilelayout.c | 53 ++- fs/nfs/fs_context.c | 8 + fs/nfs/fscache.c | 53 +-- fs/nfs/fscache.h | 45 +-- fs/nfs/inode.c | 86 ++--- fs/nfs/internal.h | 25 +- fs/nfs/nfs2xdr.c | 3 +- fs/nfs/nfs3xdr.c | 30 +- fs/nfs/nfs42proc.c | 34 +- fs/nfs/nfs42xattr.c | 7 +- fs/nfs/nfs4_fs.h | 1 + fs/nfs/nfs4file.c | 8 +- fs/nfs/nfs4proc.c | 62 +++- fs/nfs/nfs4state.c | 59 ++- fs/nfs/nfs4xdr.c | 7 +- fs/nfs/nfstrace.h | 221 ++++++++++- fs/nfs/pagelist.c | 11 +- fs/nfs/pnfs.c | 50 +-- fs/nfs/pnfs.h | 2 + fs/nfs/pnfs_nfs.c | 8 +- fs/nfs/proc.c | 1 + fs/nfs/read.c | 29 +- fs/nfs/write.c | 43 ++- include/linux/nfs_fs.h | 45 +-- include/linux/nfs_fs_sb.h | 1 + include/linux/nfs_xdr.h | 5 +- include/linux/sunrpc/auth.h | 1 + include/linux/sunrpc/sched.h | 2 +- include/linux/sunrpc/xprt.h | 3 + include/linux/sunrpc/xprtsock.h | 3 +- include/trace/events/sunrpc.h | 1 - include/uapi/linux/nfs4.h | 1 + include/uapi/linux/nfs_fs.h | 2 +- net/sunrpc/auth.c | 8 +- net/sunrpc/auth_gss/auth_gss.c | 26 +- net/sunrpc/auth_gss/auth_gss_internal.h | 2 +- net/sunrpc/auth_gss/gss_krb5_crypto.c | 10 +- net/sunrpc/auth_gss/gss_krb5_seqnum.c | 4 +- net/sunrpc/auth_gss/gss_krb5_wrap.c | 4 +- net/sunrpc/auth_unix.c | 16 +- net/sunrpc/backchannel_rqst.c | 8 +- net/sunrpc/clnt.c | 13 +- net/sunrpc/rpcb_clnt.c | 4 +- net/sunrpc/sched.c | 56 ++- net/sunrpc/socklib.c | 3 +- net/sunrpc/sysfs.c | 76 ++-- net/sunrpc/xprt.c | 23 +- net/sunrpc/xprtrdma/frwr_ops.c | 2 +- net/sunrpc/xprtrdma/transport.c | 10 +- net/sunrpc/xprtrdma/verbs.c | 4 +- net/sunrpc/xprtsock.c | 207 ++++++----- 60 files changed, 1317 insertions(+), 813 deletions(-)