From patchwork Fri Apr 22 21:15:04 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bart Van Assche X-Patchwork-Id: 8915681 Return-Path: X-Original-To: patchwork-linux-rdma@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 9F811BF29F for ; Fri, 22 Apr 2016 21:15:16 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6CC25201F2 for ; Fri, 22 Apr 2016 21:15:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6EFE2201EF for ; Fri, 22 Apr 2016 21:15:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752190AbcDVVPM (ORCPT ); Fri, 22 Apr 2016 17:15:12 -0400 Received: from mail-bl2on0099.outbound.protection.outlook.com ([65.55.169.99]:36699 "EHLO na01-bl2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751742AbcDVVPK (ORCPT ); Fri, 22 Apr 2016 17:15:10 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sandiskcorp.onmicrosoft.com; s=selector1-sandisk-com; h=From:To:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=OTbZ0+/d/V7/v4IZqZV/Y2JzeCmDPbOEqkxM/+UMo4M=; b=t9XDM03n9DiR7r/SISW1kUpoghpVEWSRAv1ambr3SwFkHm24qn8GNqZvtYYCYXO6pR2YKz/Ndp2H4Fzl8OlIsvjkaixKgYi8rIjReBAhl+NNSFYd0FJgGSd99M+yRNod6a7fcy3gYgxHY7cpAuaqjfs2aU9sRdKp6TAed6lRF+w= Received: from BY2PR02CA0042.namprd02.prod.outlook.com (10.141.216.32) by BLUPR0201MB1860.namprd02.prod.outlook.com (10.162.239.142) with Microsoft SMTP Server (TLS) id 15.1.466.19; Fri, 22 Apr 2016 21:15:07 +0000 Received: from BN1AFFO11FD049.protection.gbl (2a01:111:f400:7c10::175) by BY2PR02CA0042.outlook.office365.com (2a01:111:e400:2c40::32) with Microsoft SMTP Server (TLS) id 15.1.466.19 via Frontend Transport; Fri, 22 Apr 2016 21:15:07 +0000 Authentication-Results: spf=pass (sender IP is 63.163.107.21) smtp.mailfrom=sandisk.com; grimberg.me; dkim=none (message not signed) header.d=none;grimberg.me; dmarc=bestguesspass action=none header.from=sandisk.com; Received-SPF: Pass (protection.outlook.com: domain of sandisk.com designates 63.163.107.21 as permitted sender) receiver=protection.outlook.com; client-ip=63.163.107.21; helo=milsmgep15.sandisk.com; Received: from milsmgep15.sandisk.com (63.163.107.21) by BN1AFFO11FD049.mail.protection.outlook.com (10.58.53.64) with Microsoft SMTP Server (TLS) id 15.1.472.8 via Frontend Transport; Fri, 22 Apr 2016 21:15:06 +0000 Received: from MILHUBIP04.sdcorp.global.sandisk.com (Unknown_Domain [172.22.12.162]) (using TLS with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by (Symantec Messaging Gateway) with SMTP id FE.67.03047.7F39A175; Fri, 22 Apr 2016 14:13:27 -0700 (PDT) Received: from milsmgip11.sandisk.com (10.177.8.100) by MILHUBIP04.sdcorp.global.sandisk.com (10.177.9.97) with Microsoft SMTP Server id 14.3.279.2; Fri, 22 Apr 2016 14:15:04 -0700 X-AuditID: ac160c69-996e898000000be7-e1-571a93f7f532 Received: from exp-402881.sandisk.com ( [10.177.8.100]) by (Symantec Messaging Gateway) with SMTP id FE.1E.02566.8549A175; Fri, 22 Apr 2016 14:15:04 -0700 (PDT) Subject: [PATCH 08/11] IB/srp: Move common code into the caller To: Doug Ledford References: <571A936F.7040409@sandisk.com> CC: Christoph Hellwig , Sagi Grimberg , Laurence Oberman , "linux-rdma@vger.kernel.org" From: Bart Van Assche Message-ID: <571A9458.3050904@sandisk.com> Date: Fri, 22 Apr 2016 14:15:04 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.7.2 MIME-Version: 1.0 In-Reply-To: <571A936F.7040409@sandisk.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrELMWRmVeSWpSXmKPExsWyRoxnke73yVLhBkuX61u8PP+B1WLl6qNM Fs8O9bJYnP/wisli3ev3LA6sHufvbWTx2H2zgc3j/b6rbB6fN8kFsERx2aSk5mSWpRbp2yVw ZfTsNi6Yyldx9Y90A+MF7i5GTg4JAROJ7kN/GbsYuTiEBOYySay4spQZwtnBKNH/6AcbTNWD 6/ugEksZJc4su8YEkhAWsJdoedrMCmKLCKhJbHq1iB3EFhLQklg68TcrSAOzwGpGiS/LXoE1 sAkYSXx7P5MFxOYFKjpyYx7YBhYBVYn7Pf/ABokKREisXneNGaJGUOLkzCdg9ZwC2hLPO+eD xZkFLCRmzj/PCGHLS2x/O4cZ4tJ1rBK3txRDHKEucXLJfKYJjMKzkIyahaR9FpL2BYzMqxjF cjNzinPTUwsMTfWKE/NSMouz9ZLzczcxQmIicwfj3SfehxgFOBiVeHg/NEiGC7EmlhVX5h5i lOBgVhLhnTxBKlyINyWxsiq1KD++qDQntfgQozQHi5I4r9u9L2FCAumJJanZqakFqUUwWSYO TqkGxjWz7HfI38jM9nf+OXeWTfeOQ/2r5BYWXNTwKns64c3CBXzyKzefuJ/jn+oaXFPM/O/9 ponxmbEfOfxUuF8e2qARyvdl+fVfodM3ZEyJn3TAYZ7wU4979wrkHq2/riUVmBZtd+jHreOG TOWCtllHAm9PDt3xROI88/RpYoenZPJPal3TxhIy+ZwSS3FGoqEWc1FxIgAX90lbhQIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrBJMWRmVeSWpSXmKPExsXCtZEjRTdiilS4wZ2tZhYvz39gtVi5+iiT xbNDvSwW5z+8YrJY9/o9iwOrx/l7G1k8dt9sYPN4v+8qm8fnTXIBLFFcNimpOZllqUX6dglc GT27jQum8lVc/SPdwHiBu4uRk0NCwETiwfV9zF2MXBxCAosZJR5t2MMOkhAWsJdoedrMCmKL CKhJbHq1CCwuJKAlsXTib1aQBmaB1YwS9/p+MYIk2ASMJL69n8kCYvMCFR25MY8NxGYRUJW4 3/MPbJCoQITE6nXXmCFqBCVOznwCVs8poC3xvHM+WJxZwExi3uaHULa8xPa3c5gnMPLNQtIy C0nZLCRlCxiZVzGK5WbmFOemZxYYGuoVJ+alZBZn6yXn525iBIclZ+QOxqcTzQ8xMnFwSjUw mrb/+T1v6RJn/p7Wk73rqx9fe7/x8sH/OeWn7/Fr7pmze99z9uY8/fVHJ0Q8uv1/dqi3g0Vr g7zp/dqeaU0PTH4vsvuiUL4+dd4NCUm99b9ZmN+K1RRqGQjFq7j/Cv8094pD4rsvnTXXSmOU 1GKPvJ1S5eTfWVbdlij+4Zmww9TvT6YIzepXV2Ipzkg01GIuKk4EALNaJYj7AQAA X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:63.163.107.21; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(2980300002)(438002)(189002)(199003)(1220700001)(77096005)(4326007)(64126003)(1096002)(81166005)(189998001)(6806005)(86362001)(50466002)(110136002)(5008740100001)(59896002)(2270400002)(2906002)(36756003)(2950100001)(586003)(87936001)(50986999)(11100500001)(76176999)(65816999)(230700001)(54356999)(80316001)(4001350100001)(229853001)(65806001)(19580405001)(23676002)(92566002)(5003600100002)(53416004)(19580395003)(65956001)(47776003)(33656002)(106466001); DIR:OUT; SFP:1101; SCL:1; SRVR:BLUPR0201MB1860; H:milsmgep15.sandisk.com; FPR:; SPF:Pass; MLV:sfv; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1AFFO11FD049; 1:ESG/YcLGbJosvTHLwpUBdqnmCPhA0WXCkRZzhibKgadDYH6zD7nZkKcpZl8caqPYiPoUAUECLygdMlqjIgGhjE+H36VPSJKf3CCO6bBUfLFgJzt+uuS+mnvtub2fBZkmgRK7Ve1cCEMkrBtsR6nZv8ISKorbAXEdsPPBpqOpWT0cTrYOABS10N1id3nbxVjK0+AI/Ukcxxc6GemSY4So9fRdWf1PZ8QGmQv/uRGqL4UDSvdunJF7OHPRe6KPaLJHuF1aJGnK+d7vkE4+LNg5X6E2u4YbfhKMlVWiH+3DkbxRbCTPVRmD27RVF4X2WnWsCeLkcUjfKTI6WFdVlCcMK2mWmtCYMN3pLS7HHnbRcYBrey30uwXBeoglsgkdvSuNUPqL+P1bIukrRtNxoguB9ocpdut/aGexa0ucRJgAq5P0pw3M2hmwQi+CRQIvKB4NL0jlpPoZfZWjX5eDboBpQwvqdToj3AQKIlXtrKtPWp8= X-MS-Office365-Filtering-Correlation-Id: 50dce031-a729-468e-f391-08d36af32dad X-Microsoft-Exchange-Diagnostics: 1; BLUPR0201MB1860; 2:JhLTnO61xXOVOhBdefga5no/fBsvI2nmkYDKni0Trs5v+RF/R8JpJLZTgK7v1Hpsref1t19AO4XaICua1PsCHmp/Cn1jiaNYhTWGBTbN8R+NmtdhQ7g/+JF+a4p0SXfTF+6KKUc/q8jJCyFiGxi/XpVfUx72hPtNg0kRXYjNE6eq2ge5VNkr3Jaowh8EzS75; 3:hIwha5BsuT6i7ndBFZZjMi0lmOIIh9eW6o+vjGUa2mKmAQYOrx4N0i2rAPKQe+HvB6wnqT/KhnFC90THrn+NaiGHDbaX4vcrrsBSGwPIP8wWHc9iNKwBWjwbwjLSXxMh1AO2wMzZKLffr+eStif56CHvWAVxeELDpeRkY5GJEwgUiyhhxcMrg1iId0GbdOAelqFDlhQzLyY7naQB7ED1o7HiQev7ELDstJ05cQaob4RT+Kdpq4pivu+YKmKn55gEat0POLeXb+ToXDLkkcayLg== X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(8251501002); SRVR:BLUPR0201MB1860; X-Microsoft-Exchange-Diagnostics: 1; BLUPR0201MB1860; 25:BQjSNwwH/6geUzmx9NyiABF/QQG+GktW+i48To6PKNALevwgcvBkg+QWUxB5giM0LsWNotJpZWD2CIQosny3fdQZ2WZhtmkq1ha8pA3RUf0d+oI9zoXu+YVp1jgUJ1fwQCPHfI2AtfKEUj+3dumbJhXZDJkBwMf+UdpDzEH1Pww2CQWXLz/8ZZfsprIHryFzYy/eTG6brOJRajYoeIDQTlb7/PhAroF1j0DPXYBbf5WLM1QbKxEzkW03FQtUDdqxPGDSXD0C8NH+Ij1K03aoH+IiqvBoDDrVqXiDU6FLmUJNMkBtMvo8F91v8IzvEvkSRjZdKzUvvaSvZCNoMD+S2mL0UexLLWOG9AN+MPzBIw5yAhgYOmZNVzLic0Ksw4d3AyihGIRirvTOVIGz4NV+00VF39oiA7VBRj58llUANJ2+nav8shDYVLiwWxdxAUPOZzlnwzF4Z4HiO3f/FkaePTiSkdgC/FLRe4STHO8VdLV8W20OoeXU0hOrCcJoDVlCY8Hy81JFEKMAmp8/SSge33LBwuqa8kwLpGBMixpvSAr73zYodKLNK2Q5gFcaLYgVXHkmP68g1+ViRnnDCeszze9c4Sa/wGUVz04tX883OFkXblxciaQAnwAICIj/ZXDijJLABJ52xm1Lp8Q6bXeE1UDcKgzkW8l4oFMfGI3DmtXS4irRfQE0JWMejW42FEAr X-Microsoft-Exchange-Diagnostics: 1; BLUPR0201MB1860; 20:H/XCFcqDh83lKueAAM44+rM9xi5IA8vPkh1T1zHA6vxqlBnVGGWw93Ab0uwONg/3Te3V4wEQF0WmooECbyOaHE8CTXLMDBKviYSCbOTbzMxf+/UtJ71Kklgzyi6dfSrFkNybH73G7P0BJj/btVIjO3JTJdNnAM3SNAjREWJn8fJi7pxZVTLiqMMjBuIvfKWUT5Z35cl4NN311VqVRIpsd+2H/znAuA+CHA09MJakEo1oK/F+4x4m0331Hit8Q4Tz97Jwf9w6emxe6T9SJjZpdp0k0gBhx5IBPFEA6Q1BZmTuDObe5j8artfU24RjcBoJEFHV16IndMOvPcEk8nspT2fHRThwADUz8RxacqFlW5c9ZdCd1hoXGsyPmFfOJASPpem00Atf1kte4odyh8em/UQ5JqHYhCVYhhFNbdm515z8KGEY1ubq0JYsfnC9+O8UZ8SB89PLTuNwBAanyVRGlretClOubqXE4OiR0yH2/i4RRhtYFBJoXfXCd+/FBKRe; 4:5I7MnecckS5J/LLv0SYdWi6BQucG9ONZRMN9IjFcm0IwXemXmwTOGo0X8NxBD4rh8BvHOU/6sMj1JPIMgU/uSfxoGO2pDpIYluVk4GJWHhVHSnX3AQVjum0XcYXB/r2ddnbNCecQ4pz6rE0gJbgovTMEhYF1kXq83xRE976TL7izNWi6jHdAsaTTh/WGV40Kitk3yTSufbfxgZ0n+kTVuUkyuuCN/AQP8cmU8XtjLF0J0CwsZoKBs8BZ4h1HTC1vhOou+aW7xcDy4YfWDVoqbEf3FrWtR+/2ZF6RmJuHh6vvV2pf37o9tLAHPUkEn35CKXA7d5qqA5BKs3rzgOs4KYGrTdRgBHTgqZvaKkk/T+ICjXHNTcmMXWCuJqsLYc7CX6LQ12gT5db0lTP/IU1rUb7TGs9j2zaW0afC hcEIFoFyC0UhBH4QGgYCa76+TYZk X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(9101521026)(601004)(2401047)(8121501046)(13018025)(13016025)(5005006)(3002001)(10201501046); SRVR:BLUPR0201MB1860; BCL:0; PCL:0; RULEID:; SRVR:BLUPR0201MB1860; X-Forefront-PRVS: 0920602B08 X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtCTFVQUjAyMDFNQjE4NjA7MjM6c2VzTVdhbmgycHFoaUs3Nitrb0dUcU5a?= =?utf-8?B?ZHFtM3hZMFZsdml6aVZNUzA4a2ZEbnZuQ29MUEZYSFNQZjhleTB1Z1FBU2dV?= =?utf-8?B?bkV4dUp5WjlLVW0yT0pyc2pEbUVlUGhVdW1lQWI1S3BwclFUWmc3VkdHRDFZ?= =?utf-8?B?UEN5aUk0SVdlLzA5WnkyaTg3T2MyNUorNDhocWlLbzdwTW40NDZvaWErRGcv?= =?utf-8?B?dUZuYU1md1lhbGNLayt6VkhKdllvYldvTGVlOFp4U3lPbFEzMmVzMm1hL25W?= =?utf-8?B?bHN2Tks1LzBTbG8vM3NqVEdPRlB3MFFLTzFFREV1cjFqd0g5NFdldkhEdVBV?= =?utf-8?B?Q3RkZ3FvalMwTG5SbldEVUo3UURCUGMvY2RualZVUzdzV1VQQk5tdzZwdWVI?= =?utf-8?B?VkhMLzVJWkZ4QTVXY1d3QTJGZWlHeDRiS2JzdTE0aWtBNkh3bkxoNWx0enVC?= =?utf-8?B?UXJGRFVTbVJBdkNKY21kY2NVMGVYMDl2YUJWN1dybGpNcERuLzdiWUFVSks0?= =?utf-8?B?c3orK0w0b1lsZ3FQRVBKUHAxUmRvZ05zd1pISm1WbkdjWi9IMmxYbmxQUUE3?= =?utf-8?B?SWE0MWI3ZnBRV1d5Mi9QQ0poNk5VaEtON0wrbWt3SzZ0cUtQdTR3L0tZdGxu?= =?utf-8?B?OEhWc1ZyblNHaUNJRjQvTnFpUkQ4c0NyZDJNaXNSWVczTXZhU3hidFcwVUJm?= =?utf-8?B?eVdHbmR2cjNXYm5xd3FkalliZ0tnemdmK0VzTE8rdE5WeEd0N081ZWxCcFZL?= =?utf-8?B?VGg0S2Q1dlhtSmMzZEVPdCtlYlkxSHNONDZ1Ky9Kd3E1eFFwUk8rRzVMQ1Z5?= =?utf-8?B?bVFwL1NBRUo1RlhuTmhwUGxUN1cxSzRPbEx0OXNmUFhmU0tXOUROaCtBdEpo?= =?utf-8?B?ODZzVzBzK2FOWERsMG83OXB0VlJzUTNURGwzNHQ4VTNmenJTUGd6UXRGVU1L?= =?utf-8?B?RGdtMUFVTDM1ejNwVWdaN1NGbEk0aWsxOURwVTVUclNVSDZoL3RNajdremk1?= =?utf-8?B?REJRMmlyaVpJaVRCYlpZQ0swOTFlYkdCSmlXelVJRnBzcGpFVHNyNEZJaW51?= =?utf-8?B?VkNwWHJQMVZVUWUwbnNnd3VMNjFodTIyOU9tNjNzR29iRktNOWIvUjU0RlBx?= =?utf-8?B?RjlOOTBPNjJPWEN4bWxIWlM1TTROdHdjUGFOdEJyRXBnZ0ErWm9GT1FScXVq?= =?utf-8?B?OUdmMnFwWTJFMlB4MHQ4cW5mNUdHTUJiVEJVV0VydWgrRG1kbjBodm1KcDZp?= =?utf-8?B?bk10R1RGYi9NelAyK3Z6MDA5NGdIRTVZNlhXcHBHNkJnRWw1NGdDczYvN2xz?= =?utf-8?B?eUxCZkM4Q0JVQ0lCL2x3cFpCcU5uZXlBQk9nWVIwVnlOM0JOdmhpYVUyakw2?= =?utf-8?B?a2JZTkt3NjdsQnppRHZveitHMWFxTzl1TDlvOEw1cXh5YUdsd0VMT2hFcHpS?= =?utf-8?B?YVFiQ1g4WTVERTFnNmJVZ2pDbmFFSFRCQ0xUcGNRWEZQenJKMTRSeU10amFk?= =?utf-8?B?QjgvV2RGN3A5SzFTajlLVEdTUTNyN1ZsVWNXbU9lck1Ha2RSODNGVHlmdy9z?= =?utf-8?Q?ypH?= X-Microsoft-Exchange-Diagnostics: 1; BLUPR0201MB1860; 5:+BCF1qqGro83HD38rPHOmls26tAryDaB2Lck2nTYRdT3h5if+5ITMhMTZmWr7WnLBhisB76cxdDe4O+Sbl+h7A9ouaqYbbhZGJ0d5vBGnXWx5cFiOxymEZF+Py/KV9Z/k/RkhWFGRicNrApurj8+a/N9++5BeAYAD/wywG/5AQFYvToqPJ7gcP0sRFKzKEf6; 24:CF6rwkfUusDGmgU8wN3UqTXx4Fiz4nir1qlyJX9mbJrT8s80bN5hVFOFdHk2JQHl1EiDxpy0U2imss53Bl4Vd3ek1NUxMDAsJ29b6Ubo+LE=; 7:SkJEvKlaLSnly8KlJVAED9KN32p5dQ8l4XKjLHOy1H+tm8Wfyc6hc2KhGr8k1+wmzkUESqNCxoRdh/LaegTt4XYfHy6kh5zQwkqC5/DiSyToJRSbWjnohkXjAMCuXTBuRsANugs35/U9tLAXc8/RTBSl1yfjzgFtsV06zoyfgFlf0abBv12z2HnyzEP/lg86h8IfqplKiV02p/AaagaGGv4YGdA68zb6bCCgnOrZK6s=; 20:usITT2Enz3hJjyFIHu9v345HjSZ51dO7JbqEiOcylMZ7aES3aZZOND+ydaUUGFveaT09/3A4dUGcgGr8Ml8R5fOLknc1Hb0g49vINOHQ0Gpeqskxl4HRPOvDdPVlV2cZh8jDZKmci63Q3V++qqZTJ5v7/etE4dce+q2/uq1fms6HgzHb4wlWOPEFsuodm7pgiZGrCAgWWP4ga2NqsRm9TF48AZlkicKXc1TnnFYNFZhaOXqdvnPDBAMzWoIMhIy2 SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: sandisk.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Apr 2016 21:15:06.0195 (UTC) X-MS-Exchange-CrossTenant-Id: fcd9ea9c-ae8c-460c-ab3c-3db42d7ac64d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=fcd9ea9c-ae8c-460c-ab3c-3db42d7ac64d; Ip=[63.163.107.21]; Helo=[milsmgep15.sandisk.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLUPR0201MB1860 Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org X-Spam-Status: No, score=-7.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Bart Van Assche Cc: Christoph Hellwig Cc: Sagi Grimberg Cc: Laurence Oberman Reviewed-by: Sagi Grimberg Reviewed-by: Christoph Hellwig --- drivers/infiniband/ulp/srp/ib_srp.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) state->fmr.end = req->fmr_list + ch->target->cmd_sg_cnt; @@ -1431,7 +1430,6 @@ static int srp_map_sg_fr(struct srp_map_state *state, struct srp_rdma_ch *ch, struct srp_request *req, struct scatterlist *scat, int count) { - state->desc = req->indirect_desc; state->fr.next = req->fr_list; state->fr.end = req->fr_list + ch->target->cmd_sg_cnt; state->sg = scat; @@ -1463,7 +1461,6 @@ static int srp_map_sg_dma(struct srp_map_state *state, struct srp_rdma_ch *ch, struct scatterlist *sg; int i; - state->desc = req->indirect_desc; for_each_sg(scat, sg, count, i) { srp_map_desc(state, ib_sg_dma_address(dev->dev, sg), ib_sg_dma_len(dev->dev, sg), @@ -1602,6 +1599,7 @@ static int srp_map_data(struct scsi_cmnd *scmnd, struct srp_rdma_ch *ch, target->indirect_size, DMA_TO_DEVICE); memset(&state, 0, sizeof(state)); + state.desc = req->indirect_desc; if (dev->use_fast_reg) ret = srp_map_sg_fr(&state, ch, req, scat, count); else if (dev->use_fmr) diff --git a/drivers/infiniband/ulp/srp/ib_srp.c b/drivers/infiniband/ulp/srp/ib_srp.c index d709428c..caefd1a 100644 --- a/drivers/infiniband/ulp/srp/ib_srp.c +++ b/drivers/infiniband/ulp/srp/ib_srp.c @@ -1409,7 +1409,6 @@ static int srp_map_sg_fmr(struct srp_map_state *state, struct srp_rdma_ch *ch, struct scatterlist *sg; int i, ret; - state->desc = req->indirect_desc; state->pages = req->map_page; state->fmr.next = req->fmr_list;