From patchwork Fri Jun 16 16:12:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Schumaker, Anna" X-Patchwork-Id: 9792185 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 1360460325 for ; Fri, 16 Jun 2017 16:12:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 06329285DC for ; Fri, 16 Jun 2017 16:12:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EEB5A2864C; Fri, 16 Jun 2017 16:12:51 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 012B7285DC for ; Fri, 16 Jun 2017 16:12:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751068AbdFPQMu (ORCPT ); Fri, 16 Jun 2017 12:12:50 -0400 Received: from mx144.netapp.com ([216.240.21.25]:26710 "EHLO mx144.netapp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750760AbdFPQMs (ORCPT ); Fri, 16 Jun 2017 12:12:48 -0400 X-IronPort-AV: E=Sophos;i="5.39,347,1493708400"; d="scan'208";a="199914182" Received: from vmwexchts04-prd.hq.netapp.com ([10.122.105.32]) by mx144-out.netapp.com with ESMTP; 16 Jun 2017 08:53:02 -0700 Received: from VMWEXCCAS04-PRD.hq.netapp.com (10.122.105.20) by VMWEXCHTS04-PRD.hq.netapp.com (10.122.105.32) with Microsoft SMTP Server (TLS) id 15.0.1210.3; Fri, 16 Jun 2017 09:12:43 -0700 Received: from NAM02-CY1-obe.outbound.protection.outlook.com (10.120.60.153) by VMWEXCCAS04-PRD.hq.netapp.com (10.122.105.20) with Microsoft SMTP Server (TLS) id 15.0.1210.3 via Frontend Transport; Fri, 16 Jun 2017 09:12:43 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netapp.onmicrosoft.com; s=selector1-netapp-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=VZ6bWSO3EI0ktQfsma6w8QLS77TNCKMTRegSDzC4K+Y=; b=AWqzw+TqcofueXbapbYrSIkYTKvkvigBk/7y5CxQISFEqPtlIr+q8+TMBvE5qmuq8bbnF+MfrTwbBxnSliIdu1HAcm8oKICELO7NOznj0XM/Euy1g+7FWdgdOZihVgu3LXdU9pAO0LxQO6IPrmhUDnCsiOVD6BQtu6IqHT/GzwE= Authentication-Results: primarydata.com; dkim=none (message not signed) header.d=none; primarydata.com; dmarc=none action=none header.from=Netapp.com; Received: from gouda.nowheycreamery.com.nowheycreamery.com (99.9.112.69) by DM5PR06MB2475.namprd06.prod.outlook.com (10.168.178.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1157.12; Fri, 16 Jun 2017 16:12:45 +0000 From: Anna.Schumaker@Netapp.com To: , Subject: [PATCH] NFS: Set FATTR4_WORD0_TYPE for . and .. entries Date: Fri, 16 Jun 2017 12:12:33 -0400 Message-ID: <20170616161233.29147-1-Anna.Schumaker@Netapp.com> X-Mailer: git-send-email 2.13.1 MIME-Version: 1.0 X-Originating-IP: [99.9.112.69] X-ClientProxiedBy: MWHPR01CA0045.prod.exchangelabs.com (10.172.172.159) To DM5PR06MB2475.namprd06.prod.outlook.com (10.168.178.145) X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM5PR06MB2475: X-MS-Office365-Filtering-Correlation-Id: 6ff1057f-f1ca-4e0d-f453-08d4b4d286ab X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(201703131423075)(201703031133081); SRVR:DM5PR06MB2475; X-Microsoft-Exchange-Diagnostics: 1; DM5PR06MB2475; 3:pZGB71mp1jHmQ94afTLS5MHmv5OLfMDxbYg1OY9hU7qmvfgxzbRSzLmv0puzih3tj/BS1XeZwX5YpVOsuN0B5eHHQ5z9La9eFplVrlsOtxVOl4C2Hu+CHJnDW68ME9aEX1KcpIpC5kB2hG5Pl8NS6lhyYeXJ8Mw3L2zpUNmeW9QmJO6WucCKtSKMb8ICe3eIt7M6FVcTk6in4VqRRNcKJdV2plo1kkbpyGZvE/kEaTpSlYMOgmwlCgGPtFdmZyYWzrpHNO1witzLqFjFIbKBrTp7hh1h56gBcApPaI8lDv82aiOFYVsC7LaWBi40B6CyyasS+y3g4qj8CZxGZaaAgg==; 25:1A71uf1AUCUKHXlEKVwvJ2HYfpSst90SZgC2JXKYB1Ppi7G6kpvOnPSQYcNKhg+plVGYGf6K1FpKPO2fas8GQCo/tH1M8M7WQMgFOOaGtPXupL6AP4N8SFlJPcQ7uNGTdRay6jSIO6n/KPWhVq/s7ZeXgF5T3jUinMHAUNSOgzG5Y6lGTuScD8/hMVj+q+9f8GRoO9/4Nf0CbylVdpU+6QLAojx1GIr+lzYPnOpalUjWMBM8iQ5lF3WdUBpUYgZ0VNe/wHWeZFQq95ccK7wMGwLePP4zTFAlfJVMZ38QAUlVTv+Zwk73hJecne/lZ2FZ3kw/P5aEU3eCYpkiH0Gx/0osr9mptqjeOxGc/2HsGgpfeudKBshjia2Em6swhMzwBGAPbizRO6SDWZmAhwow35+QAe9YUjz8wd7p87X/YGAagoKduMAkIIgp7m93xLrPD/uf7AKDmHzI9JA0TOahlXTWUP2oV7nPGY3Ng9Gj7c4= X-Microsoft-Exchange-Diagnostics: 1; DM5PR06MB2475; 31:2YdMlyAW8JmCTb5qEol7s1QlD5z2kTgqtg7xYjshFopG+bRNzL3ar+0JXf17WZWmOT8EuwJYM5hmr47hG4hQqoQ0Bv8nrxw26p8oIvEgH4VOtpXgI0O+ixMMMwrn2zp3sRsg1qT99xbaEYyqGvHE0fJfj3dYUymDkZqOlKQ6+8ujehQG2h1gqI0HhWxOWKMmypC1bq75+pFmthN58nf6Ly0gRie/AWhgH++Ioklm/R0NkBm4gC4NBsd408Ov4PQg9QNpL3TA2z2XN1WtPAtL5A==; 20:+2DkF8HAQfVAepa4xsWygJZzaOUXC6M+AqYn0/Gotehoh2slKhV8ipKHgUjplmKl9ItpnpZuRoy5Zkj5mc9yEBL3qOQwM93VAHc9f3jSEB+y9IVIbF8EJWqn1te66918a2K+tL89lYA9NPu6LOhwJTvN4X4+aO/a19hhkt7mVGIIUAU6CrLsX+k2OgKR8sm6mm/1PZyEH8R0AwdWhgHcpqOUnYyPATeIsYUYuxiV222q2TpRUw0cBDIe+X15HysQI3ElPXnq4QVJcffGlAtq+ZlRPYuct63aEv0bfOMWlM011XoNVCYjacCMKGdaFhvi3n5d24CyvlFEu1RO6HYHfJZPvGRZEy8WPpEdmDErMywWHaT6IGGtVuBy4TlKInDVVRfSZtznzLklDkeDyCA1P1kLdUlC6wtmDrDD0xClmYf77gP4luIfv5nBeC6Zk3F9UwuvIvogF6/WdeEnehl8XcydAxKOEOJFhjSDjV1JpDiwqOp0tCIhVFMs7YdnAlFU X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(601004)(2401047)(8121501046)(5005006)(93006095)(93001095)(3002001)(10201501046)(100000703101)(100105400095)(6055026)(6041248)(20161123564025)(20161123562025)(20161123558100)(20161123555025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123560025)(6072148)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:DM5PR06MB2475; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:DM5PR06MB2475; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM5PR06MB2475; 4:Px26ZIp0aTmLfZ3kNbJmFR2gL3QUtsf7LmJZegWhk9?= =?us-ascii?Q?d3LI3svR2aHydeQYwk3jpVpFt9ZHLDvhXRoistx6iGwF3aJ1NsLDtdtpCr+q?= =?us-ascii?Q?S/s4cI28k1pdoMrM4u3wG7LwDfhKzOHHLXlAvXsdDWwPXtqdEIgCkghCV+W9?= =?us-ascii?Q?Mm13+0mAWfH3iUF+JeRQy4oLgaSI3iprg8yLcFkWNCaJgpeRZHjuoxmV50ZJ?= =?us-ascii?Q?vDBVYikw930hSfA+6/h4wM9qqIt1Rkpwx1asvy7QK33zcISPmnUGiY7u3PCl?= =?us-ascii?Q?Nhr4KCSMsTBdKxlu7Ne1wvwl81UnOaAdXA9MO1x8p0h3L9EVYkIylVB4fMNU?= =?us-ascii?Q?Nb2NoHl0mOUNs2g9ExGfkJgLuxT/18wHztmNsMLXDaYW4fYOXjN+6J0JfZTo?= =?us-ascii?Q?w+GVEwNEg0n6jlNRXYi5koCdjzrxqqJl0hDimpNZm3p2X+6y0fLEtrxLaAyT?= =?us-ascii?Q?VBZOHL4M9xBOTIt5cpx0J4z4X/lwGiHS75XGR6YLyMSEzF/SYjpFQrkoiFmq?= =?us-ascii?Q?I5wSuwHea8XXQHyzMueUomzQl1vHZWM/Ff5KvtO9wUHd+iZZxRa0nsd9PZrg?= =?us-ascii?Q?MtcilUkpLTazwxhYXarHLRAqBeZYV73zKQ0q5bYYdVo7e7x8rEYDoLUyjo15?= =?us-ascii?Q?cKFe4SU8dUBQcUFnYlE6TYjzlOGv49bkO+x6ND2dSC9kefBtJdyD1cdhP70f?= =?us-ascii?Q?6AwEniK4joHL39GrL3n/Cdi+Q3avxxiZcIAE6ZwSj9NSjWjF4MqbikE6x7ua?= =?us-ascii?Q?dIPXJI0sibJtHt+mcw58GulzU7YuIjeTOU7h8jHunUEvQaaxDAv32I3WOkqe?= =?us-ascii?Q?skK6IeOZuK1U8Y/cNEq/sw0nnTiYP40OVEmWdaB2CoZatRQAg9vfZw5Hjzhc?= =?us-ascii?Q?5IkB0NHh9LyyNQAIYPTgNdGBeBPimr2KTvPBpnEHbIk1NG/lYoEoKqcxP6vx?= =?us-ascii?Q?VkF5W+dCyk6MUR9lbft2mo8TyxITRQEox57mlwTU7a0jWYzw50fhk8FRFixk?= =?us-ascii?Q?Mf3mSWwH+j034eOoyv4K2pfiMqsU4uR7KczCXeWEeSfay64tDRL5lcZgoDTL?= =?us-ascii?Q?pi032cvr6KWuLK4004qNj33Fa1EdiuYAWX9CXpH9GvcMxT7oDQPq0m6Q7bbC?= =?us-ascii?Q?lpWYItYnlI0jx/ggToiiPuAwzWjVwb9phelPjthpf/4Si3Kg7Tbg=3D=3D?= X-Forefront-PRVS: 0340850FCD X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6009001)(39840400002)(39850400002)(39450400003)(39400400002)(39410400002)(1076002)(6116002)(3846002)(48376002)(36756003)(189998001)(42186005)(8676002)(50986999)(25786009)(5003940100001)(50466002)(478600001)(86362001)(5660300001)(7736002)(50226002)(305945005)(9686003)(47776003)(38730400002)(110136004)(66066001)(72206003)(6666003)(6486002)(53936002)(81166006)(6512007)(85782001)(2906002)(15760500002)(85772001); DIR:OUT; SFP:1101; SCL:1; SRVR:DM5PR06MB2475; H:gouda.nowheycreamery.com.nowheycreamery.com; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM5PR06MB2475; 23:UsmaofNZgyxb+AOJP4aN4Repa2tmRNaOmZ0o3Op0R?= =?us-ascii?Q?1SlBuTpznV4M1dmTHSGpI7TzALu0E3QOq/t0Wfs4r+OUGiB5FvO75rL2sYQU?= =?us-ascii?Q?70UQW/LgRXljnCKRE+bg0j2PJHASYkRtP1pLQY+y424j8WVZlYEhHC9MIy85?= =?us-ascii?Q?WN1Wyns5YuHNq1a3J/oCjhvPBaPzrSb9bQ+InwFrvbcbU3dOyxbR6iK0y1tK?= =?us-ascii?Q?ixq4sUQcATyZSd5m5+AL/i/85Gq9lH6U01yUSB1SOfYJfnsoBCaF7ieTEyKk?= =?us-ascii?Q?s44xWWPSfZEcLs7LYjreIV+QMCke9pt7yWjZClKDt7dYP3Hv01/Zl+3OAk1u?= =?us-ascii?Q?jZBW+AxO062PAqWvOKrQ1rGsGWwr3cHd8no8vvCwlF157zpOShsI04BmmUuZ?= =?us-ascii?Q?EZ1cxUWGJb6+CJQtvdQE0s83Em3b1zso/IcKerxkYYu1kCY4EHdb5U2s8OdB?= =?us-ascii?Q?HcaeKJgsnMKomwLQFihLKbSz0CD/N3ltEB+LesOehYxJo+Ki63S00Nkc24//?= =?us-ascii?Q?QsYtwyKDBklZdxZU6jfsMb7WeeQ4g/s3n3q16cG1FIG6Azz4ZXjF7tO83HFQ?= =?us-ascii?Q?lrCBg84VJuoSHtxkFb6MbLCINrBQOseVf5zlc/k4++Hsnouk/ynJklCZ+nCc?= =?us-ascii?Q?pXnwzvzNWsHomt2OzCc2jVW47zGIPsME+PnJVtIwRYGnG7dOr916pdkJsQ/a?= =?us-ascii?Q?eWAFQ7M/p0QQKUm7Tim+iJsVbOpxxYuzSWnKRkTURDFbNBeWKVxDFbVudKXe?= =?us-ascii?Q?yGFtOBLbXGXXM86zb6yAQWXo4nmKMaF7q/r4Z+XFgEaOhDUt5BD07EDAc5q1?= =?us-ascii?Q?ek+SFe5+KoQy8x3OTNKoreZwnRvlSKLPFYpkHmnE+Y4av/qYF/K5VdoC4L0K?= =?us-ascii?Q?jYs6FymF+hjr8LKrJD8AcFPMR8yRDoIjJve4xqP72Tlph6jM3ScJeYTCO6h3?= =?us-ascii?Q?vyJMcBSjlhNjOWlaSbKkw7V1ZAQ8RUCYgBcppbADauPAuGDTRnCP2RXcuDKC?= =?us-ascii?Q?FcleCHfh8EmYLucU1SZ+gKmIVBlBDmaSpSQ+kUpqdeYjA=3D=3D?= X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM5PR06MB2475; 6:PgCX1dl62MKHiiqJIlZ8k1lsecqF12fjKjv940Q+S0?= =?us-ascii?Q?8ONYOnWV/kFKQxIfVix2XIryK21APALms0cznTM8DAmCjl2h+CWynBHdk0bw?= =?us-ascii?Q?/K80AryQcuLIUMbfrPZe2kGR2BTVb4TXw+R/+lmequlrxOA8Ns8SXvh2NMJh?= =?us-ascii?Q?pb3ouFGrf5ZyN2NobYV1kmAJlcLoZgTVgCf0zucysU/VHZp4wpg499+XXAtm?= =?us-ascii?Q?PxIoSPfam8/pmpOqneCIpqFBUg7cF+8mi7irMEt7lAq8BMmdcrpriCPpsm9+?= =?us-ascii?Q?C18iuOKWCZqaKUxq2jQ6+JtpBJ6USUTto0g4aWU7Lz0IHwkGq+Y4atSZ0ULZ?= =?us-ascii?Q?bcPA2dP/TnjakwQTkS5GGsPI1zuLNR1rVFBcl7TPzriN3qdtZ+e7qWP2cQjE?= =?us-ascii?Q?aFryjdwI7gL0vVhVxBgmMyUe3QpqQBSuadiyrl30ookGpOesp0hYtKhBXM06?= =?us-ascii?Q?Ko61SXWgylfniO8OI+TQcPhgOBt4lOSaDnWAwj/fErEMDZY/rkeLYqq1vcjk?= =?us-ascii?Q?Sdb3vzbWSj/z4dZLemk1ZA7Fz7WEpBPcZG2cUf/JJkNpmDxsjv7HWPfLsLuv?= =?us-ascii?Q?wjicNImWtAp1Y4gliu3uq5rjau9EP40agCmFa1t+V4YMIDSiz9++cCDlvOby?= =?us-ascii?Q?DkBeMIQ/SVNqiulYfQvwb9XA6727bmdnwmJETtcb/FMT0vLZeWuEmA7nSeM8?= =?us-ascii?Q?Ekv6ai2bG3fKZ22dKFLG+6KLhd0xkOXGbIqiJImE19E9WNHgkh2oTiZz0+gc?= =?us-ascii?Q?I+bH+/VEz3Z6Y6Pr6Mbc62WgwO3IItl32hBnXAP70EqhzZAUtPGHjiBEa0YF?= =?us-ascii?Q?Y2ymN/wTy/ZwzhT8C3Tn85bZpgLNDxAGzs4RCYTxBwaPRugMnm1A+fQYQUDp?= =?us-ascii?Q?kFf2BD5PbLKBEnJ6A2XWdTSE/GrH3e0Y12Ftu4BK8PxUxxtpo73qWk3bFmX2?= =?us-ascii?Q?2hBHxvMJLPOmWnb0ZsRhP2pc9rYSRb1cFoUXY82VMy9E2SCJSSUK0iCM4L4A?= =?us-ascii?Q?0=3D?= X-Microsoft-Exchange-Diagnostics: 1; DM5PR06MB2475; 5:vjwj/ZJ3e7nOrYIXzErKR3zqrPUllct6Chp6qpSp4ihOYIlWbBVgkY6FVG95ZtoVdfVQt2t8b2GoONxN+rmysD0nxtjk94xHivAQltgVqaoy9MThzIJa4yqQNxom4durLhmxAAoLt/+SiTU4tQZ0vW6NotBJy1MQ9uoRNAKhedLFEaT0fmp9Qbs9YgnUi4SBk3jOqn9qDbiqIoXApNTKVdSM9AtUc0qWfILRuY39jxTQUu1+Sl3JKJk5W4YJvS1BQsEyHuzbsjIiussWZUbynaeeEHgjO8HHxLsXCVyZj85+44PT1utJldE+31lbYOCrQbjJLdeo3JUxwJLp3vWcBMvbyx3pZUpGq28XnePpfJY1mJufSrXj+P4fjx/pMqwqUU5Hf9cZVSDkPuJvqEBrlRpJYzUlM1O/m4jzTRBW7CZ7qsZKuhPTWYOdvvwjpvpGkpMlgdRfgywYM//7lIuGhTCOekXk4e55esKLlNZLXjS2broE1YwTamFiIIMsMnTq; 24:pInmGYg8SkCdyBDPxzFMaS7l9MX0X9XLfDs9LXt89zig6c+wR4flqU858PZK3hKq1vEQNBpWJ9AN5gqYan7Rs1oXysUlTbLwFBJ2uSLXn4Y= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM5PR06MB2475; 7:TxhR54AM2FllG8jb1smvTCMDZTVRamObRLfSjm7jCUhxJjtb8G1X9opPJitoZT3DXM7cdhYqRyC9S7xaPSvMbarrJCaRj1tZgEp2ngNKRiL+8IEjzqYDJBlztyfAIieOG27fuJhLrJA9gMujyQMCSOigoCyue+ha0xYJLDyVu4ZqWMDetpUDYUmnxOjCyAsk1uhMSkEKo80UJuZoSxx6pUYBQnyg0xDzAA1oUu57B1JFM/5OUEmhKT4RZxwAFYYLuD17/gWVUWE7JVpvK4kFDeevIRVkQSWphf4PSZvsgQ553+9ENKN8CsC0bEbioXEJ6IfEX+MDHHlFSKeqYI5NssX2LxX++NlCf6rA6qeOPDiN7CSw4KGlpEHWPjeglDhUH3E0PU3r81V9EY4mqYo7/XHTd60pAeQHM9/fmsTRW6QPlU92AY5MYXvWWFjEs2Ctu1u23mAE2bH7MmqvJTQziHbC7iu5zNx022zzw6l8xPRcW+vSzURngeAD0ceTDr9O42OeIjiMCWh0l7zA+JBwy2/24/1ey3yLJAMetqdEYUjqxwnzOGNs6JEYszSbNbrmLLFJMbkDYIbMaVbb0004ariqesr91P7PBrNowXp5ygqV/19gj0pE/BwEjcExCQYbFSAy3ljt8rS7DvjIwjVhMfrrhgzBkoxtUshQNb/FQxJED7OX3scQbo/QpWFqyyoojENDHacNXPHoaTPCw4qpI8C+GACf1HFwWDRPqrztVMvAmOwAyTFEBZy5Z+2jdPC80qFhBfWimfFGrhO6A6DP8d9SoPXfDk+Q09QHWLINnsE= X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Jun 2017 16:12:45.3343 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR06MB2475 X-OriginatorOrg: netapp.com Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Anna Schumaker The current code worked okay for getdents(), but getdents64() expects the d_type field to get filled out properly in the stat structure. Setting this field fixes xfstests generic/401. Signed-off-by: Anna Schumaker --- fs/nfs/nfs4proc.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index c08c46a3b8cd..735b3068a2d1 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -275,6 +275,7 @@ const u32 nfs4_fs_locations_bitmap[3] = { static void nfs4_setup_readdir(u64 cookie, __be32 *verifier, struct dentry *dentry, struct nfs4_readdir_arg *readdir) { + unsigned int attrs = FATTR4_WORD0_FILEID | FATTR4_WORD0_TYPE; __be32 *start, *p; if (cookie > 2) { @@ -305,8 +306,9 @@ static void nfs4_setup_readdir(u64 cookie, __be32 *verifier, struct dentry *dent memcpy(p, ".\0\0\0", 4); /* entry */ p++; *p++ = xdr_one; /* bitmap length */ - *p++ = htonl(FATTR4_WORD0_FILEID); /* bitmap */ - *p++ = htonl(8); /* attribute buffer length */ + *p++ = htonl(attrs); /* bitmap */ + *p++ = htonl(12); /* attribute buffer length */ + *p++ = htonl(NF4DIR); p = xdr_encode_hyper(p, NFS_FILEID(d_inode(dentry))); } @@ -317,8 +319,9 @@ static void nfs4_setup_readdir(u64 cookie, __be32 *verifier, struct dentry *dent memcpy(p, "..\0\0", 4); /* entry */ p++; *p++ = xdr_one; /* bitmap length */ - *p++ = htonl(FATTR4_WORD0_FILEID); /* bitmap */ - *p++ = htonl(8); /* attribute buffer length */ + *p++ = htonl(attrs); /* bitmap */ + *p++ = htonl(12); /* attribute buffer length */ + *p++ = htonl(NF4DIR); p = xdr_encode_hyper(p, NFS_FILEID(d_inode(dentry->d_parent))); readdir->pgbase = (char *)p - (char *)start;