From patchwork Wed Nov 10 15:37:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 12612443 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2F42CC433F5 for ; Wed, 10 Nov 2021 15:37:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 11B786103B for ; Wed, 10 Nov 2021 15:37:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231838AbhKJPkc (ORCPT ); Wed, 10 Nov 2021 10:40:32 -0500 Received: from mail-dm3nam07on2122.outbound.protection.outlook.com ([40.107.95.122]:27232 "EHLO NAM02-DM3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S231408AbhKJPkb (ORCPT ); Wed, 10 Nov 2021 10:40:31 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Xxr4Q1h5bvs61NTL+uv1s0doFOjBcDzItqb1mbni2VWhr3Ec7W+5pSjBeKpf7LC1ECYMqa40E0N5DaSeZKyHRZjvrR59WwU02vV3RBiss/vh9CquOpYzfl2ikJ5B77gnZKoDkrIkg7ZmpXspcM3IBfP/Kef/udgCEolPYx/k1ZJOBZBwuCR7IkBwbPzEYnmXWYxLwpzrNxA/Ub2tLSOK6rf2A1LZ+4yFhgep2wLiASYvvkp5hNYVEqPdPC8/FKnbNqJDYTQmzmP0p2+krpmx3YNDwWya3JaVQ1m3lfyfIrvtr6hrB3TGAn1PEPvv1E0z8xJgQ0ff5CVBV/6v1dVHBg== 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=dqHKgMs89BX8YkSpHx0fGg81R3DMqqScRLxUoNd5Vnc=; b=j6G3wcchh7syaU+TiiS5SMriDVJSOyUGlSi5ZzgP2s+nBzhW5OO+HZW9Xzno0JrefGgnWs0IOKb7irhCU7Cy8o/Z5cVRC5zeLG2NJnpLZ/oS+SW7k1hik67wXdf25sOz5p0HFGChoQRZxi/9WfeNKHrKvNkICFB0hUUAK9Lvr0YNLrAgPFh/sOsrTYtxceuo/3x8Kzw6BMG6zqJwCttu4pz3CdlC5pn+/Gbtsjit+F7in1UbuFQCUVsOQK+2CaRdWe6bEUC3N5nEClg8nRi2oRoulEGWGepSvHQ6xc7+TmgqekZrRVGyjKbASREwDYuVN0a8GDlyC+6kR+yZoRIKLw== 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=dqHKgMs89BX8YkSpHx0fGg81R3DMqqScRLxUoNd5Vnc=; b=JDQbj8m4xKwqgwnpfv/wYHPzIoF/O7ksOnyYdSL7BNf1b6HuGBFJP52ohVWdtPp0huE5xY5i4f+HKFplZrk7JZrddzpBPdU1RagbY0Tv0hRIcgeJF/pLXzjfYkwbVFV5QONxN4vjfylyxbx0ofl9aJ0T0tHnVdOt2LrlJzJLVNE= Received: from CH0PR13MB5084.namprd13.prod.outlook.com (2603:10b6:610:111::7) by CH2PR13MB3320.namprd13.prod.outlook.com (2603:10b6:610:23::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.7; Wed, 10 Nov 2021 15:37:40 +0000 Received: from CH0PR13MB5084.namprd13.prod.outlook.com ([fe80::a921:472b:221c:11b8]) by CH0PR13MB5084.namprd13.prod.outlook.com ([fe80::a921:472b:221c:11b8%4]) with mapi id 15.20.4690.015; Wed, 10 Nov 2021 15:37:40 +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.16 Thread-Topic: [GIT PULL] Please pull NFS client changes for Linux 5.16 Thread-Index: AQHX1kjkFua0A6imfUaZ+0CO1T+2Vg== Date: Wed, 10 Nov 2021 15:37:39 +0000 Message-ID: <4cfaa985bf0f83755b8e5877330421b993b13890.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: b7aa4219-4d9d-45c8-169b-08d9a46007b9 x-ms-traffictypediagnostic: CH2PR13MB3320: x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:327; x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: TV9VXZzDa9DHErEzjabG5ExE+I27sNZkwtcifKEkeSTIdAoPh+1jloM434SZsWtC0xuPQu9O3NgdaVEHjenmkjUCqA2Z/oa2RueUIoq8yP4Sfr9EM87/+pxzRddJZVARdbak7SiNy+hXWxDm6lsUzxcz8ClzPCNIsCJocddAqWL08oQsaoGOL8YYjsSGYYKYsS2Vv06ZJWQZJpPr4G5iRUmsUTtllFayWAsCn2/nYhBbnO22a1UeIjBXQYd/J7C603Pjfs5fasMZqFZlBKAVMNfJ8Bz87mbeVwt4sxyf8Nh2Yf2tb3EXNYt8Fpisw8tMD5WDarz6i55NYX6IlQnZS1gFfSMUwj7gzwRRERWv6l3CccU9mR6SA/KAIsQmmTK39hccFOhXCaspyx9K5wrSiDSfC6OxqkK+4Pejqx6iHJyU0dfW/oTRKHqvSFHbG/OUglEHFygxGtvhi20457zPFItYi8tyRMPwfRoIkCD9MUci6KRUjFiX7ZnVw91j+Sd5PoVxeQtxZSyuN/3G2Y6FqrM/d2MJ36aTEIZofK0A0vTXixayW8ZKXYIT6nV64Vytjd8uvH8/DXAXjCRfB2KE2cvf2uZdmTo+YQMZVEOkqlfFjRRKDjc4QqXrl+opaQit6P+8XCneniNvc6VZPnMsvt+WqAuT5EB16FRA/q8b3iRiXWe56EhnlDxwEmSd009UeErtDrP3F3qWUSjKeIAfug== 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:(39840400004)(396003)(136003)(346002)(376002)(366004)(36756003)(6512007)(316002)(26005)(6506007)(86362001)(122000001)(66476007)(66446008)(4326008)(83380400001)(38100700002)(186003)(38070700005)(64756008)(66556008)(54906003)(508600001)(8676002)(5660300002)(6486002)(2906002)(71200400001)(76116006)(6916009)(66946007)(8936002)(2616005);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?q?XCGJ8529ooJ0kkjFdvtoOhp7ZGcc?= =?utf-8?q?Y8lTDtNEJY22drNvcv/O/mGpQgEbjmBp6HwnntDN1v/7g2qf0Olvb0qW5iCGFoXar?= =?utf-8?q?xGpZ4a2rGPbomDmkrlk+yFwYoy8+CrJ6gEqlHD8dmrgiKoJYAZv4d2wS9GbiGbtxo?= =?utf-8?q?if3JTcY+J3axn7LKxh4w9FyB/nGzZ72HECblBwn+R/cNbqTlwFXOQqdbFTOfgiAHV?= =?utf-8?q?sGUrzCMJhgoDr/I3wyQC2+ow8tH5wijZJZvYzRWQKJnUKo0u55iSbOV0if34t+2zX?= =?utf-8?q?n6V6ov081Ubb11i8jyIeEbRPwzRZqLeFTXOmGdmQ/n+KENem4IE5vhu+0/etGl97U?= =?utf-8?q?OuER0l0yhCnaFODKmdGRrQ/3280D4C3pMIhLOIWP7+oICOfzD6qo7N+crFYEiWph4?= =?utf-8?q?HHhtUejkLHAtcLYqZxeoiAInizYpOSR3wRdJ3V02RZt0HcrhSktwtL8Y/HwBQ+CKU?= =?utf-8?q?loMUOcbqD79YqQ2EqZ/+/38AZOlaYN5Bj7P3D1uhyV5YmfCvX9KahdMSr9Y3ombz6?= =?utf-8?q?zKw84qFfHTLFav4xTT9v1DjCU7NA8wowqQjwyYRQeb0+MUtmwRYKzLDgfAfL3V0ff?= =?utf-8?q?ZDqbYHt7GhLQf0mi4DCHCj/kPdf9SnlQwI+oM6k8oAbAXyFQew6nl6Z1hK/GHn43g?= =?utf-8?q?6OWYu5WctzVs9LRD+aw/zU4wBEo1mDVysgF+JXo/xGkGux0qGKz78y3E0c0NiIqCZ?= =?utf-8?q?ce2+IUmxAigBaPX22QDhXY2HjC+xEXtKbOKmeXtgcG66CDXY9ziGTZA6Ndhy3CCGJ?= =?utf-8?q?PqtLE1MXWpsGsWPFIQ0os5J3xuhB5naB0GvMLkVnljmMVwKzpNBmaD/7Zx/h/ZH11?= =?utf-8?q?CsAbosAhRr3sR2OGLCHt/gYE8zXnEY794WrwI/Q/1JENmg9DrwrT4Swbbo8Xfhby6?= =?utf-8?q?5PrKFadLgCSxdY+C+/jXWzqnXgkSRzEvoP0xyyjwA8J0RnSMS0GRBN0jsFEqecLC7?= =?utf-8?q?vTLFpTEvEtMO3Rx3EApUepzc+YWWcgHmkyIqyVlNhXJHb+Oou8d47SN+pAF3lVqy8?= =?utf-8?q?R81aboOs/d441OlNft4yxkEWEAvtskBpSyM16dKfRL0JZQgtwhS6oNsNPyARlgTsO?= =?utf-8?q?CU5ore7nIVIVjsMl2FULmxhbv21nTAgDtYWjjA9RYkYT0A/+Kjm8MOm3uI9Dxic8L?= =?utf-8?q?QbK4C/N3L3jolZL7he+MwvpTbGBZM0lM6iqR9xFhgnxLdKF9dDzgnpAc4CJu5ZXgd?= =?utf-8?q?0Jo2EW1OcqI7WYxEMbHM4d9QVy9UpHclXw7cjMuUrHhnhUJMMYJrvX1ua5bUsMGnW?= =?utf-8?q?1ZNrdthhQWNKSIdwQawiSz7WdIBshkdpqMKW/sjVa0PB0yV6/LCvNMtJUcl71uVfa?= =?utf-8?q?/Bx8X3Akbdk55v0nvuPAwDQGba67CGZ3Oh2eAxpiJFpCZKRU6cYkSkuHm5wDGtlam?= =?utf-8?q?MEhDatIR8mSI5E5zI3wBgDNw/5L656lHY86ul1AceZ191inA1T8hoxOrSPfHGbgQg?= =?utf-8?q?eNCa0R338rE454PUksOCwEcrPlmZTmimoPHmxXtlqm7vwv5NAy8C4xzi5fu4GJ43S?= =?utf-8?q?/vf5RzuxqaPOAx6QfSo4ARa5v9HdEh3j1bJFjnZC1j0FikoZ7Wi9DDE=3D?= Content-ID: <4971934EBE2350498B60F5DD8B996999@namprd13.prod.outlook.com> 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: b7aa4219-4d9d-45c8-169b-08d9a46007b9 X-MS-Exchange-CrossTenant-originalarrivaltime: 10 Nov 2021 15:37:40.0015 (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: 954usqOrVHUguOvKmeasha5yFbylpAH1IsE4sUYs8juqZgRV0LuWp6Mb7zl1tvkD3RVaICgQ810dk351NwCE/Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR13MB3320 Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org Hi Linus, The following changes since commit 9e1ff307c779ce1f0f810c7ecce3d95bbae40896: Linux 5.15-rc4 (2021-10-03 14:08:47 -0700) are available in the Git repository at: git://git.linux-nfs.org/projects/trondmy/linux-nfs.git tags/nfs-for-5.16-1 for you to fetch changes up to f96f8cc4a63dd645e07ea9712be4e0a76ea4ec1f: NFSv4: Sanity check the parameters in nfs41_update_target_slotid() (2021-11-07 09:23:14 -0500) Cheers, Trond ---------------------------------------------------------------- NFS client updates for Linux 5.16 Highlights include: Features: - NFSv4.1 can always retrieve and cache the ACCESS mode on OPEN - Optimisations for READDIR and the 'ls -l' style workload - Further replacements of dprintk() with tracepoints and other tracing improvements - Ensure we re-probe NFSv4 server capabilities when the user does a "mount -o remount" Bugfixes: - Fix an Oops in pnfs_mark_request_commit() - Fix up deadlocks in the commit code - Fix regressions in NFSv2/v3 attribute revalidation due to the change_attr_type optimisations - Fix some dentry verifier races - Fix some missing dentry verifier settings - Fix a performance regression in nfs_set_open_stateid_locked() - SUNRPC was sending multiple SYN calls when re-establishing a TCP connection. - Fix multiple NFSv4 issues due to missing sanity checking of server return values - Fix a potential Oops when FREE_STATEID races with an unmount Cleanups: - Clean up the labelled NFS code - Remove unused header ---------------------------------------------------------------- Alexey Gladkov (1): Fix user namespace leak Anna Schumaker (20): NFS: Create an nfs4_server_set_init_caps() function NFS: Move nfs_probe_destination() into the generic client NFS: Replace calls to nfs_probe_fsinfo() with nfs_probe_server() NFS: Call nfs_probe_server() during a fscontext-reconfigure event NFS: Unexport nfs_probe_fsinfo() SUNRPC: Check if the xprt is connected before handling sysfs reads NFS: Create a new nfs_alloc_fattr_with_label() function NFS: Remove the nfs4_label from the nfs_entry struct NFS: Remove the nfs4_label from the nfs4_create_res struct NFS: Remove the nfs4_label from the nfs4_link_res struct NFS: Remove the label from the nfs4_lookup_res struct NFS: Remove the nfs4_label from the nfs4_lookupp_res struct NFS: Remove the f_label from the nfs4_opendata and nfs_openres NFS: Remove the nfs4_label from the nfs4_getattr_res NFS: Remove the nfs4_label from the nfs_setattrres NFS: Remove the nfs4_label argument from nfs_instantiate() NFS: Remove the nfs4_label argument from nfs_add_or_obtain() NFS: Remove the nfs4_label argument from nfs_fhget() NFS: Remove the nfs4_label argument from nfs_setsecurity NFS: Remove the nfs4_label argument from decode_getattr_*() functions Baptiste Lepers (1): pnfs/flexfiles: Fix misplaced barrier in nfs4_ff_layout_prepare_ds Benjamin Coddington (1): xprtrdma: Fix a maybe-uninitialized compiler warning Chuck Lever (12): NFS: Remove unnecessary TRACE_DEFINE_ENUM()s SUNRPC: Per-rpc_clnt task PIDs NFS: Instrument i_size_write() xprtrdma: Provide a buffer to pad Write chunks of unaligned length xprtrdma: Remove rpcrdma_ep::re_implicit_roundup SUNRPC: Tracepoints should display tk_pid and cl_clid as a fixed-size field SUNRPC: Use BIT() macro in rpc_show_xprt_state() NFS: Replace dprintk callsites in nfs_readpage(s) SUNRPC: Trace calls to .rpc_call_done NFS: Remove --> and <-- dprintk call sites NFS: Move generic FS show macros to global header NFS: Move NFS protocol display macros to global header Dave Wysochanski (2): NFS: Fix WARN_ON due to unionization of nfs_inode.nrequests NFS: Add offset to nfs_aop_readahead tracepoint Jonathan Corbet (1): nfs: remove unused header Olga Kornievskaia (7): NFSv4.2 add tracepoint to SEEK NFSv4.2 add tracepoints to FALLOCATE and DEALLOCATE NFSv4.2 add tracepoint to COPY NFSv4.2 add tracepoint to CLONE NFSv4.2 add tracepoint to CB_OFFLOAD NFSv4.2 add tracepoint to COPY_NOTIFY NFSv4.2 add tracepoint to OFFLOAD_CANCEL Scott Mayhew (1): nfs4: take a reference on the nfs_client when running FREE_STATEID Thiago Rafael Becker (1): sunrpc: remove unnecessary test in rpc_task_set_client() Trond Myklebust (37): NFS: Label the dentry with a verifier in nfs_link(), nfs_symlink() NFS: Label the dentry with a verifier in nfs_rmdir() and nfs_unlink() NFS: Fix up nfs_ctx_key_to_expire() SUNRPC: Partial revert of commit 6f9f17287e78 SUNRPC: Add cond_resched() at the appropriate point in __rpc_execute() SUNRPC: Remove WQ_HIGHPRI from xprtiod SUNRPC: Remove unnecessary memory barriers SUNRPC: xprt_clear_locked() only needs release memory semantics NFS: Fix a few more clear_bit() instances that need release semantics NFSv4: Retrieve ACCESS on open if we're not using NFS4_CREATE_EXCLUSIVE NFS: Default change_attr_type to NFS4_CHANGE_TYPE_IS_UNDEFINED NFS: Don't set NFS_INO_DATA_INVAL_DEFER and NFS_INO_INVALID_DATA NFS: Ignore the directory size when marking for revalidation NFS: Fix up nfs_readdir_inode_mapping_valid() NFS: Further optimisations for 'ls -l' NFS: Fix dentry verifier races NFS: Do not flush the readdir cache in nfs_dentry_iput() NFS: Remove unnecessary page cache invalidations NFS: Fix deadlocks in nfs_scan_commit_list() NFS: Fix up commit deadlocks NFS: Fix an Oops in pnfs_mark_request_commit() NFSv4: Fixes for nfs4_inode_return_delegation() NFS: Save some space in the inode NFS: Remove redundant call to __set_page_dirty_nobuffers NFSv4: Fix a regression in nfs_set_open_stateid_locked() SUNRPC: Replace use of socket sk_callback_lock with sock_lock SUNRPC: Clean up xs_tcp_setup_sock() SUNRPC: Fix races when closing the socket SUNRPC: Prevent immediate close+reconnect NFS: Don't trace an uninitialised value NFSv4: Ensure decode_compound_hdr() sanity checks the tag NFSv4: Fix potential Oops in decode_op_map() NFSv4: Remove unnecessary 'minor version' check NFS: Don't allocate nfs_fattr on the stack in __nfs42_ssc_open() NFSv4.2: alloc_file_pseudo() takes an open flag, not an f_mode NFS: Always initialise fattr->label in nfs_fattr_alloc() NFSv4: Sanity check the parameters in nfs41_update_target_slotid() fs/lockd/clntproc.c | 3 - fs/lockd/svc4proc.c | 2 - fs/lockd/svcproc.c | 2 - fs/nfs/callback_proc.c | 3 + fs/nfs/client.c | 39 +- fs/nfs/delegation.c | 10 +- fs/nfs/dir.c | 119 ++-- fs/nfs/direct.c | 2 +- fs/nfs/export.c | 44 +- fs/nfs/filelayout/filelayout.c | 2 - fs/nfs/flexfilelayout/flexfilelayout.c | 2 - fs/nfs/flexfilelayout/flexfilelayoutdev.c | 4 +- fs/nfs/getroot.c | 21 +- fs/nfs/inode.c | 130 +++-- fs/nfs/internal.h | 12 +- fs/nfs/namespace.c | 3 +- fs/nfs/nfs3proc.c | 10 +- fs/nfs/nfs3xdr.c | 2 +- fs/nfs/nfs42proc.c | 9 + fs/nfs/nfs4_fs.h | 4 +- fs/nfs/nfs4client.c | 65 +-- fs/nfs/nfs4file.c | 14 +- fs/nfs/nfs4idmap.c | 2 +- fs/nfs/nfs4proc.c | 289 ++++------ fs/nfs/nfs4session.c | 12 +- fs/nfs/nfs4session.h | 1 + fs/nfs/nfs4state.c | 5 +- fs/nfs/nfs4trace.h | 920 ++++++++++++++++-------------- fs/nfs/nfs4xdr.c | 81 ++- fs/nfs/nfstrace.h | 467 +++++++-------- fs/nfs/pagelist.c | 13 +- fs/nfs/pnfs.h | 6 +- fs/nfs/pnfs_nfs.c | 6 +- fs/nfs/proc.c | 16 +- fs/nfs/read.c | 11 +- fs/nfs/super.c | 7 +- fs/nfs/write.c | 73 +-- fs/nfsd/trace.h | 1 + include/linux/nfs4.h | 4 + include/linux/nfs_fs.h | 77 ++- include/linux/nfs_xdr.h | 16 +- include/linux/pnfs_osd_xdr.h | 317 ---------- include/linux/sunrpc/clnt.h | 1 + include/linux/sunrpc/sched.h | 16 +- include/trace/events/fs.h | 122 ++++ include/trace/events/nfs.h | 375 ++++++++++++ include/trace/events/rpcgss.h | 18 +- include/trace/events/rpcrdma.h | 55 +- include/trace/events/sunrpc.h | 99 ++-- include/trace/events/sunrpc_base.h | 18 + net/sunrpc/clnt.c | 33 +- net/sunrpc/sched.c | 20 +- net/sunrpc/sysfs.c | 12 +- net/sunrpc/xprt.c | 41 +- net/sunrpc/xprtrdma/frwr_ops.c | 48 +- net/sunrpc/xprtrdma/rpc_rdma.c | 23 +- net/sunrpc/xprtrdma/verbs.c | 3 +- net/sunrpc/xprtrdma/xprt_rdma.h | 6 +- net/sunrpc/xprtsock.c | 109 ++-- 59 files changed, 2011 insertions(+), 1814 deletions(-) delete mode 100644 include/linux/pnfs_osd_xdr.h create mode 100644 include/trace/events/fs.h create mode 100644 include/trace/events/nfs.h create mode 100644 include/trace/events/sunrpc_base.h