Merge branch 'for-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
* 'for-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (165 commits) reiserfs: Properly display mount options in /proc/mounts vfs: prevent remount read-only if pending removes vfs: count unlinked inodes vfs: protect remounting superblock read-only vfs: keep list of mounts for each superblock vfs: switch ->show_options() to struct dentry * vfs: switch ->show_path() to struct dentry * vfs: switch ->show_devname() to struct dentry * vfs: switch ->show_stats to struct dentry * switch security_path_chmod() to struct path * vfs: prefer ->dentry->d_sb to ->mnt->mnt_sb vfs: trim includes a bit switch mnt_namespace ->root to struct mount vfs: take /proc/*/mounts and friends to fs/proc_namespace.c vfs: opencode mntget() mnt_set_mountpoint() vfs: spread struct mount - remaining argument of next_mnt() vfs: move fsnotify junk to struct mount vfs: move mnt_devname vfs: move mnt_list to struct mount vfs: switch pnode.h macros to struct mount * ...
This commit is contained in:
@@ -612,10 +612,10 @@ static struct attribute *ad7877_attributes[] = {
|
||||
NULL
|
||||
};
|
||||
|
||||
static mode_t ad7877_attr_is_visible(struct kobject *kobj,
|
||||
static umode_t ad7877_attr_is_visible(struct kobject *kobj,
|
||||
struct attribute *attr, int n)
|
||||
{
|
||||
mode_t mode = attr->mode;
|
||||
umode_t mode = attr->mode;
|
||||
|
||||
if (attr == &dev_attr_aux3.attr) {
|
||||
if (gpio3)
|
||||
|
@@ -450,13 +450,13 @@ static struct attribute *tsc2005_attrs[] = {
|
||||
NULL
|
||||
};
|
||||
|
||||
static mode_t tsc2005_attr_is_visible(struct kobject *kobj,
|
||||
static umode_t tsc2005_attr_is_visible(struct kobject *kobj,
|
||||
struct attribute *attr, int n)
|
||||
{
|
||||
struct device *dev = container_of(kobj, struct device, kobj);
|
||||
struct spi_device *spi = to_spi_device(dev);
|
||||
struct tsc2005 *ts = spi_get_drvdata(spi);
|
||||
mode_t mode = attr->mode;
|
||||
umode_t mode = attr->mode;
|
||||
|
||||
if (attr == &dev_attr_selftest.attr) {
|
||||
if (!ts->set_reset)
|
||||
|
Reference in New Issue
Block a user