From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4BB5BC65BA7 for ; Fri, 5 Oct 2018 07:36:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 10820208E7 for ; Fri, 5 Oct 2018 07:36:40 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 10820208E7 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728379AbeJEOeG (ORCPT ); Fri, 5 Oct 2018 10:34:06 -0400 Received: from mga01.intel.com ([192.55.52.88]:18555 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727835AbeJEOeF (ORCPT ); Fri, 5 Oct 2018 10:34:05 -0400 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 05 Oct 2018 00:36:37 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.54,343,1534834800"; d="scan'208";a="96305553" Received: from jnikula-mobl3.fi.intel.com (HELO localhost) ([10.237.72.61]) by fmsmga001.fm.intel.com with ESMTP; 05 Oct 2018 00:36:36 -0700 From: Jani Nikula To: "Rafael J. Wysocki" Cc: Linux Kernel Mailing List , intel-gfx , Greg Kroah-Hartman , "Rafael J. Wysocki" Subject: Re: [PATCH 1/2] sysfs: constify sysfs create/remove files harder In-Reply-To: Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <20181004143750.30880-1-jani.nikula@intel.com> Date: Fri, 05 Oct 2018 10:36:29 +0300 Message-ID: <87lg7cq1z6.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, 05 Oct 2018, "Rafael J. Wysocki" wrote: > On Thu, Oct 4, 2018 at 4:38 PM Jani Nikula wrote: >> >> Let the passed in array be const (and thus placed in rodata) instead of >> a mutable array of const pointers. > > I'm not sure if the changes guarantee what you want. If I'm not > mistaken, they just mean that the function itself cannot modify either > the pointer passed to it, or the contents of the array pointed to by > that pointer. They don't imply the location of the array itself, > though. I mean, this change allows the caller to add the appropriate const qualifiers to the array definition, allowing the placement in rodata. Can't do that withouth the extra const in the function. > As for the changes: > > Reviewed-by: Rafael J. Wysocki Thanks for the review. BR, Jani. > >> Cc: Greg Kroah-Hartman >> Cc: "Rafael J. Wysocki" >> Signed-off-by: Jani Nikula >> --- >> fs/sysfs/file.c | 4 ++-- >> include/linux/sysfs.h | 8 ++++---- >> 2 files changed, 6 insertions(+), 6 deletions(-) >> >> diff --git a/fs/sysfs/file.c b/fs/sysfs/file.c >> index 0a7252aecfa5..bb71db63c99c 100644 >> --- a/fs/sysfs/file.c >> +++ b/fs/sysfs/file.c >> @@ -334,7 +334,7 @@ int sysfs_create_file_ns(struct kobject *kobj, const struct attribute *attr, >> } >> EXPORT_SYMBOL_GPL(sysfs_create_file_ns); >> >> -int sysfs_create_files(struct kobject *kobj, const struct attribute **ptr) >> +int sysfs_create_files(struct kobject *kobj, const struct attribute * const *ptr) >> { >> int err = 0; >> int i; >> @@ -493,7 +493,7 @@ bool sysfs_remove_file_self(struct kobject *kobj, const struct attribute *attr) >> return ret; >> } >> >> -void sysfs_remove_files(struct kobject *kobj, const struct attribute **ptr) >> +void sysfs_remove_files(struct kobject *kobj, const struct attribute * const *ptr) >> { >> int i; >> for (i = 0; ptr[i]; i++) >> diff --git a/include/linux/sysfs.h b/include/linux/sysfs.h >> index 987cefa337de..786816cf4aa5 100644 >> --- a/include/linux/sysfs.h >> +++ b/include/linux/sysfs.h >> @@ -234,7 +234,7 @@ int __must_check sysfs_create_file_ns(struct kobject *kobj, >> const struct attribute *attr, >> const void *ns); >> int __must_check sysfs_create_files(struct kobject *kobj, >> - const struct attribute **attr); >> + const struct attribute * const *attr); >> int __must_check sysfs_chmod_file(struct kobject *kobj, >> const struct attribute *attr, umode_t mode); >> struct kernfs_node *sysfs_break_active_protection(struct kobject *kobj, >> @@ -243,7 +243,7 @@ void sysfs_unbreak_active_protection(struct kernfs_node *kn); >> void sysfs_remove_file_ns(struct kobject *kobj, const struct attribute *attr, >> const void *ns); >> bool sysfs_remove_file_self(struct kobject *kobj, const struct attribute *attr); >> -void sysfs_remove_files(struct kobject *kobj, const struct attribute **attr); >> +void sysfs_remove_files(struct kobject *kobj, const struct attribute * const *attr); >> >> int __must_check sysfs_create_bin_file(struct kobject *kobj, >> const struct bin_attribute *attr); >> @@ -342,7 +342,7 @@ static inline int sysfs_create_file_ns(struct kobject *kobj, >> } >> >> static inline int sysfs_create_files(struct kobject *kobj, >> - const struct attribute **attr) >> + const struct attribute * const *attr) >> { >> return 0; >> } >> @@ -377,7 +377,7 @@ static inline bool sysfs_remove_file_self(struct kobject *kobj, >> } >> >> static inline void sysfs_remove_files(struct kobject *kobj, >> - const struct attribute **attr) >> + const struct attribute * const *attr) >> { >> } >> >> -- >> 2.11.0 >> -- Jani Nikula, Intel Open Source Graphics Center From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jani Nikula Subject: Re: [PATCH 1/2] sysfs: constify sysfs create/remove files harder Date: Fri, 05 Oct 2018 10:36:29 +0300 Message-ID: <87lg7cq1z6.fsf@intel.com> References: <20181004143750.30880-1-jani.nikula@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTPS id 241FA6E708 for ; Fri, 5 Oct 2018 07:36:38 +0000 (UTC) In-Reply-To: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Cc: Greg Kroah-Hartman , intel-gfx , Linux Kernel Mailing List , "Rafael J. Wysocki" List-Id: intel-gfx@lists.freedesktop.org T24gRnJpLCAwNSBPY3QgMjAxOCwgIlJhZmFlbCBKLiBXeXNvY2tpIiA8cmFmYWVsQGtlcm5lbC5v cmc+IHdyb3RlOgo+IE9uIFRodSwgT2N0IDQsIDIwMTggYXQgNDozOCBQTSBKYW5pIE5pa3VsYSA8 amFuaS5uaWt1bGFAaW50ZWwuY29tPiB3cm90ZToKPj4KPj4gTGV0IHRoZSBwYXNzZWQgaW4gYXJy YXkgYmUgY29uc3QgKGFuZCB0aHVzIHBsYWNlZCBpbiByb2RhdGEpIGluc3RlYWQgb2YKPj4gYSBt dXRhYmxlIGFycmF5IG9mIGNvbnN0IHBvaW50ZXJzLgo+Cj4gSSdtIG5vdCBzdXJlIGlmIHRoZSBj aGFuZ2VzIGd1YXJhbnRlZSB3aGF0IHlvdSB3YW50LiAgSWYgSSdtIG5vdAo+IG1pc3Rha2VuLCB0 aGV5IGp1c3QgbWVhbiB0aGF0IHRoZSBmdW5jdGlvbiBpdHNlbGYgY2Fubm90IG1vZGlmeSBlaXRo ZXIKPiB0aGUgcG9pbnRlciBwYXNzZWQgdG8gaXQsIG9yIHRoZSBjb250ZW50cyBvZiB0aGUgYXJy YXkgcG9pbnRlZCB0byBieQo+IHRoYXQgcG9pbnRlci4gIFRoZXkgZG9uJ3QgaW1wbHkgdGhlIGxv Y2F0aW9uIG9mIHRoZSBhcnJheSBpdHNlbGYsCj4gdGhvdWdoLgoKSSBtZWFuLCB0aGlzIGNoYW5n ZSBhbGxvd3MgdGhlIGNhbGxlciB0byBhZGQgdGhlIGFwcHJvcHJpYXRlIGNvbnN0CnF1YWxpZmll cnMgdG8gdGhlIGFycmF5IGRlZmluaXRpb24sIGFsbG93aW5nIHRoZSBwbGFjZW1lbnQgaW4Kcm9k YXRhLiBDYW4ndCBkbyB0aGF0IHdpdGhvdXRoIHRoZSBleHRyYSBjb25zdCBpbiB0aGUgZnVuY3Rp b24uCgo+IEFzIGZvciB0aGUgY2hhbmdlczoKPgo+IFJldmlld2VkLWJ5OiBSYWZhZWwgSi4gV3lz b2NraSA8cmFmYWVsLmoud3lzb2NraUBpbnRlbC5jb20+CgpUaGFua3MgZm9yIHRoZSByZXZpZXcu CgpCUiwKSmFuaS4KCgo+Cj4+IENjOiBHcmVnIEtyb2FoLUhhcnRtYW4gPGdyZWdraEBsaW51eGZv dW5kYXRpb24ub3JnPgo+PiBDYzogIlJhZmFlbCBKLiBXeXNvY2tpIiA8cmFmYWVsQGtlcm5lbC5v cmc+Cj4+IFNpZ25lZC1vZmYtYnk6IEphbmkgTmlrdWxhIDxqYW5pLm5pa3VsYUBpbnRlbC5jb20+ Cj4+IC0tLQo+PiAgZnMvc3lzZnMvZmlsZS5jICAgICAgIHwgNCArKy0tCj4+ICBpbmNsdWRlL2xp bnV4L3N5c2ZzLmggfCA4ICsrKystLS0tCj4+ICAyIGZpbGVzIGNoYW5nZWQsIDYgaW5zZXJ0aW9u cygrKSwgNiBkZWxldGlvbnMoLSkKPj4KPj4gZGlmZiAtLWdpdCBhL2ZzL3N5c2ZzL2ZpbGUuYyBi L2ZzL3N5c2ZzL2ZpbGUuYwo+PiBpbmRleCAwYTcyNTJhZWNmYTUuLmJiNzFkYjYzYzk5YyAxMDA2 NDQKPj4gLS0tIGEvZnMvc3lzZnMvZmlsZS5jCj4+ICsrKyBiL2ZzL3N5c2ZzL2ZpbGUuYwo+PiBA QCAtMzM0LDcgKzMzNCw3IEBAIGludCBzeXNmc19jcmVhdGVfZmlsZV9ucyhzdHJ1Y3Qga29iamVj dCAqa29iaiwgY29uc3Qgc3RydWN0IGF0dHJpYnV0ZSAqYXR0ciwKPj4gIH0KPj4gIEVYUE9SVF9T WU1CT0xfR1BMKHN5c2ZzX2NyZWF0ZV9maWxlX25zKTsKPj4KPj4gLWludCBzeXNmc19jcmVhdGVf ZmlsZXMoc3RydWN0IGtvYmplY3QgKmtvYmosIGNvbnN0IHN0cnVjdCBhdHRyaWJ1dGUgKipwdHIp Cj4+ICtpbnQgc3lzZnNfY3JlYXRlX2ZpbGVzKHN0cnVjdCBrb2JqZWN0ICprb2JqLCBjb25zdCBz dHJ1Y3QgYXR0cmlidXRlICogY29uc3QgKnB0cikKPj4gIHsKPj4gICAgICAgICBpbnQgZXJyID0g MDsKPj4gICAgICAgICBpbnQgaTsKPj4gQEAgLTQ5Myw3ICs0OTMsNyBAQCBib29sIHN5c2ZzX3Jl bW92ZV9maWxlX3NlbGYoc3RydWN0IGtvYmplY3QgKmtvYmosIGNvbnN0IHN0cnVjdCBhdHRyaWJ1 dGUgKmF0dHIpCj4+ICAgICAgICAgcmV0dXJuIHJldDsKPj4gIH0KPj4KPj4gLXZvaWQgc3lzZnNf cmVtb3ZlX2ZpbGVzKHN0cnVjdCBrb2JqZWN0ICprb2JqLCBjb25zdCBzdHJ1Y3QgYXR0cmlidXRl ICoqcHRyKQo+PiArdm9pZCBzeXNmc19yZW1vdmVfZmlsZXMoc3RydWN0IGtvYmplY3QgKmtvYmos IGNvbnN0IHN0cnVjdCBhdHRyaWJ1dGUgKiBjb25zdCAqcHRyKQo+PiAgewo+PiAgICAgICAgIGlu dCBpOwo+PiAgICAgICAgIGZvciAoaSA9IDA7IHB0cltpXTsgaSsrKQo+PiBkaWZmIC0tZ2l0IGEv aW5jbHVkZS9saW51eC9zeXNmcy5oIGIvaW5jbHVkZS9saW51eC9zeXNmcy5oCj4+IGluZGV4IDk4 N2NlZmEzMzdkZS4uNzg2ODE2Y2Y0YWE1IDEwMDY0NAo+PiAtLS0gYS9pbmNsdWRlL2xpbnV4L3N5 c2ZzLmgKPj4gKysrIGIvaW5jbHVkZS9saW51eC9zeXNmcy5oCj4+IEBAIC0yMzQsNyArMjM0LDcg QEAgaW50IF9fbXVzdF9jaGVjayBzeXNmc19jcmVhdGVfZmlsZV9ucyhzdHJ1Y3Qga29iamVjdCAq a29iaiwKPj4gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBzdHJ1 Y3QgYXR0cmlidXRlICphdHRyLAo+PiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIGNvbnN0IHZvaWQgKm5zKTsKPj4gIGludCBfX211c3RfY2hlY2sgc3lzZnNfY3JlYXRlX2Zp bGVzKHN0cnVjdCBrb2JqZWN0ICprb2JqLAo+PiAtICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIGNvbnN0IHN0cnVjdCBhdHRyaWJ1dGUgKiphdHRyKTsKPj4gKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBjb25zdCBzdHJ1Y3QgYXR0cmlidXRlICogY29uc3QgKmF0dHIp Owo+PiAgaW50IF9fbXVzdF9jaGVjayBzeXNmc19jaG1vZF9maWxlKHN0cnVjdCBrb2JqZWN0ICpr b2JqLAo+PiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29uc3Qgc3RydWN0IGF0 dHJpYnV0ZSAqYXR0ciwgdW1vZGVfdCBtb2RlKTsKPj4gIHN0cnVjdCBrZXJuZnNfbm9kZSAqc3lz ZnNfYnJlYWtfYWN0aXZlX3Byb3RlY3Rpb24oc3RydWN0IGtvYmplY3QgKmtvYmosCj4+IEBAIC0y NDMsNyArMjQzLDcgQEAgdm9pZCBzeXNmc191bmJyZWFrX2FjdGl2ZV9wcm90ZWN0aW9uKHN0cnVj dCBrZXJuZnNfbm9kZSAqa24pOwo+PiAgdm9pZCBzeXNmc19yZW1vdmVfZmlsZV9ucyhzdHJ1Y3Qg a29iamVjdCAqa29iaiwgY29uc3Qgc3RydWN0IGF0dHJpYnV0ZSAqYXR0ciwKPj4gICAgICAgICAg ICAgICAgICAgICAgICAgICBjb25zdCB2b2lkICpucyk7Cj4+ICBib29sIHN5c2ZzX3JlbW92ZV9m aWxlX3NlbGYoc3RydWN0IGtvYmplY3QgKmtvYmosIGNvbnN0IHN0cnVjdCBhdHRyaWJ1dGUgKmF0 dHIpOwo+PiAtdm9pZCBzeXNmc19yZW1vdmVfZmlsZXMoc3RydWN0IGtvYmplY3QgKmtvYmosIGNv bnN0IHN0cnVjdCBhdHRyaWJ1dGUgKiphdHRyKTsKPj4gK3ZvaWQgc3lzZnNfcmVtb3ZlX2ZpbGVz KHN0cnVjdCBrb2JqZWN0ICprb2JqLCBjb25zdCBzdHJ1Y3QgYXR0cmlidXRlICogY29uc3QgKmF0 dHIpOwo+Pgo+PiAgaW50IF9fbXVzdF9jaGVjayBzeXNmc19jcmVhdGVfYmluX2ZpbGUoc3RydWN0 IGtvYmplY3QgKmtvYmosCj4+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IGNvbnN0IHN0cnVjdCBiaW5fYXR0cmlidXRlICphdHRyKTsKPj4gQEAgLTM0Miw3ICszNDIsNyBA QCBzdGF0aWMgaW5saW5lIGludCBzeXNmc19jcmVhdGVfZmlsZV9ucyhzdHJ1Y3Qga29iamVjdCAq a29iaiwKPj4gIH0KPj4KPj4gIHN0YXRpYyBpbmxpbmUgaW50IHN5c2ZzX2NyZWF0ZV9maWxlcyhz dHJ1Y3Qga29iamVjdCAqa29iaiwKPj4gLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgY29uc3Qgc3RydWN0IGF0dHJpYnV0ZSAqKmF0dHIpCj4+ICsgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIGNvbnN0IHN0cnVjdCBhdHRyaWJ1dGUgKiBjb25zdCAqYXR0cikKPj4g IHsKPj4gICAgICAgICByZXR1cm4gMDsKPj4gIH0KPj4gQEAgLTM3Nyw3ICszNzcsNyBAQCBzdGF0 aWMgaW5saW5lIGJvb2wgc3lzZnNfcmVtb3ZlX2ZpbGVfc2VsZihzdHJ1Y3Qga29iamVjdCAqa29i aiwKPj4gIH0KPj4KPj4gIHN0YXRpYyBpbmxpbmUgdm9pZCBzeXNmc19yZW1vdmVfZmlsZXMoc3Ry dWN0IGtvYmplY3QgKmtvYmosCj4+IC0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBjb25zdCBzdHJ1Y3QgYXR0cmlidXRlICoqYXR0cikKPj4gKyAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIGNvbnN0IHN0cnVjdCBhdHRyaWJ1dGUgKiBjb25zdCAqYXR0cikKPj4g IHsKPj4gIH0KPj4KPj4gLS0KPj4gMi4xMS4wCj4+CgotLSAKSmFuaSBOaWt1bGEsIEludGVsIE9w ZW4gU291cmNlIEdyYXBoaWNzIENlbnRlcgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5m cmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0 aW5mby9pbnRlbC1nZngK