diff options
| author | Tejun Heo <tj@kernel.org> | 2013-10-24 17:49:08 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-10-29 23:12:07 +0100 |
| commit | 672f76a81ad524359e761d7c863d24aec58e23c5 (patch) | |
| tree | 1d15b0abb7b0a7928536ecbad8263b17ca9272cb | |
| parent | sysfs: merge sysfs_elem_bin_attr into sysfs_elem_attr (diff) | |
| download | linux-672f76a81ad524359e761d7c863d24aec58e23c5.tar.xz linux-672f76a81ad524359e761d7c863d24aec58e23c5.zip | |
sysfs: honor bin_attr.attr.ignore_lockdep
ignore_lockdep is currently honored only for regular files. There's
no reason to ignore it for bin files. Update sysfs_ignore_lockdep()
so that bin_attr.attr.ignore_lockdep works too.
While this doesn't have any in-kernel user, this unifies the behaviors
between regular and bin files and will help later changes.
Signed-off-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | fs/sysfs/sysfs.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/sysfs/sysfs.h b/fs/sysfs/sysfs.h index c095d952f3a5..bdce8458af3b 100644 --- a/fs/sysfs/sysfs.h +++ b/fs/sysfs/sysfs.h @@ -114,7 +114,9 @@ do { \ /* Test for attributes that want to ignore lockdep for read-locking */ static inline bool sysfs_ignore_lockdep(struct sysfs_dirent *sd) { - return sysfs_type(sd) == SYSFS_KOBJ_ATTR && + int type = sysfs_type(sd); + + return (type == SYSFS_KOBJ_ATTR || type == SYSFS_KOBJ_BIN_ATTR) && sd->s_attr.attr->ignore_lockdep; } |