From: Bjorn Helgaas <helgaas@kernel.org>
To: "Krzysztof Wilczyński" <kw@linux.com>
Cc: "Bjorn Helgaas" <bhelgaas@google.com>,
"Dan Williams" <dan.j.williams@intel.com>,
"Greg Kroah-Hartman" <gregkh@linuxfoundation.org>,
"Daniel Vetter" <daniel.vetter@ffwll.ch>,
"Kees Cook" <keescook@chromium.org>,
"Pali Rohár" <pali@kernel.org>,
"Oliver O'Halloran" <oohall@gmail.com>,
linux-pci@vger.kernel.org
Subject: Re: [PATCH v3 2/2] sysfs: Rename struct bin_attribute member to f_mapping
Date: Fri, 30 Jul 2021 14:45:23 -0500 [thread overview]
Message-ID: <20210730194523.GA1091516@bjorn-Precision-5520> (raw)
In-Reply-To: <20210729233235.1508920-3-kw@linux.com>
On Thu, Jul 29, 2021 at 11:32:35PM +0000, Krzysztof Wilczyński wrote:
> There are two users of iomem_get_mapping(), the struct file and struct
> bin_attribute. The former has a member called "f_mapping" and the
> latter has a member called "mapping", and both are poniters to struct
> address_space.
Nit: s/poniters/pointers/
> Rename struct bin_attribute member to "f_mapping" to keep both meaning
> and the usage consistent with other users of iomem_get_mapping().
>
> Signed-off-by: Krzysztof Wilczyński <kw@linux.com>
Acked-by: Bjorn Helgaas <bhelgaas@google.com>
> ---
> drivers/pci/pci-sysfs.c | 6 +++---
> fs/sysfs/file.c | 4 ++--
> include/linux/sysfs.h | 2 +-
> 3 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c
> index 76e5545d0e73..f65382915f01 100644
> --- a/drivers/pci/pci-sysfs.c
> +++ b/drivers/pci/pci-sysfs.c
> @@ -965,7 +965,7 @@ void pci_create_legacy_files(struct pci_bus *b)
> b->legacy_io->read = pci_read_legacy_io;
> b->legacy_io->write = pci_write_legacy_io;
> b->legacy_io->mmap = pci_mmap_legacy_io;
> - b->legacy_io->mapping = iomem_get_mapping;
> + b->legacy_io->f_mapping = iomem_get_mapping;
> pci_adjust_legacy_attr(b, pci_mmap_io);
> error = device_create_bin_file(&b->dev, b->legacy_io);
> if (error)
> @@ -978,7 +978,7 @@ void pci_create_legacy_files(struct pci_bus *b)
> b->legacy_mem->size = 1024*1024;
> b->legacy_mem->attr.mode = 0600;
> b->legacy_mem->mmap = pci_mmap_legacy_mem;
> - b->legacy_io->mapping = iomem_get_mapping;
> + b->legacy_io->f_mapping = iomem_get_mapping;
> pci_adjust_legacy_attr(b, pci_mmap_mem);
> error = device_create_bin_file(&b->dev, b->legacy_mem);
> if (error)
> @@ -1195,7 +1195,7 @@ static int pci_create_attr(struct pci_dev *pdev, int num, int write_combine)
> }
> }
> if (res_attr->mmap)
> - res_attr->mapping = iomem_get_mapping;
> + res_attr->f_mapping = iomem_get_mapping;
> res_attr->attr.name = res_attr_name;
> res_attr->attr.mode = 0600;
> res_attr->size = pci_resource_len(pdev, num);
> diff --git a/fs/sysfs/file.c b/fs/sysfs/file.c
> index a3ee4c32a264..d019d6ac6ad0 100644
> --- a/fs/sysfs/file.c
> +++ b/fs/sysfs/file.c
> @@ -174,8 +174,8 @@ static int sysfs_kf_bin_open(struct kernfs_open_file *of)
> {
> struct bin_attribute *battr = of->kn->priv;
>
> - if (battr->mapping)
> - of->file->f_mapping = battr->mapping();
> + if (battr->f_mapping)
> + of->file->f_mapping = battr->f_mapping();
>
> return 0;
> }
> diff --git a/include/linux/sysfs.h b/include/linux/sysfs.h
> index d5bcc897583c..e3f1e8ac1f85 100644
> --- a/include/linux/sysfs.h
> +++ b/include/linux/sysfs.h
> @@ -176,7 +176,7 @@ struct bin_attribute {
> struct attribute attr;
> size_t size;
> void *private;
> - struct address_space *(*mapping)(void);
> + struct address_space *(*f_mapping)(void);
> ssize_t (*read)(struct file *, struct kobject *, struct bin_attribute *,
> char *, loff_t, size_t);
> ssize_t (*write)(struct file *, struct kobject *, struct bin_attribute *,
> --
> 2.32.0
>
next prev parent reply other threads:[~2021-07-30 19:45 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-29 23:32 [PATCH v3 0/2] Allow deferred execution of iomem_get_mapping() Krzysztof Wilczyński
2021-07-29 23:32 ` [PATCH v3 1/2] sysfs: Invoke iomem_get_mapping() from the sysfs open callback Krzysztof Wilczyński
2021-07-30 19:44 ` Bjorn Helgaas
2021-07-29 23:32 ` [PATCH v3 2/2] sysfs: Rename struct bin_attribute member to f_mapping Krzysztof Wilczyński
2021-07-30 19:45 ` Bjorn Helgaas [this message]
2021-07-30 5:06 ` [PATCH v3 0/2] Allow deferred execution of iomem_get_mapping() Greg Kroah-Hartman
2021-07-30 19:50 ` Bjorn Helgaas
2021-08-05 12:43 ` Greg Kroah-Hartman
2021-08-06 11:05 ` Greg Kroah-Hartman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210730194523.GA1091516@bjorn-Precision-5520 \
--to=helgaas@kernel.org \
--cc=bhelgaas@google.com \
--cc=dan.j.williams@intel.com \
--cc=daniel.vetter@ffwll.ch \
--cc=gregkh@linuxfoundation.org \
--cc=keescook@chromium.org \
--cc=kw@linux.com \
--cc=linux-pci@vger.kernel.org \
--cc=oohall@gmail.com \
--cc=pali@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.