mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 11:11:45 -04:00
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:
commit
972b2c7199
476 changed files with 2588 additions and 2879 deletions
|
|
@ -1223,7 +1223,7 @@ static ssize_t show_pwm(struct device *dev, struct device_attribute *attr,
|
|||
}
|
||||
|
||||
static struct attribute *dme1737_pwm_chmod_attr[];
|
||||
static void dme1737_chmod_file(struct device*, struct attribute*, mode_t);
|
||||
static void dme1737_chmod_file(struct device*, struct attribute*, umode_t);
|
||||
|
||||
static ssize_t set_pwm(struct device *dev, struct device_attribute *attr,
|
||||
const char *buf, size_t count)
|
||||
|
|
@ -1961,7 +1961,7 @@ static inline void dme1737_sio_outb(int sio_cip, int reg, int val)
|
|||
static int dme1737_i2c_get_features(int, struct dme1737_data*);
|
||||
|
||||
static void dme1737_chmod_file(struct device *dev,
|
||||
struct attribute *attr, mode_t mode)
|
||||
struct attribute *attr, umode_t mode)
|
||||
{
|
||||
if (sysfs_chmod_file(&dev->kobj, attr, mode)) {
|
||||
dev_warn(dev, "Failed to change permissions of %s.\n",
|
||||
|
|
@ -1971,7 +1971,7 @@ static void dme1737_chmod_file(struct device *dev,
|
|||
|
||||
static void dme1737_chmod_group(struct device *dev,
|
||||
const struct attribute_group *group,
|
||||
mode_t mode)
|
||||
umode_t mode)
|
||||
{
|
||||
struct attribute **attr;
|
||||
|
||||
|
|
|
|||
|
|
@ -413,7 +413,7 @@ static struct attribute *jc42_attributes[] = {
|
|||
NULL
|
||||
};
|
||||
|
||||
static mode_t jc42_attribute_mode(struct kobject *kobj,
|
||||
static umode_t jc42_attribute_mode(struct kobject *kobj,
|
||||
struct attribute *attr, int index)
|
||||
{
|
||||
struct device *dev = container_of(kobj, struct device, kobj);
|
||||
|
|
|
|||
|
|
@ -335,10 +335,10 @@ static struct attribute *max1668_attribute_unique[] = {
|
|||
NULL
|
||||
};
|
||||
|
||||
static mode_t max1668_attribute_mode(struct kobject *kobj,
|
||||
static umode_t max1668_attribute_mode(struct kobject *kobj,
|
||||
struct attribute *attr, int index)
|
||||
{
|
||||
int ret = S_IRUGO;
|
||||
umode_t ret = S_IRUGO;
|
||||
if (read_only)
|
||||
return ret;
|
||||
if (attr == &sensor_dev_attr_temp1_max.dev_attr.attr ||
|
||||
|
|
|
|||
|
|
@ -464,7 +464,7 @@ static SENSOR_DEVICE_ATTR(gpio1_alarm, S_IRUGO, get_alarm, NULL,
|
|||
static SENSOR_DEVICE_ATTR(gpio2_alarm, S_IRUGO, get_alarm, NULL,
|
||||
MAX6650_ALRM_GPIO2);
|
||||
|
||||
static mode_t max6650_attrs_visible(struct kobject *kobj, struct attribute *a,
|
||||
static umode_t max6650_attrs_visible(struct kobject *kobj, struct attribute *a,
|
||||
int n)
|
||||
{
|
||||
struct device *dev = container_of(kobj, struct device, kobj);
|
||||
|
|
|
|||
|
|
@ -157,7 +157,7 @@ static ssize_t show_fault(struct device *dev,
|
|||
return sprintf(buf, "0\n");
|
||||
}
|
||||
|
||||
static mode_t tmp421_is_visible(struct kobject *kobj, struct attribute *a,
|
||||
static umode_t tmp421_is_visible(struct kobject *kobj, struct attribute *a,
|
||||
int n)
|
||||
{
|
||||
struct device *dev = container_of(kobj, struct device, kobj);
|
||||
|
|
|
|||
Loading…
Reference in a new issue