target: Update QUEUE ALGORITHM MODIFIER control page default

[pandora-kernel.git] / drivers / target / target_core_fabric_configfs.c

diff --git a/drivers/target/target_core_fabric_configfs.c b/drivers/target/target_core_fabric_configfs.c
index 07ab5a3..f165469 100644 (file)
--- a/drivers/target/target_core_fabric_configfs.c
+++ b/drivers/target/target_core_fabric_configfs.c
@@ -60,7 +60,7 @@ static void target_fabric_setup_##_name##_cit(struct target_fabric_configfs *tf)
        cit->ct_group_ops = _group_ops;                                 \
        cit->ct_attrs = _attrs;                                         \
        cit->ct_owner = tf->tf_module;                                  \
-       printk("Setup generic %s\n", __stringify(_name));               \
+       pr_debug("Setup generic %s\n", __stringify(_name));             \
 }
 
 /* Start of tfc_tpg_mappedlun_cit */
@@ -80,8 +80,8 @@ static int target_fabric_mappedlun_link(
        /*
         * Ensure that the source port exists
         */
-       if (!(lun->lun_sep) || !(lun->lun_sep->sep_tpg)) {
-               printk(KERN_ERR "Source se_lun->lun_sep or lun->lun_sep->sep"
+       if (!lun->lun_sep || !lun->lun_sep->sep_tpg) {
+               pr_err("Source se_lun->lun_sep or lun->lun_sep->sep"
                                "_tpg does not exist\n");
                return -EINVAL;
        }
@@ -96,12 +96,12 @@ static int target_fabric_mappedlun_link(
         * Make sure the SymLink is going to the same $FABRIC/$WWN/tpgt_$TPGT
         */
        if (strcmp(config_item_name(wwn_ci), config_item_name(wwn_ci_s))) {
-               printk(KERN_ERR "Illegal Initiator ACL SymLink outside of %s\n",
+               pr_err("Illegal Initiator ACL SymLink outside of %s\n",
                        config_item_name(wwn_ci));
                return -EINVAL;
        }
        if (strcmp(config_item_name(tpg_ci), config_item_name(tpg_ci_s))) {
-               printk(KERN_ERR "Illegal Initiator ACL Symlink outside of %s"
+               pr_err("Illegal Initiator ACL Symlink outside of %s"
                        " TPGT: %s\n", config_item_name(wwn_ci),
                        config_item_name(tpg_ci));
                return -EINVAL;
@@ -118,7 +118,7 @@ static int target_fabric_mappedlun_link(
                lun_access = deve->lun_flags;
        else
                lun_access =
-                       (TPG_TFO(se_tpg)->tpg_check_prod_mode_write_protect(
+                       (se_tpg->se_tpg_tfo->tpg_check_prod_mode_write_protect(
                                se_tpg)) ? TRANSPORT_LUNFLAGS_READ_ONLY :
                                           TRANSPORT_LUNFLAGS_READ_WRITE;
        spin_unlock_irq(&lacl->se_lun_nacl->device_list_lock);
@@ -147,7 +147,7 @@ static int target_fabric_mappedlun_unlink(
        /*
         * Determine if the underlying MappedLUN has already been released..
         */
-       if (!(deve->se_lun))
+       if (!deve->se_lun)
                return 0;
 
        lun = container_of(to_config_group(lun_ci), struct se_lun, lun_group);
@@ -202,9 +202,9 @@ static ssize_t target_fabric_mappedlun_store_write_protect(
                        TRANSPORT_LUNFLAGS_READ_WRITE,
                        lacl->se_lun_nacl);
 
-       printk(KERN_INFO "%s_ConfigFS: Changed Initiator ACL: %s"
+       pr_debug("%s_ConfigFS: Changed Initiator ACL: %s"
                " Mapped LUN: %u Write Protect bit to %s\n",
-               TPG_TFO(se_tpg)->get_fabric_name(),
+               se_tpg->se_tpg_tfo->get_fabric_name(),
                lacl->initiatorname, lacl->mapped_lun, (op) ? "ON" : "OFF");
 
        return count;
@@ -327,14 +327,14 @@ static struct config_group *target_fabric_make_mappedlun(
        int ret = 0;
 
        acl_ci = &group->cg_item;
-       if (!(acl_ci)) {
-               printk(KERN_ERR "Unable to locatel acl_ci\n");
+       if (!acl_ci) {
+               pr_err("Unable to locatel acl_ci\n");
                return NULL;
        }
 
        buf = kzalloc(strlen(name) + 1, GFP_KERNEL);
-       if (!(buf)) {
-               printk(KERN_ERR "Unable to allocate memory for name buf\n");
+       if (!buf) {
+               pr_err("Unable to allocate memory for name buf\n");
                return ERR_PTR(-ENOMEM);
        }
        snprintf(buf, strlen(name) + 1, "%s", name);
@@ -342,7 +342,7 @@ static struct config_group *target_fabric_make_mappedlun(
         * Make sure user is creating iscsi/$IQN/$TPGT/acls/$INITIATOR/lun_$ID.
         */
        if (strstr(buf, "lun_") != buf) {
-               printk(KERN_ERR "Unable to locate \"lun_\" from buf: %s"
+               pr_err("Unable to locate \"lun_\" from buf: %s"
                        " name: %s\n", buf, name);
                ret = -EINVAL;
                goto out;
@@ -358,7 +358,7 @@ static struct config_group *target_fabric_make_mappedlun(
 
        lacl = core_dev_init_initiator_node_lun_acl(se_tpg, mapped_lun,
                        config_item_name(acl_ci), &ret);
-       if (!(lacl)) {
+       if (!lacl) {
                ret = -EINVAL;
                goto out;
        }
@@ -367,7 +367,7 @@ static struct config_group *target_fabric_make_mappedlun(
        lacl_cg->default_groups = kzalloc(sizeof(struct config_group) * 2,
                                GFP_KERNEL);
        if (!lacl_cg->default_groups) {
-               printk(KERN_ERR "Unable to allocate lacl_cg->default_groups\n");
+               pr_err("Unable to allocate lacl_cg->default_groups\n");
                ret = -ENOMEM;
                goto out;
        }
@@ -379,11 +379,11 @@ static struct config_group *target_fabric_make_mappedlun(
        lacl_cg->default_groups[0] = &lacl->ml_stat_grps.stat_group;
        lacl_cg->default_groups[1] = NULL;
 
-       ml_stat_grp = &ML_STAT_GRPS(lacl)->stat_group;
+       ml_stat_grp = &lacl->ml_stat_grps.stat_group;
        ml_stat_grp->default_groups = kzalloc(sizeof(struct config_group) * 3,
                                GFP_KERNEL);
        if (!ml_stat_grp->default_groups) {
-               printk(KERN_ERR "Unable to allocate ml_stat_grp->default_groups\n");
+               pr_err("Unable to allocate ml_stat_grp->default_groups\n");
                ret = -ENOMEM;
                goto out;
        }
@@ -408,7 +408,7 @@ static void target_fabric_drop_mappedlun(
        struct config_group *lacl_cg = NULL, *ml_stat_grp = NULL;
        int i;
 
-       ml_stat_grp = &ML_STAT_GRPS(lacl)->stat_group;
+       ml_stat_grp = &lacl->ml_stat_grps.stat_group;
        for (i = 0; ml_stat_grp->default_groups[i]; i++) {
                df_item = &ml_stat_grp->default_groups[i]->cg_item;
                ml_stat_grp->default_groups[i] = NULL;
@@ -474,8 +474,8 @@ static struct config_group *target_fabric_make_nodeacl(
        struct se_node_acl *se_nacl;
        struct config_group *nacl_cg;
 
-       if (!(tf->tf_ops.fabric_make_nodeacl)) {
-               printk(KERN_ERR "tf->tf_ops.fabric_make_nodeacl is NULL\n");
+       if (!tf->tf_ops.fabric_make_nodeacl) {
+               pr_err("tf->tf_ops.fabric_make_nodeacl is NULL\n");
                return ERR_PTR(-ENOSYS);
        }
 
@@ -572,13 +572,13 @@ static struct config_group *target_fabric_make_np(
        struct target_fabric_configfs *tf = se_tpg->se_tpg_wwn->wwn_tf;
        struct se_tpg_np *se_tpg_np;
 
-       if (!(tf->tf_ops.fabric_make_np)) {
-               printk(KERN_ERR "tf->tf_ops.fabric_make_np is NULL\n");
+       if (!tf->tf_ops.fabric_make_np) {
+               pr_err("tf->tf_ops.fabric_make_np is NULL\n");
                return ERR_PTR(-ENOSYS);
        }
 
        se_tpg_np = tf->tf_ops.fabric_make_np(se_tpg, group, name);
-       if (!(se_tpg_np) || IS_ERR(se_tpg_np))
+       if (!se_tpg_np || IS_ERR(se_tpg_np))
                return ERR_PTR(-EINVAL);
 
        se_tpg_np->tpg_np_parent = se_tpg;
@@ -627,10 +627,7 @@ static ssize_t target_fabric_port_show_attr_alua_tg_pt_gp(
        struct se_lun *lun,
        char *page)
 {
-       if (!(lun))
-               return -ENODEV;
-
-       if (!(lun->lun_sep))
+       if (!lun || !lun->lun_sep)
                return -ENODEV;
 
        return core_alua_show_tg_pt_gp_info(lun->lun_sep, page);
@@ -641,10 +638,7 @@ static ssize_t target_fabric_port_store_attr_alua_tg_pt_gp(
        const char *page,
        size_t count)
 {
-       if (!(lun))
-               return -ENODEV;
-
-       if (!(lun->lun_sep))
+       if (!lun || !lun->lun_sep)
                return -ENODEV;
 
        return core_alua_store_tg_pt_gp_info(lun->lun_sep, page, count);
@@ -659,10 +653,7 @@ static ssize_t target_fabric_port_show_attr_alua_tg_pt_offline(
        struct se_lun *lun,
        char *page)
 {
-       if (!(lun))
-               return -ENODEV;
-
-       if (!(lun->lun_sep))
+       if (!lun || !lun->lun_sep)
                return -ENODEV;
 
        return core_alua_show_offline_bit(lun, page);
@@ -673,10 +664,7 @@ static ssize_t target_fabric_port_store_attr_alua_tg_pt_offline(
        const char *page,
        size_t count)
 {
-       if (!(lun))
-               return -ENODEV;
-
-       if (!(lun->lun_sep))
+       if (!lun || !lun->lun_sep)
                return -ENODEV;
 
        return core_alua_store_offline_bit(lun, page, count);
@@ -691,10 +679,7 @@ static ssize_t target_fabric_port_show_attr_alua_tg_pt_status(
        struct se_lun *lun,
        char *page)
 {
-       if (!(lun))
-               return -ENODEV;
-
-       if (!(lun->lun_sep))
+       if (!lun || !lun->lun_sep)
                return -ENODEV;
 
        return core_alua_show_secondary_status(lun, page);
@@ -705,10 +690,7 @@ static ssize_t target_fabric_port_store_attr_alua_tg_pt_status(
        const char *page,
        size_t count)
 {
-       if (!(lun))
-               return -ENODEV;
-
-       if (!(lun->lun_sep))
+       if (!lun || !lun->lun_sep)
                return -ENODEV;
 
        return core_alua_store_secondary_status(lun, page, count);
@@ -723,10 +705,7 @@ static ssize_t target_fabric_port_show_attr_alua_tg_pt_write_md(
        struct se_lun *lun,
        char *page)
 {
-       if (!(lun))
-               return -ENODEV;
-
-       if (!(lun->lun_sep))
+       if (!lun || !lun->lun_sep)
                return -ENODEV;
 
        return core_alua_show_secondary_write_metadata(lun, page);
@@ -737,10 +716,7 @@ static ssize_t target_fabric_port_store_attr_alua_tg_pt_write_md(
        const char *page,
        size_t count)
 {
-       if (!(lun))
-               return -ENODEV;
-
-       if (!(lun->lun_sep))
+       if (!lun || !lun->lun_sep)
                return -ENODEV;
 
        return core_alua_store_secondary_write_metadata(lun, page, count);
@@ -781,13 +757,13 @@ static int target_fabric_port_link(
        tf = se_tpg->se_tpg_wwn->wwn_tf;
 
        if (lun->lun_se_dev !=  NULL) {
-               printk(KERN_ERR "Port Symlink already exists\n");
+               pr_err("Port Symlink already exists\n");
                return -EEXIST;
        }
 
        dev = se_dev->se_dev_ptr;
-       if (!(dev)) {
-               printk(KERN_ERR "Unable to locate struct se_device pointer from"
+       if (!dev) {
+               pr_err("Unable to locate struct se_device pointer from"
                        " %s\n", config_item_name(se_dev_ci));
                ret = -ENODEV;
                goto out;
@@ -795,8 +771,8 @@ static int target_fabric_port_link(
 
        lun_p = core_dev_add_lun(se_tpg, dev->se_hba, dev,
                                lun->unpacked_lun);
-       if ((IS_ERR(lun_p)) || !(lun_p)) {
-               printk(KERN_ERR "core_dev_add_lun() failed\n");
+       if (IS_ERR(lun_p) || !lun_p) {
+               pr_err("core_dev_add_lun() failed\n");
                ret = -EINVAL;
                goto out;
        }
@@ -888,7 +864,7 @@ static struct config_group *target_fabric_make_lun(
        int errno;
 
        if (strstr(name, "lun_") != name) {
-               printk(KERN_ERR "Unable to locate \'_\" in"
+               pr_err("Unable to locate \'_\" in"
                                " \"lun_$LUN_NUMBER\"\n");
                return ERR_PTR(-EINVAL);
        }
@@ -896,14 +872,14 @@ static struct config_group *target_fabric_make_lun(
                return ERR_PTR(-EINVAL);
 
        lun = core_get_lun_from_tpg(se_tpg, unpacked_lun);
-       if (!(lun))
+       if (!lun)
                return ERR_PTR(-EINVAL);
 
        lun_cg = &lun->lun_group;
        lun_cg->default_groups = kzalloc(sizeof(struct config_group) * 2,
                                GFP_KERNEL);
        if (!lun_cg->default_groups) {
-               printk(KERN_ERR "Unable to allocate lun_cg->default_groups\n");
+               pr_err("Unable to allocate lun_cg->default_groups\n");
                return ERR_PTR(-ENOMEM);
        }
 
@@ -914,11 +890,11 @@ static struct config_group *target_fabric_make_lun(
        lun_cg->default_groups[0] = &lun->port_stat_grps.stat_group;
        lun_cg->default_groups[1] = NULL;
 
-       port_stat_grp = &PORT_STAT_GRP(lun)->stat_group;
+       port_stat_grp = &lun->port_stat_grps.stat_group;
        port_stat_grp->default_groups =  kzalloc(sizeof(struct config_group) * 3,
                                GFP_KERNEL);
        if (!port_stat_grp->default_groups) {
-               printk(KERN_ERR "Unable to allocate port_stat_grp->default_groups\n");
+               pr_err("Unable to allocate port_stat_grp->default_groups\n");
                errno = -ENOMEM;
                goto out;
        }
@@ -941,7 +917,7 @@ static void target_fabric_drop_lun(
        struct config_group *lun_cg, *port_stat_grp;
        int i;
 
-       port_stat_grp = &PORT_STAT_GRP(lun)->stat_group;
+       port_stat_grp = &lun->port_stat_grps.stat_group;
        for (i = 0; port_stat_grp->default_groups[i]; i++) {
                df_item = &port_stat_grp->default_groups[i]->cg_item;
                port_stat_grp->default_groups[i] = NULL;
@@ -1031,13 +1007,13 @@ static struct config_group *target_fabric_make_tpg(
        struct target_fabric_configfs *tf = wwn->wwn_tf;
        struct se_portal_group *se_tpg;
 
-       if (!(tf->tf_ops.fabric_make_tpg)) {
-               printk(KERN_ERR "tf->tf_ops.fabric_make_tpg is NULL\n");
+       if (!tf->tf_ops.fabric_make_tpg) {
+               pr_err("tf->tf_ops.fabric_make_tpg is NULL\n");
                return ERR_PTR(-ENOSYS);
        }
 
        se_tpg = tf->tf_ops.fabric_make_tpg(wwn, group, name);
-       if (!(se_tpg) || IS_ERR(se_tpg))
+       if (!se_tpg || IS_ERR(se_tpg))
                return ERR_PTR(-EINVAL);
        /*
         * Setup default groups from pre-allocated se_tpg->tpg_default_groups
@@ -1130,13 +1106,13 @@ static struct config_group *target_fabric_make_wwn(
                                struct target_fabric_configfs, tf_group);
        struct se_wwn *wwn;
 
-       if (!(tf->tf_ops.fabric_make_wwn)) {
-               printk(KERN_ERR "tf->tf_ops.fabric_make_wwn is NULL\n");
+       if (!tf->tf_ops.fabric_make_wwn) {
+               pr_err("tf->tf_ops.fabric_make_wwn is NULL\n");
                return ERR_PTR(-ENOSYS);
        }
 
        wwn = tf->tf_ops.fabric_make_wwn(tf, group, name);
-       if (!(wwn) || IS_ERR(wwn))
+       if (!wwn || IS_ERR(wwn))
                return ERR_PTR(-EINVAL);
 
        wwn->wwn_tf = tf;