From patchwork Fri Apr 7 18:15:08 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Schumaker, Anna" X-Patchwork-Id: 9670117 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 69AF460365 for ; Fri, 7 Apr 2017 18:16:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 62C8228635 for ; Fri, 7 Apr 2017 18:16:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 57AD328634; Fri, 7 Apr 2017 18:16:05 +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 0B32A28635 for ; Fri, 7 Apr 2017 18:16:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933826AbdDGSQD (ORCPT ); Fri, 7 Apr 2017 14:16:03 -0400 Received: from mx144.netapp.com ([216.240.21.25]:42074 "EHLO mx144.netapp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933216AbdDGSPx (ORCPT ); Fri, 7 Apr 2017 14:15:53 -0400 X-IronPort-AV: E=Sophos;i="5.37,167,1488873600"; d="scan'208";a="186669766" Received: from hioexcmbx07-prd.hq.netapp.com ([10.122.105.40]) by mx144-out.netapp.com with ESMTP; 07 Apr 2017 11:02:32 -0700 Received: from VMWEXCCAS11-PRD.hq.netapp.com (10.122.105.29) by hioexcmbx07-prd.hq.netapp.com (10.122.105.40) with Microsoft SMTP Server (TLS) id 15.0.1210.3; Fri, 7 Apr 2017 11:15:51 -0700 Received: from NAM02-BL2-obe.outbound.protection.outlook.com (10.120.60.153) by VMWEXCCAS11-PRD.hq.netapp.com (10.122.105.29) with Microsoft SMTP Server (TLS) id 15.0.1210.3 via Frontend Transport; Fri, 7 Apr 2017 11:15:50 -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=R8oReVye2f8DIeoBiyG4bduf7oX71ePreOZrVrsw1JA=; b=C6zf26/cdr6jhxYRwJRTYDj/VTDZAy4bzMdji8U6rCWBkoFn77n++eeKVNdoRmIlClVs9VoSlzVpoWvXg+tPRXEAVqA5m9XFhCx3QZlU+Cca5P53YNKxGtYctRYNuwvGR7UmyBuxflDk1cjic0nnHsncafYwJexNM801Wr346f4= 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 (68.40.188.1) by CY4PR06MB2472.namprd06.prod.outlook.com (10.169.186.140) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1019.17; Fri, 7 Apr 2017 18:15:50 +0000 From: To: , Subject: [PATCH 14/34] NFS: Clean up nfs_direct_commit_complete() Date: Fri, 7 Apr 2017 14:15:08 -0400 Message-ID: <20170407181528.2832-15-Anna.Schumaker@Netapp.com> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20170407181528.2832-1-Anna.Schumaker@Netapp.com> References: <20170407181528.2832-1-Anna.Schumaker@Netapp.com> MIME-Version: 1.0 X-Originating-IP: [68.40.188.1] X-ClientProxiedBy: DM5PR20CA0021.namprd20.prod.outlook.com (10.173.136.159) To CY4PR06MB2472.namprd06.prod.outlook.com (10.169.186.140) X-MS-Office365-Filtering-Correlation-Id: 28ddc06e-a6db-437a-1cac-08d47de21f79 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(201703131423075)(201703031133081); SRVR:CY4PR06MB2472; X-Microsoft-Exchange-Diagnostics: 1; CY4PR06MB2472; 3:aV722AFUKsI2auquVc7W7gxUuz35w0bBhxYPOGxRr8REkOxdiMHQh2MHOJEH5aBgyQ06THq7HuCofIETvITJQBEteuA8j4xF/Je4SSqHyYK0Xo/vAQOQUFVg2hGJJxhQJ3SONueGXYhmlHMTy8aWwVym4M4kcoRfj7xJnudH1/vMr5LLL4tqO6ilfXNdTfqOI0dLnuCm1xwV0lU6AnU4l+4I2t74u/7Ce+rabfUXOiILJ5iv0AVwAYc2Kos7JFzxO5LyQVMT2WhNDy/L0v3dQWkUaD2CDkliS37Gc2Hl9RY2k5o6pkvzkNdcQ94xt45sX4Z9DwoS6BUU5s7LJFG+qQ==; 25:blnL8Ay+nk+YHJ2TpXMQziLrt5G9tG6Grv6gYqtz0KrmDw1csC8ODkCPwCaKGpRs7Pvvvw7xrYaNmAQaYKLy4QC/RKy5XJIzCJMbuSMw0qkJ+domzIhsKoo9U0GPijK8a7VT73s8hoMr9qxxwijwR2RJ/1kZblij7+ca7NYdROLLG0AxjuQQOyT4X8GV3gWGcEE7lBxIM9T0SnnSmeJT4IwumHtlAc7pTuJkXh5CLttTlCe80DBaNox1raotRpR3TyYAJdChUGMvEWcCAi2W1d26k/IMqtp8+8zFhMWGIj89F0ieb0LtjkVXNRFHpUoPzroRDvazy4UwLaID4uritqxsxiCiSGQeClAwsKxD1S2pkBnd4B6EpJBh6gWICUKD22Mj4CV8QTD+p0HcIDLtEYWb1uBvcayH2z1PwzAcwnDNX75qRwphzwIasecmGTZ+un2lTomq17kVJMKCFJ6cVg== X-Microsoft-Exchange-Diagnostics: 1; CY4PR06MB2472; 31:1yNMOFNvMHDAk8mQS36dk63erowvN06lKDXWD/V0f0oqwqQniySwLKybYaKUCbfacHQX60fJTrqfGr6wXbWQ/e8p2LnwbQeg7Zl2Pm+J329NZwDHHjfpUVw48qYQOZXo+sKW9q9QAsp/wdpXJE9Go1eGlrMRGC4tSsYGLJANRr0SlVSGE2CSn3HBxIWH6YY3r8VIxDHwUsjZ5Hytto4a24ez50Te4sDB/SrCil7OCBHpcsE0jgI873HkBc9m5xtLhcf78SSl0jYlaQs0zbmICg==; 20:nLBQ0NvUxmOrMpa8on/ft+AYbGwx9Yem3eEAy7C2jwJHEjS+SelduuGUa3KgRiH/vmkOqiNEFXIsGEtjbgY9VytLlORJykknMo+RfBGeFe4dwSBnXsuHHcIbfiXFrr2GFqM4w0IQduJFTZ5pUVqq0z8CgguQx/g5AD/jsm85eSutYFp7kt85jzn8JnNipS9xNdf0FzEXx9Ut+PRL+qFWxNcxFI3nE6bEmhQ7dphvdIQCVLTADDAjEsZwy78Pq9rkz8hmAJbO1j8zOw+s+BD8KThQyzjdPNj0SNGT8BKetiZMyb51zFBakS3yfzsJ5kz4wLgaCcp6ER2CCQO7YnB05H4Sw/dtrMX82NRIXmJRhXAEsNbgSkHsZC81sYQLgUfD1v5QZRNtGlTQPf/erklr2bd7hFGrcFDu9K3nOgCHgn257b7qRklFav8pvw9p+c8JrGQOKHpT+i7+ygNHtEhCoWRv9Mhre/4wLLOe8XSwAJYsejS+mv9lIBT5SHeYMLvH X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040450)(601004)(2401047)(8121501046)(5005006)(3002001)(10201501046)(93006095)(93001095)(6055026)(6041248)(201703131423075)(201702281528075)(201703061421075)(20161123562025)(20161123560025)(20161123564025)(20161123555025)(6072148); SRVR:CY4PR06MB2472; BCL:0; PCL:0; RULEID:; SRVR:CY4PR06MB2472; X-Microsoft-Exchange-Diagnostics: 1; CY4PR06MB2472; 4:yuRmpajrtupcKU9ZmvISeuWDc8NFg/zPu7h8p+7sWQpfymak0bvBD+ZD76vIs+SmZj3xLWB5uGBuV20/4tmreBPfqY3tGY0vVsbWaF8Tfjtry8ke4gA8nfwdWwZZ2o6gjAFfE8P44+VA00/mEogakhQo94Lw01GHtgkfWUt2LJ6qEFjdMuUs5wZWS7R+hjNtjrVoZFLbb3hzgugpV9bPyXgIYrd1vzTYh6awbhYLvIgUVOp5bLDXJIgT9rFfReo9jSV/1Dp7DlB/AeP0StaUtM3q5u/5p6AaC67LCYSPJ142WcJgBjpg8yF//go0hVIxrZnd+WK1wZMkHG/BGK9RkV7oosuZxF9QtlfPYOh+WAF+dua4pGUycj7VYmOHMCpKR9iqCQFTUOSnyaTjXVQ0qspYOk+V9sIeQ1VQIqy2ejdd4loVeYITPkyvrp0x96pTeUN3G6pF2MDXXnFLH0F+wPEH6SJvfgU2IzvZFIjOd8nD5/JunE78l3nQtkEPgaHBJtavGpyYFNzpkP8UGAJMMe0Xu/NuzQY/LdetjMyiL42sQnSejzBddYbYjBb6j9unXU4Yj5InGA46if5hRA/LMZ073hkuIRy4ztqLjITAYmlaryDNFcoLBWKY703tWFhi3KJqSpDLkw2fB6dTzl5JFi1vcI+wIYLvB3h0i26Pezvtb/T9QhGZoFSkq0eRhhwCZmhv5YJXdJXALmtGHzTSTp4OwmB/Ijrkv77L7dxyWSA= X-Forefront-PRVS: 0270ED2845 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6009001)(39840400002)(39400400002)(39410400002)(39850400002)(39450400003)(305945005)(189998001)(2950100002)(5003940100001)(6666003)(7736002)(86152003)(6512007)(2876002)(6506006)(6486002)(36756003)(5660300001)(53936002)(25786009)(38730400002)(76176999)(50466002)(81166006)(8676002)(50226002)(1076002)(6116002)(66066001)(42186005)(2906002)(50986999)(47776003)(86362001)(3846002); DIR:OUT; SFP:1101; SCL:1; SRVR:CY4PR06MB2472; H:gouda.nowheycreamery.com.nowheycreamery.com; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY4PR06MB2472; 23:Pwfs90Bv9gbdXuef3dBmTWt+PK9VyFEv7Bn4ypHnN?= =?us-ascii?Q?lE/EOYrqpMeQh9wtRjC8+fPEF8Z4nVZx8yATCTcAlWfG5YlBdrq1Om4uuVPP?= =?us-ascii?Q?YgQ/LqbLi1Y6Pegc01hL3rVAF8vF8MR1n2eUKP5jeS/qeC5AgTB+JvnjJ2Hr?= =?us-ascii?Q?ETK7tlqFY94T0f1sVOAu4/1Dylzs8uSOVjJZrvqWSRvCyudu1Hb5P8bNLyCN?= =?us-ascii?Q?x0/G4x4T2W4L9WpXjsnF2fo3Bw1ze7ybjwixZZn7spCggqgi53/zKh/YsNcV?= =?us-ascii?Q?5ycyEQxMZ3bEgbqA7ncgdAw+wVWSBalf79gn+RtZE4AMRlUP06ryQASZgS8z?= =?us-ascii?Q?l46NhAoTAF3x9nzAhIajEQhERbmBXM6EPT1nc5Oye3XMV2tw0Orc10BO900k?= =?us-ascii?Q?BEmkONc5In8tCMwdwiHbq4f37Jl7bweSvsPle8XBn1aGa5atb1VnOop/+r6P?= =?us-ascii?Q?4J+BIAXS62Slyh4sMuDQbFfL3EGJcdnNUBmJN4WXuXg3Xbef6KhhnTDVjHQk?= =?us-ascii?Q?cGwKJ/xz5thbok7M6t1jc3ZKmWOnIWYN90Kpy4rn46uc4/sdVep8hvT9BXki?= =?us-ascii?Q?2bt8XZHWJ+8ZyypVl8yLtfyMugLWlqWy4BrVc6tnk/N1rqnS9xito+YXvfZh?= =?us-ascii?Q?Bo0Po/Il530GYRduvWdvx8cipkbgZv/BQsiZ+Gojl7k1sn7fhmcZtw6HNJWZ?= =?us-ascii?Q?G4/ER4dd+TP2LrfoKmZY4ynKMZ6u73YoOhaOMoQxHAX0W7llHrPKinFwi80w?= =?us-ascii?Q?7OIVrC44BmcLt3z7em29k86S8+zNhX9XtJ6QTHVXEOxzVWEa6DdwIwNd+Wpf?= =?us-ascii?Q?rnTEE+ZiHj+R8zNFXt0t4ULcgBPh0MuXhX2v7cKivfzgGV0dizdnvFWWDOzW?= =?us-ascii?Q?NBc47bVP/sgriRSU2MpBbSM7ypOC7saUk/B7045F9QY4gKm4snQ1JdDpiG7R?= =?us-ascii?Q?0zZPqNa8B1YVukMROb3bzVhTcN+KZM+PIHGb465qQ=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; CY4PR06MB2472; 6:ZqdkX9w2elje0xJNwTDxM7EElts/4xJWCxwmz7OAoS4H3WhHDuWI+ge5RO85aqgbUIT4M8AnB0LAfaWVoks9sUijYYAKGa/VIU5cdsjY/qsa30dHBoX0VvnSYytKGOzEeKdkD66BYowJsMMkcwxVE4u7gk+G9dMyUoO7YOayUBXFWr0LqFsijA0eqTCLePBwj5ETKxm3z8ib79US1x5BKIiX8n2UPu9+gUv6RGhephiDXX/zuZE6np07jd98AAP3HYeTKhEI9bpOB5C3eCFeVRC1e5w7T5qQ9yxggSPFQrmIhsiuqOTGolujhE1Wt2Ix/DWUCNvsQm79JrNSbcvR48xtkwkIhmOw7vNVIw+vySxHgB9Ha7TLoJC4OhdQsaKlgRV5SmwZ3P9nNQ06N1nYookWR6GRwAetpAmtHnKqFdMRLPcycRX9LRruCL1nfvtqnUgyHpdtrV6WAlO562Pttg==; 5:kUfDfdubIluWBRGivWntwfBJ27z7v0dLBxhO/HId1lkpbeLlR4KsgBz6d5m4pwBMbo/fzAKKhtR7XBBADi3nrRlpUGIb58cir/I7qrMULzNJ0G/FnJSBpP5MgAt10S/+POa8M91SimQQDWq2nvjSXQ==; 24:xNVstj/8kD8kHwjZUdMExDq3rcb8TeEHdJftn0+/hZfl6Yl55fvczBujlbMQYEsRqrq60IGlQweEMreiouwp4KatxWGkQTiSuIF/Tc62J9U= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY4PR06MB2472; 7:mHuBxJes5GXqDRZnBUL6e21vnmDKJ2oqJ2q5ZIjkjxJ57ZzmDcT4IsS3QBZBPivzRzs2UwJJmVNwJ9GB5HTLy+Hic4WybXC8EFXf1ZlQznAq3FL+RoZOmaCZNy3Q9NzRRwcwmALqz1bdjdE8g7cipv+SMVsCRKXNR0U2Xz5HYoQ+5M7ik1H1Ycouaxm6SHIXURrTO5uR3mN2M7X1JpiV/JwX7zvLA8dLaWzyyotRS0rwv5A4k64EJ8CZV4Kf4fzJ1uJiwb6HHH1q2SXTdhhhSyIhvxIaiX6n6kOiVzNtSm3Ftdd2C3xfb2OuUyQxfge/hh3hMR4/hSJ4m+xFZ1zznQ== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Apr 2017 18:15:50.7331 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR06MB2472 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 Signed-off-by: Anna Schumaker --- fs/nfs/direct.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c index 0b65e25b71ac..18d0868ee274 100644 --- a/fs/nfs/direct.c +++ b/fs/nfs/direct.c @@ -685,16 +685,9 @@ static void nfs_direct_commit_complete(struct nfs_commit_data *data) int status = data->task.tk_status; nfs_init_cinfo_from_dreq(&cinfo, dreq); - if (status < 0) { - dprintk("NFS: %5u commit failed with error %d.\n", - data->task.tk_pid, status); + if (status < 0 || nfs_direct_cmp_commit_data_verf(dreq, data)) dreq->flags = NFS_ODIRECT_RESCHED_WRITES; - } else if (nfs_direct_cmp_commit_data_verf(dreq, data)) { - dprintk("NFS: %5u commit verify failed\n", data->task.tk_pid); - dreq->flags = NFS_ODIRECT_RESCHED_WRITES; - } - dprintk("NFS: %5u commit returned %d\n", data->task.tk_pid, status); while (!list_empty(&data->pages)) { req = nfs_list_entry(data->pages.next); nfs_list_remove_request(req);