mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 03:01:39 -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
|
|
@ -733,7 +733,7 @@ void beiscsi_ep_disconnect(struct iscsi_endpoint *ep)
|
|||
iscsi_destroy_endpoint(beiscsi_ep->openiscsi_ep);
|
||||
}
|
||||
|
||||
mode_t be2iscsi_attr_is_visible(int param_type, int param)
|
||||
umode_t be2iscsi_attr_is_visible(int param_type, int param)
|
||||
{
|
||||
switch (param_type) {
|
||||
case ISCSI_HOST_PARAM:
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@
|
|||
#define BE2_IPV4 0x1
|
||||
#define BE2_IPV6 0x10
|
||||
|
||||
mode_t be2iscsi_attr_is_visible(int param_type, int param);
|
||||
umode_t be2iscsi_attr_is_visible(int param_type, int param);
|
||||
|
||||
void beiscsi_offload_connection(struct beiscsi_conn *beiscsi_conn,
|
||||
struct beiscsi_offload_params *params);
|
||||
|
|
|
|||
|
|
@ -325,9 +325,9 @@ static ssize_t beiscsi_show_boot_eth_info(void *data, int type, char *buf)
|
|||
}
|
||||
|
||||
|
||||
static mode_t beiscsi_tgt_get_attr_visibility(void *data, int type)
|
||||
static umode_t beiscsi_tgt_get_attr_visibility(void *data, int type)
|
||||
{
|
||||
int rc;
|
||||
umode_t rc;
|
||||
|
||||
switch (type) {
|
||||
case ISCSI_BOOT_TGT_NAME:
|
||||
|
|
@ -348,9 +348,9 @@ static mode_t beiscsi_tgt_get_attr_visibility(void *data, int type)
|
|||
return rc;
|
||||
}
|
||||
|
||||
static mode_t beiscsi_ini_get_attr_visibility(void *data, int type)
|
||||
static umode_t beiscsi_ini_get_attr_visibility(void *data, int type)
|
||||
{
|
||||
int rc;
|
||||
umode_t rc;
|
||||
|
||||
switch (type) {
|
||||
case ISCSI_BOOT_INI_INITIATOR_NAME:
|
||||
|
|
@ -364,9 +364,9 @@ static mode_t beiscsi_ini_get_attr_visibility(void *data, int type)
|
|||
}
|
||||
|
||||
|
||||
static mode_t beiscsi_eth_get_attr_visibility(void *data, int type)
|
||||
static umode_t beiscsi_eth_get_attr_visibility(void *data, int type)
|
||||
{
|
||||
int rc;
|
||||
umode_t rc;
|
||||
|
||||
switch (type) {
|
||||
case ISCSI_BOOT_ETH_FLAGS:
|
||||
|
|
|
|||
|
|
@ -472,7 +472,7 @@ static const struct file_operations bfad_debugfs_op_regwr = {
|
|||
|
||||
struct bfad_debugfs_entry {
|
||||
const char *name;
|
||||
mode_t mode;
|
||||
umode_t mode;
|
||||
const struct file_operations *fops;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -2177,7 +2177,7 @@ static int bnx2i_nl_set_path(struct Scsi_Host *shost, struct iscsi_path *params)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static mode_t bnx2i_attr_is_visible(int param_type, int param)
|
||||
static umode_t bnx2i_attr_is_visible(int param_type, int param)
|
||||
{
|
||||
switch (param_type) {
|
||||
case ISCSI_HOST_PARAM:
|
||||
|
|
|
|||
|
|
@ -2575,7 +2575,7 @@ void cxgbi_iscsi_cleanup(struct iscsi_transport *itp,
|
|||
}
|
||||
EXPORT_SYMBOL_GPL(cxgbi_iscsi_cleanup);
|
||||
|
||||
mode_t cxgbi_attr_is_visible(int param_type, int param)
|
||||
umode_t cxgbi_attr_is_visible(int param_type, int param)
|
||||
{
|
||||
switch (param_type) {
|
||||
case ISCSI_HOST_PARAM:
|
||||
|
|
|
|||
|
|
@ -709,7 +709,7 @@ int cxgbi_conn_xmit_pdu(struct iscsi_task *);
|
|||
|
||||
void cxgbi_cleanup_task(struct iscsi_task *task);
|
||||
|
||||
mode_t cxgbi_attr_is_visible(int param_type, int param);
|
||||
umode_t cxgbi_attr_is_visible(int param_type, int param);
|
||||
void cxgbi_get_conn_stats(struct iscsi_cls_conn *, struct iscsi_stats *);
|
||||
int cxgbi_set_conn_param(struct iscsi_cls_conn *,
|
||||
enum iscsi_param, char *, int);
|
||||
|
|
|
|||
|
|
@ -112,7 +112,7 @@ static struct attribute *target_attrs[] = {
|
|||
NULL
|
||||
};
|
||||
|
||||
static mode_t iscsi_boot_tgt_attr_is_visible(struct kobject *kobj,
|
||||
static umode_t iscsi_boot_tgt_attr_is_visible(struct kobject *kobj,
|
||||
struct attribute *attr, int i)
|
||||
{
|
||||
struct iscsi_boot_kobj *boot_kobj =
|
||||
|
|
@ -193,7 +193,7 @@ static struct attribute *ethernet_attrs[] = {
|
|||
NULL
|
||||
};
|
||||
|
||||
static mode_t iscsi_boot_eth_attr_is_visible(struct kobject *kobj,
|
||||
static umode_t iscsi_boot_eth_attr_is_visible(struct kobject *kobj,
|
||||
struct attribute *attr, int i)
|
||||
{
|
||||
struct iscsi_boot_kobj *boot_kobj =
|
||||
|
|
@ -265,7 +265,7 @@ static struct attribute *initiator_attrs[] = {
|
|||
NULL
|
||||
};
|
||||
|
||||
static mode_t iscsi_boot_ini_attr_is_visible(struct kobject *kobj,
|
||||
static umode_t iscsi_boot_ini_attr_is_visible(struct kobject *kobj,
|
||||
struct attribute *attr, int i)
|
||||
{
|
||||
struct iscsi_boot_kobj *boot_kobj =
|
||||
|
|
@ -306,7 +306,7 @@ iscsi_boot_create_kobj(struct iscsi_boot_kset *boot_kset,
|
|||
struct attribute_group *attr_group,
|
||||
const char *name, int index, void *data,
|
||||
ssize_t (*show) (void *data, int type, char *buf),
|
||||
mode_t (*is_visible) (void *data, int type),
|
||||
umode_t (*is_visible) (void *data, int type),
|
||||
void (*release) (void *data))
|
||||
{
|
||||
struct iscsi_boot_kobj *boot_kobj;
|
||||
|
|
@ -369,7 +369,7 @@ struct iscsi_boot_kobj *
|
|||
iscsi_boot_create_target(struct iscsi_boot_kset *boot_kset, int index,
|
||||
void *data,
|
||||
ssize_t (*show) (void *data, int type, char *buf),
|
||||
mode_t (*is_visible) (void *data, int type),
|
||||
umode_t (*is_visible) (void *data, int type),
|
||||
void (*release) (void *data))
|
||||
{
|
||||
return iscsi_boot_create_kobj(boot_kset, &iscsi_boot_target_attr_group,
|
||||
|
|
@ -394,7 +394,7 @@ struct iscsi_boot_kobj *
|
|||
iscsi_boot_create_initiator(struct iscsi_boot_kset *boot_kset, int index,
|
||||
void *data,
|
||||
ssize_t (*show) (void *data, int type, char *buf),
|
||||
mode_t (*is_visible) (void *data, int type),
|
||||
umode_t (*is_visible) (void *data, int type),
|
||||
void (*release) (void *data))
|
||||
{
|
||||
return iscsi_boot_create_kobj(boot_kset,
|
||||
|
|
@ -420,7 +420,7 @@ struct iscsi_boot_kobj *
|
|||
iscsi_boot_create_ethernet(struct iscsi_boot_kset *boot_kset, int index,
|
||||
void *data,
|
||||
ssize_t (*show) (void *data, int type, char *buf),
|
||||
mode_t (*is_visible) (void *data, int type),
|
||||
umode_t (*is_visible) (void *data, int type),
|
||||
void (*release) (void *data))
|
||||
{
|
||||
return iscsi_boot_create_kobj(boot_kset,
|
||||
|
|
|
|||
|
|
@ -873,7 +873,7 @@ static void iscsi_sw_tcp_session_destroy(struct iscsi_cls_session *cls_session)
|
|||
iscsi_host_free(shost);
|
||||
}
|
||||
|
||||
static mode_t iscsi_sw_tcp_attr_is_visible(int param_type, int param)
|
||||
static umode_t iscsi_sw_tcp_attr_is_visible(int param_type, int param)
|
||||
{
|
||||
switch (param_type) {
|
||||
case ISCSI_HOST_PARAM:
|
||||
|
|
|
|||
|
|
@ -128,7 +128,7 @@ static int qla4xxx_eh_host_reset(struct scsi_cmnd *cmd);
|
|||
static int qla4xxx_slave_alloc(struct scsi_device *device);
|
||||
static int qla4xxx_slave_configure(struct scsi_device *device);
|
||||
static void qla4xxx_slave_destroy(struct scsi_device *sdev);
|
||||
static mode_t ql4_attr_is_visible(int param_type, int param);
|
||||
static umode_t ql4_attr_is_visible(int param_type, int param);
|
||||
static int qla4xxx_host_reset(struct Scsi_Host *shost, int reset_type);
|
||||
|
||||
static struct qla4_8xxx_legacy_intr_set legacy_intr[] =
|
||||
|
|
@ -197,7 +197,7 @@ static struct iscsi_transport qla4xxx_iscsi_transport = {
|
|||
|
||||
static struct scsi_transport_template *qla4xxx_scsi_transport;
|
||||
|
||||
static mode_t ql4_attr_is_visible(int param_type, int param)
|
||||
static umode_t ql4_attr_is_visible(int param_type, int param)
|
||||
{
|
||||
switch (param_type) {
|
||||
case ISCSI_HOST_PARAM:
|
||||
|
|
@ -3039,7 +3039,7 @@ static ssize_t qla4xxx_show_boot_eth_info(void *data, int type, char *buf)
|
|||
return rc;
|
||||
}
|
||||
|
||||
static mode_t qla4xxx_eth_get_attr_visibility(void *data, int type)
|
||||
static umode_t qla4xxx_eth_get_attr_visibility(void *data, int type)
|
||||
{
|
||||
int rc;
|
||||
|
||||
|
|
@ -3073,7 +3073,7 @@ static ssize_t qla4xxx_show_boot_ini_info(void *data, int type, char *buf)
|
|||
return rc;
|
||||
}
|
||||
|
||||
static mode_t qla4xxx_ini_get_attr_visibility(void *data, int type)
|
||||
static umode_t qla4xxx_ini_get_attr_visibility(void *data, int type)
|
||||
{
|
||||
int rc;
|
||||
|
||||
|
|
@ -3160,7 +3160,7 @@ static ssize_t qla4xxx_show_boot_tgt_sec_info(void *data, int type, char *buf)
|
|||
return qla4xxx_show_boot_tgt_info(boot_sess, type, buf);
|
||||
}
|
||||
|
||||
static mode_t qla4xxx_tgt_get_attr_visibility(void *data, int type)
|
||||
static umode_t qla4xxx_tgt_get_attr_visibility(void *data, int type)
|
||||
{
|
||||
int rc;
|
||||
|
||||
|
|
|
|||
|
|
@ -328,7 +328,7 @@ iscsi_iface_net_attr(iface, vlan_enabled, ISCSI_NET_PARAM_VLAN_ENABLED);
|
|||
iscsi_iface_net_attr(iface, mtu, ISCSI_NET_PARAM_MTU);
|
||||
iscsi_iface_net_attr(iface, port, ISCSI_NET_PARAM_PORT);
|
||||
|
||||
static mode_t iscsi_iface_attr_is_visible(struct kobject *kobj,
|
||||
static umode_t iscsi_iface_attr_is_visible(struct kobject *kobj,
|
||||
struct attribute *attr, int i)
|
||||
{
|
||||
struct device *dev = container_of(kobj, struct device, kobj);
|
||||
|
|
@ -2199,7 +2199,7 @@ static struct attribute *iscsi_conn_attrs[] = {
|
|||
NULL,
|
||||
};
|
||||
|
||||
static mode_t iscsi_conn_attr_is_visible(struct kobject *kobj,
|
||||
static umode_t iscsi_conn_attr_is_visible(struct kobject *kobj,
|
||||
struct attribute *attr, int i)
|
||||
{
|
||||
struct device *cdev = container_of(kobj, struct device, kobj);
|
||||
|
|
@ -2370,7 +2370,7 @@ static struct attribute *iscsi_session_attrs[] = {
|
|||
NULL,
|
||||
};
|
||||
|
||||
static mode_t iscsi_session_attr_is_visible(struct kobject *kobj,
|
||||
static umode_t iscsi_session_attr_is_visible(struct kobject *kobj,
|
||||
struct attribute *attr, int i)
|
||||
{
|
||||
struct device *cdev = container_of(kobj, struct device, kobj);
|
||||
|
|
@ -2468,7 +2468,7 @@ static struct attribute *iscsi_host_attrs[] = {
|
|||
NULL,
|
||||
};
|
||||
|
||||
static mode_t iscsi_host_attr_is_visible(struct kobject *kobj,
|
||||
static umode_t iscsi_host_attr_is_visible(struct kobject *kobj,
|
||||
struct attribute *attr, int i)
|
||||
{
|
||||
struct device *cdev = container_of(kobj, struct device, kobj);
|
||||
|
|
|
|||
|
|
@ -1434,7 +1434,7 @@ static int spi_host_configure(struct transport_container *tc,
|
|||
(si->f->show_##name ? S_IRUGO : 0) | \
|
||||
(si->f->set_##name ? S_IWUSR : 0)
|
||||
|
||||
static mode_t target_attribute_is_visible(struct kobject *kobj,
|
||||
static umode_t target_attribute_is_visible(struct kobject *kobj,
|
||||
struct attribute *attr, int i)
|
||||
{
|
||||
struct device *cdev = container_of(kobj, struct device, kobj);
|
||||
|
|
|
|||
|
|
@ -16,7 +16,6 @@
|
|||
#include <linux/genhd.h>
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/blkdev.h>
|
||||
#include <linux/buffer_head.h>
|
||||
#include <asm/unaligned.h>
|
||||
|
||||
#include <scsi/scsicam.h>
|
||||
|
|
|
|||
|
|
@ -2325,16 +2325,15 @@ static struct sg_proc_leaf sg_proc_leaf_arr[] = {
|
|||
static int
|
||||
sg_proc_init(void)
|
||||
{
|
||||
int k, mask;
|
||||
int num_leaves = ARRAY_SIZE(sg_proc_leaf_arr);
|
||||
struct sg_proc_leaf * leaf;
|
||||
int k;
|
||||
|
||||
sg_proc_sgp = proc_mkdir(sg_proc_sg_dirname, NULL);
|
||||
if (!sg_proc_sgp)
|
||||
return 1;
|
||||
for (k = 0; k < num_leaves; ++k) {
|
||||
leaf = &sg_proc_leaf_arr[k];
|
||||
mask = leaf->fops->write ? S_IRUGO | S_IWUSR : S_IRUGO;
|
||||
struct sg_proc_leaf *leaf = &sg_proc_leaf_arr[k];
|
||||
umode_t mask = leaf->fops->write ? S_IRUGO | S_IWUSR : S_IRUGO;
|
||||
proc_create(leaf->name, mask, sg_proc_sgp, leaf->fops);
|
||||
}
|
||||
return 0;
|
||||
|
|
|
|||
Loading…
Reference in a new issue