diff options
| author |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-08-06 13:05:28 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-08-06 13:05:28 +0200 |
| commit | 96ba6c6e8922e89ca4908c650072d8f8d7b39cbc (patch) | |
| tree | 9694f2652f16e50bb95704dab5ae0f029afed5b8 /fs/sysfs | |
| parent | debugfs: Return error during {full/open}_proxy_open() on rmmod (diff) | |
| parent | sysfs: Rename struct bin_attribute member to f_mapping (diff) | |
| download | linux-dev-96ba6c6e8922e89ca4908c650072d8f8d7b39cbc.tar.xz linux-dev-96ba6c6e8922e89ca4908c650072d8f8d7b39cbc.zip | |
Merge tag 'sysfs_defferred_iomem_get_mapping-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core driver-core-next
sysfs: Allow deferred execution of iomem_get_mapping()
Tag for toerh trees/branches to pull from in order to have a stable base
to build off of for the "Allow deferred execution of
iomem_get_mapping()" set of sysfs changes
Link: https://lore.kernel.org/r/20210729233235.1508920-1-kw@linux.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* tag 'sysfs_defferred_iomem_get_mapping-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:
sysfs: Rename struct bin_attribute member to f_mapping
sysfs: Invoke iomem_get_mapping() from the sysfs open callback
Diffstat (limited to 'fs/sysfs')
| -rw-r--r-- | fs/sysfs/file.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/sysfs/file.c b/fs/sysfs/file.c index 9aefa7779b29..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; } |