From patchwork Fri Jan 29 23:11:43 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: 8168501 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 68EA8BEEE5 for ; Fri, 29 Jan 2016 23:11:52 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 863FC2039C for ; Fri, 29 Jan 2016 23:11:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7613220398 for ; Fri, 29 Jan 2016 23:11:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755107AbcA2XLt (ORCPT ); Fri, 29 Jan 2016 18:11:49 -0500 Received: from mail-bn1on0075.outbound.protection.outlook.com ([157.56.110.75]:43921 "EHLO na01-bn1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753714AbcA2XLs (ORCPT ); Fri, 29 Jan 2016 18:11:48 -0500 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=B9Leg3aVrq9zCXyYi3TUtAEafgM6DDLBj9AhPld2SLs=; b=ToIGFUgomWk3gqDvVoHpL3zj7L0f/pqQwxsXfKJYVYjVPHuTcIaRCa8hjaNxkJqDgCehwdFq1kpYig9s/R014K6vExzcSnvKOb3NFTCIzPDiLLorPrqv97Lxlu3gq2ywMdS50/fDRwGup39JD1gTKw98FqR0PCo6N7bfzlZcQpQ= Received: from BY1PR0201CA0026.namprd02.prod.outlook.com (10.160.191.164) by BY2PR0201MB0822.namprd02.prod.outlook.com (10.160.125.150) with Microsoft SMTP Server (TLS) id 15.1.396.15; Fri, 29 Jan 2016 23:11:45 +0000 Received: from BL2FFO11FD035.protection.gbl (2a01:111:f400:7c09::127) by BY1PR0201CA0026.outlook.office365.com (2a01:111:e400:4814::36) with Microsoft SMTP Server (TLS) id 15.1.390.13 via Frontend Transport; Fri, 29 Jan 2016 23:11:46 +0000 Authentication-Results: spf=pass (sender IP is 63.163.107.174) smtp.mailfrom=sandisk.com; lst.de; dkim=none (message not signed) header.d=none;lst.de; dmarc=bestguesspass action=none header.from=sandisk.com; Received-SPF: Pass (protection.outlook.com: domain of sandisk.com designates 63.163.107.174 as permitted sender) receiver=protection.outlook.com; client-ip=63.163.107.174; helo=milsmgep12.sandisk.com; Received: from milsmgep12.sandisk.com (63.163.107.174) by BL2FFO11FD035.mail.protection.outlook.com (10.173.161.131) with Microsoft SMTP Server id 15.1.355.15 via Frontend Transport; Fri, 29 Jan 2016 23:11:44 +0000 Received: from MILHUBIP04.sdcorp.global.sandisk.com ( [172.22.12.162]) by (Symantec Messaging Gateway) with SMTP id 3C.98.25823.0B1FBA65; Fri, 29 Jan 2016 15:11:44 -0800 (PST) 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.248.2; Fri, 29 Jan 2016 15:11:44 -0800 X-AuditID: ac160a69-633ff700000064df-1b-56abf1b0f709 Received: from [10.60.52.49] ( [10.177.8.100]) by (Symantec Messaging Gateway) with SMTP id 88.47.02700.0B1FBA65; Fri, 29 Jan 2016 15:11:44 -0800 (PST) Subject: [PATCH v2 02/22] IB/srpt: Remove struct srpt_node_acl To: Doug Ledford References: <56ABF16E.7070006@sandisk.com> CC: Christoph Hellwig , Sagi Grimberg , "Alex Estrin" , "linux-rdma@vger.kernel.org" From: Bart Van Assche Message-ID: <56ABF1AF.3070301@sandisk.com> Date: Fri, 29 Jan 2016 15:11:43 -0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.5.1 MIME-Version: 1.0 In-Reply-To: <56ABF16E.7070006@sandisk.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrGLMWRmVeSWpSXmKPExsWyRoxnke6Gj6vDDE4uFbe48PQ7k8XL8x9Y LVauPspk8exQL4vFjbYHbA6sHov3vGTy2H2zgc3j2fTDTB7v911l8/i8SS6ANYrLJiU1J7Ms tUjfLoEr4+/bx2wFZ3kq9u6fyNjAeI6ri5GDQ0LARGJyD1MXIxeHkMAmRonzu+6zdjFyAjk7 GCW6D+SA2CA1G9e9ZYEomsMocWvPLSaQhLCAnUR3y1IWEFtEQE1i06tF7BDNWhLnLnxhB2lg FljFKLHp6nWwBJuAkcS39zPBGniBin4susIGYrMIqEqsb7zLCGKLCkRIHO7sYoeoEZQ4OfMJ WD2ngLbEktkXWECuZhbQlFi/Sx8kzCwgL7H97RxmkF0SAntZJeZencIGcYS6xMkl85kmMArP QjJqFkL7LCTtCxiZVzGK5WbmFOempxYYGukVJ+alZBZn6yXn525iBMcGV+YOxhWTzA8xCnAw KvHwLlixOkyINbGsuDL3EKMEB7OSCG/dC6AQb0piZVVqUX58UWlOavEhRmkOFiVxXusWtTAh gfTEktTs1NSC1CKYLBMHp1QDo5pe1Scd5+QJOb9eek9cnhQZpLjl4CVHiZlSxUr1d5kmT1P5 /O/YVhaWim1xOUVMJW4fmtWFPyyI2pQ+S23DVF+HSEWGr+81wl6XLHzfnq92/aHeZmvRrsd3 t/ptNX6qEiL/+/W6Ny07fK3K7i7T1svZycXJud6/4yrj5MZe7k8sm+QbOXlKlViKMxINtZiL ihMBphOel4kCAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrPJMWRmVeSWpSXmKPExsXCtZEjRXfDx9VhBtvfMllcePqdyeLl+Q+s FitXH2WyeHaol8XiRtsDNgdWj8V7XjJ57L7ZwObxbPphJo/3+66yeXzeJBfAGsVlk5Kak1mW WqRvl8CV8fftY7aCszwVe/dPZGxgPMfVxcjJISFgIrFx3VuWLkYuDiGBWYwS67u6WUESwgJ2 Et0tS1lAbBEBNYlNrxaxg9hCAloS5y58YQdpYBZYxSjxe+UHNpAEm4CRxLf3M8EaeIGKfiy6 AhZnEVCVWN94lxHEFhWIkDjc2cUOUSMocXLmE7B6TgFtiSWzL4DZzALqEn/mXWKGsOUltr+d wzyBkW8WkpZZSMpmISlbwMi8ilEsNzOnODc9s8DQUK84MS8lszhbLzk/dxMjOEg5I3cwPp1o foiRiYNTqoHRz4X1+MdTNzitopJqzD4897WMNO7/evefkuKkI+fePC4u2+Yz4+5WXp34ii7X NRovnXiEqgSsapu+Nju03ZvwW/lP6a2Zqj9WX9QPsXBRmSATwrT0WoIHt8VMjnpB1vtnpX5d bxDNi7shk1ZQkW/4X+jXFAurExl9z/715d/gVX0SWBVnwqPEUpyRaKjFXFScCACXw+znAgIA AA== X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD035; 1:n2ldlv1YLlytzLQr4pje65R+O3QpPFZ1H4RsFv2Y+kqFMLRdbxDhzZXTRoq2ucxzNcYk+7C7h2/UA9Ua9wi4ZacZWvdfFLke3gyEnk8MJDgKC/DmvA82/qRUZIi0gzvzrKqfBikhWDDTMtmiNGsx4uhtHZvGkphc/1HfFmUcVu+bJ364d78oDQ8wMiN4H48JBMnV9KzAbdurBMoj2aw6nKLkL0ieBcS8xijKZy05hdI74V+IUevZIm6zFD3NNw2wlCouxEvRKW+MkU+z2Z0UWG7Q1yeo4IptPERKJurh0xpuvX129wk0cftgEQ7VmT40IrAIXDuE2Swwf01Vkk6TYoGeoGVlkoiuQjDuvAZu5qaTu5U37XcmXwjbEPSrhhsVChxGcwW2U/y3DXtofwcPeIh+j6NJ+fUB1uhCZ3+ecVHR2XNWROtmWZ9x88CMLSxt X-Forefront-Antispam-Report: CIP:63.163.107.174; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(2980300002)(438002)(199003)(189002)(1096002)(2950100001)(4001350100001)(86362001)(586003)(92566002)(64126003)(1220700001)(230700001)(575784001)(33656002)(76176999)(50986999)(87266999)(54356999)(5001960100002)(110136002)(2906002)(47776003)(65816999)(65956001)(23676002)(4326007)(65806001)(19580395003)(80316001)(19580405001)(36756003)(83506001)(77096005)(11100500001)(189998001)(106466001)(50466002)(87936001)(5008740100001)(229853001); DIR:OUT; SFP:1101; SCL:1; SRVR:BY2PR0201MB0822; H:milsmgep12.sandisk.com; FPR:; SPF:Pass; MLV:sfv; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BY2PR0201MB0822; 2:RtiKUiz9AtF9tN1cnGXijrBtBSzYiXbpV26ywK5eaxr+Zv60TD+Z1k3x+Pc6QWU2zSImEA1Vcu0bgI2ejE8W0RZ4ttCJgmg4spzRoe8r6oCtcrAXapUNDeP2m0hysZqn0uJU6VjdeBYWJrdxtmdr+w==; 3:wRjL4RfZaS4sK4vssg/8wbmBjNN5m+JrusaurOvEZJmELbW9KWbRQcNwHjQvYkbcS7cO3pDj2MKkGKFlQp+Hy58+D6ekt4/5hW7lNonLN2TY7XmCWdYrslvarN50rUoSQItJYmMKkdeF5iNixqXNYs3vsnsDrRLEU9xAXLpz0H0D29Rkkds70rhNp89WcY5gkC50LOQdXHx3QerUtk5xT17iedQZ8+FbM1Dxlk7CBxUihNE93fBCZMO1vqSvDszGYGVSMRBG3j5RLji31kNfgg==; 25:hxpFrDr3CgwTu6QHXvm2VO208WJhhYtLr5wTtzh093l3I+AhrkJ4OtO8bftjTQTwzNZl4a7lg5YvOfdUF2XnSa+r8svJm3K++4TDDUjyi2QrI25k7JJHHJ9AKhg6yDv64a9BocJQlifRY/MQcd4yrcoaxBIkkoSCz60eRCtpOMcZGNegUxeO7z9OnlH0PEmEAwK7WDHVEq/eFCAa4dSjxODFsFQ9lOM5/get6u0vqTVW0UImzUl5MF1MDZ+ITCw7 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(8251501001); SRVR:BY2PR0201MB0822; X-MS-Office365-Filtering-Correlation-Id: 868abcf6-6f28-4539-fea1-08d329018e62 X-Microsoft-Exchange-Diagnostics: 1; BY2PR0201MB0822; 20:njWTN+0ZqWeHI85QIha2tsuILVdPs76umLdpIaSTzWi2s34rmz2z3qW/XPvI+xFjDG5nuSqIR6tbKE8T2icbvxhdiKwVtAkLOWyLSUHZecYTL/sj7lMi3+yzim+CGW8/pNIbiM3eAJf8OWmd8b8f3CwS2TGetcV4h//F/HXhKy+A5HBk164zpKRQHfDAJFRDvOKfzfEw54ksTZFecgv1/RgzxBVumRWxmSnsv+6wzz4D+cIAbHiT7uztQFCjdC188CTPJN4+fP8L7cGFIso432LpPL05E51FHzuVasCH4s3iPB67O0JXWiGCX5WStAED+bcRPn6YpyEJO2+GvFj5Tix0LgXOiWRGaA++m7lBfC/YlRCk9LVp2TPFPfNQVRWTzCuFK7XeCK19R2JVs8nJeZo7OWBwXFBCnusPDo4s3kLiXRKw8gWKINUXzjE58KRgCUbtYoScDXlCGifcpdajgQdnrf5UEyI0eElVMoLqH2s66yVqEapMgOlJfjP4A4us X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(34787635062028)(42932892334569); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(13018025)(13024025)(13015025)(13023025)(8121501046)(5005006)(13017025)(3002001)(10201501046); SRVR:BY2PR0201MB0822; BCL:0; PCL:0; RULEID:; SRVR:BY2PR0201MB0822; X-Microsoft-Exchange-Diagnostics: 1; BY2PR0201MB0822; 4:N9E5XxRkwM+02o8ngALEsdjuj5TV4g9sM4zvC1lHFYVLd5mmObYEPCc4onQZveFokoI6ib1Xh6r9DTGfAw0El5uZq5eaPtCUS+aB9YSGtZY6J0en1q4pXKLGH9CR7NuDJqESwGNnIMqqdFpwAOg9jHmTXZblmrA0DUj69kkndY9JPEvX4V6bMsU+8HUD1zkpF4zgYB/src7371HEcr72F/GzA3786y2obCnJkXkvJlbacah1irGsn4u2unpBo0aaIz9nnNijyUg1cZDkjXuHJRN7nO6SEsTDXP6sNbKyBwnQ5XijunWcr8MqMNoDOA+QHihPGQcznNBIhGiILH85wX2U4URxE6Qmgn3tMWKqrvRx/1s87HkbTSx/lUzw3NqFJoCu92TuE0CBV342IUt2Rcaw2nOGkWdPk+Hxwbn8R58BWlyRCp1EsVmoI04TXD4U3EJestk3biObsz9uuLLVR6XBOwlcrWWIQ0S6doJnbpOH1TGcgFbptDOnfDhV0twYatnTeqoghUbfinVNRJornJXkSNJwVHr5N2t6XYoO7Do= X-Forefront-PRVS: 083691450C X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtCWTJQUjAyMDFNQjA4MjI7MjM6b256dGxiVVdIUnZ6S0w0cmsrTGZZTkVr?= =?utf-8?B?TXlkSlRLSFZTOVFmZzJka0NxdW5wb2kwalkyZkcraVFkdS8rR1VwRGtzL2F3?= =?utf-8?B?cmJlWEU3cmtCa3pnTDlLaVpKcllSRWErM2RXaGNpc3pDNzhJUmhtMVdGS1A5?= =?utf-8?B?UWtFa3AwRzNTK1NtaE5Gd2VWamtJbUZxdS8ycXVPdTF1azA0czFpYVdYb0J3?= =?utf-8?B?ekF5TW4vQVlueU5qR0VpUGNGVmM2MHV0K3A1Z2gzQ1c1eFVWT2dnNjZhcDZ0?= =?utf-8?B?Z1lmWjZkakY3bkx6OXRjTVNvU3Y3cnRnR1ZWTzVZUmlpYmFMVEh2dUNqeGIw?= =?utf-8?B?SS9wZlNENXdSd2IyaTFIMWVPVlk0cHoyckRza3pxSm9qNEJ1VVhvQ2xXSXlz?= =?utf-8?B?Zk1QVG03TGJUckFvS1hmTlMycHdLMjBCVE1KRHR4Q0pSSUZGNGZsdXFFZUJF?= =?utf-8?B?Y2dnWTNkMDZhSnhaZGdFdzhMS0JuTUFwdEdQN1Z1RTFNL2hPMktHMXVmb1RV?= =?utf-8?B?RVBueEQxTHdsM1RVR3BpUVVXb1AyMUh4dUdUSlYyUStZb2Z5ekRTRkg0c1pL?= =?utf-8?B?dVVJNk9HUmprOCtGeHpPWEZWN3ZUWWI1NXo2Q3BiemVZTjRwWmFWS2ZCcHhG?= =?utf-8?B?em1vbkdoV2pqaXFqTkNyZ3JkR3dMYjZSaEVSZFlOZEdnTE9IQXNXZlVHNkVm?= =?utf-8?B?Q1htZk53YkVkc3lZRXhNejAwSW1zKzJMZld2bzZEUUtzc1BFbmxZUzBMZW82?= =?utf-8?B?bEVoM2sxL0RzUGwrNklRWVFlc0NwNFhoTU9GaGNTZVdheVUyZytDZXp5RE1Q?= =?utf-8?B?RTN5OEx4bzREc2hPaHcyUnAydXZuWFNZY1UyQkVyUHhLdllhb1RzWVI2L1pS?= =?utf-8?B?RkdleklBRkpWLzNnV2FzSUNaRUtneUpPOGF6S3dOMzFtakIzKzNlVUtTejEy?= =?utf-8?B?ekZ3SHFsdVRSNXEyRFR4NE1LeEdRcDRuZjEzMjA2N2dKVVRtSm5lblZoblMw?= =?utf-8?B?YnZxTTVCV1pwb082UUFIZGhlbUhqNms3RDJYUVl1WlV6R1Z6QTBFQXBYMlBl?= =?utf-8?B?eHhQaCtsamFDaHpPbVdJdk5DcWZoektlNXdwOEdTK0hQM3RWVzcrRW5VTVds?= =?utf-8?B?OWhPTmI2cFEwUVFBWmpiUFh5ckNiWlN3WGZaNGtaa2V6YXFVNTV2enYvbjMw?= =?utf-8?B?TGNOR1AxQWIvR0R1RGxrV0E5QldGNWVGNnAxdldLeFdhOXNuc0J0ditYTGFX?= =?utf-8?B?WUNtMGtXWW9qa0IrZXFoY1BYb1JBSmRUVXNSNnYxcWJqaGtZdUdGMTRuVXJI?= =?utf-8?B?ZC9mYW0xY3FuQytMMTBsa2NucGFMNXRRVEw1RTZncElLNjU1MGd2ZHpJdlhC?= =?utf-8?B?bjZ4MndYL1hnWHpzdXB0a05Oem5ncjliY0pSeHJJYVJYeDRXQ1FSdHN5ZGVh?= =?utf-8?B?Q2pTSHFlYnp2ZE13VXdUdk9KdjQ1Q1hRV3FGUVJwalZQbFdERzdpQlBJNzNt?= =?utf-8?B?V1dLcHZnPT0=?= X-Microsoft-Exchange-Diagnostics: 1; BY2PR0201MB0822; 5:B+FyWQ06NT0JA5+J29PtzM2DB7Vt+Y7onASu3SW1lF1FN8Fw3LFPpH6sh7ASXK7c1niSmxiTAlT9nei+Hs/rM8UShCa5RbZuG4VukrWYD4J7/dHZ5IfXZKAAkkDyPoDEfwJaE2AAaCmkfVcefGVY/w==; 24:JjZl2yk1XCXHLKEseivFbUqynd1nUM8MBd7nGBqAq6fKSTdXWxhFPWBXz66iAqVKVNqUAzzW82ixg7M/cCJG+cRkccNM2cvGpTVbz1BmDVc=; 20:NlGNrXJ5Ut0PTsPi7PvilNc5yCGTcPVmKpFRHCbrZoABVdUROI7HBR07UqRhN+YLJPRVgJwS8FteHyP7bhLOiJIJl0OSDMdNxFLxVTx80ShoAXNmKVBAiJdYuOWKA1hUmy2XnrkB9eFUrrRo+SBs0NnlB8yTiDL4ny89Rwb0wZhWJeLbnsMhBJfpXRtc4nIBV+rngIHKHkjpb9GQhfcjH7phD4KFjUfSOQFlvWfRHpWVQQW6NZSQVYZh24IZYSqj SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: sandisk.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Jan 2016 23:11:44.4626 (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.174]; Helo=[milsmgep12.sandisk.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY2PR0201MB0822 Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org X-Spam-Status: No, score=-6.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 Since struct srpt_node_acl is identical to struct se_node_acl, remove the definition of the former structure. This patch does not change any functionality. Signed-off-by: Bart Van Assche Cc: Christoph Hellwig Cc: Sagi Grimberg Reviewed-by: Christoph Hellwig Reviewed-by: Alex Estrin --- drivers/infiniband/ulp/srpt/ib_srpt.c | 2 +- drivers/infiniband/ulp/srpt/ib_srpt.h | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/drivers/infiniband/ulp/srpt/ib_srpt.c b/drivers/infiniband/ulp/srpt/ib_srpt.c index f65ae60..fde32ed 100644 --- a/drivers/infiniband/ulp/srpt/ib_srpt.c +++ b/drivers/infiniband/ulp/srpt/ib_srpt.c @@ -3565,7 +3565,7 @@ static struct configfs_attribute *srpt_wwn_attrs[] = { static const struct target_core_fabric_ops srpt_template = { .module = THIS_MODULE, .name = "srpt", - .node_acl_size = sizeof(struct srpt_node_acl), + .node_acl_size = sizeof(struct se_node_acl), .get_fabric_name = srpt_get_fabric_name, .tpg_get_wwn = srpt_get_fabric_wwn, .tpg_get_tag = srpt_get_tag, diff --git a/drivers/infiniband/ulp/srpt/ib_srpt.h b/drivers/infiniband/ulp/srpt/ib_srpt.h index 09037f2..b0ede97 100644 --- a/drivers/infiniband/ulp/srpt/ib_srpt.h +++ b/drivers/infiniband/ulp/srpt/ib_srpt.h @@ -363,12 +363,4 @@ struct srpt_device { struct list_head list; }; -/** - * struct srpt_node_acl - Per-initiator ACL data (managed via configfs). - * @nacl: Target core node ACL information. - */ -struct srpt_node_acl { - struct se_node_acl nacl; -}; - #endif /* IB_SRPT_H */