Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754013AbbDHMIA (ORCPT ); Wed, 8 Apr 2015 08:08:00 -0400 Received: from mailout1.samsung.com ([203.254.224.24]:27585 "EHLO mailout1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753544AbbDHMH5 (ORCPT ); Wed, 8 Apr 2015 08:07:57 -0400 X-AuditID: cbfee61b-f79536d000000f1f-b4-55251a1bf8d5 From: Krzysztof Opasiak To: balbi@ti.com, gregkh@linuxfoundation.org, jlbec@evilplan.org Cc: andrzej.p@samsung.com, m.szyprowski@samsung.com, linux-api@vger.kernel.org, linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, Krzysztof Opasiak Subject: [PATCH v2 2/4] usb: gadget: mass_storage: Store lun_opts in fsg_opts Date: Wed, 08 Apr 2015 14:06:46 +0200 Message-id: <1428494808-12566-3-git-send-email-k.opasiak@samsung.com> X-Mailer: git-send-email 1.7.9.5 In-reply-to: <1428494808-12566-1-git-send-email-k.opasiak@samsung.com> References: <1428494808-12566-1-git-send-email-k.opasiak@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprFLMWRmVeSWpSXmKPExsVy+t9jAV1pKdVQg9ZORYtZL9tZLA7er7do XryezeLkuW8sFrcnTmOz2Py9g83i8q45bBaLlrUyW6w9cpfdgdPj6cUgj/1z17B79G1Zxehx /MZ2Jo/Pm+QCWKO4bFJSczLLUov07RK4MtZf2cte0Cpc8e3CaaYGxjMCXYycHBICJhLXP1xk gbDFJC7cW8/WxcjFISSwiFHiXMMtRgjnF6PEsncb2LsYOTjYBPQl5u0SBTFFBBwkzuwoAilh FtjGKPF0xwx2kEHCAr4Sd/61soLYLAKqEm92/QeL8wq4Siy5v5YJpFdCQEFiziQbkDCngJtE w4cJjCC2EFDJ6a9vmCYw8i5gZFjFKJpakFxQnJSea6RXnJhbXJqXrpecn7uJERxiz6R3MK5q sDjEKMDBqMTDK7BYJVSINbGsuDL3EKMEB7OSCO8ZLtVQId6UxMqq1KL8+KLSnNTiQ4zSHCxK 4rxzdOVChQTSE0tSs1NTC1KLYLJMHJxSDYxLpuftzNVLmW3iWdX+b6on+6fp0RV1pvYLSnwD nia9uaPxo2jrHbEl93vyyr4WbF7ae+mN4uKdHbdWCyT8vHamJSrrqbb3DUerQ13BK1LP3Yie +TO/ne1ilY/f8bR7dZuPzQjLE5m9UnlxVG9+XeEm7qKLnForRDZKcxmdCtE57eVfwj/nKZsS S3FGoqEWc1FxIgAZsYyuLQIAAA== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2624 Lines: 63 Signed-off-by: Krzysztof Opasiak --- drivers/usb/gadget/function/f_mass_storage.c | 5 +++++ drivers/usb/gadget/function/f_mass_storage.h | 1 + 2 files changed, 6 insertions(+) diff --git a/drivers/usb/gadget/function/f_mass_storage.c b/drivers/usb/gadget/function/f_mass_storage.c index 811929c..095b618 100644 --- a/drivers/usb/gadget/function/f_mass_storage.c +++ b/drivers/usb/gadget/function/f_mass_storage.c @@ -3372,6 +3372,8 @@ static struct config_group *fsg_lun_make(struct config_group *group, } opts->lun = fsg_opts->common->luns[num]; opts->lun_id = num; + BUG_ON(fsg_opts->lun_opts[num]); + fsg_opts->lun_opts[num] = opts; mutex_unlock(&fsg_opts->lock); config_group_init_type_name(&opts->group, name, &fsg_lun_type); @@ -3400,6 +3402,7 @@ static void fsg_lun_drop(struct config_group *group, struct config_item *item) fsg_common_remove_lun(lun_opts->lun, fsg_opts->common->sysfs); fsg_opts->common->luns[lun_opts->lun_id] = NULL; + fsg_opts->lun_opts[lun_opts->lun_id] = NULL; lun_opts->lun_id = 0; mutex_unlock(&fsg_opts->lock); @@ -3546,6 +3549,7 @@ static struct usb_function_instance *fsg_alloc_inst(void) if (!opts) return ERR_PTR(-ENOMEM); mutex_init(&opts->lock); + memset(opts->lun_opts, 0, sizeof(opts->lun_opts)); opts->func_inst.free_func_inst = fsg_free_inst; opts->common = fsg_common_setup(opts->common); if (IS_ERR(opts->common)) { @@ -3569,6 +3573,7 @@ static struct usb_function_instance *fsg_alloc_inst(void) (const char **)&opts->func_inst.group.cg_item.ci_name); opts->lun0.lun = opts->common->luns[0]; opts->lun0.lun_id = 0; + opts->lun_opts[0] = &opts->lun0; config_group_init_type_name(&opts->lun0.group, "lun.0", &fsg_lun_type); opts->default_groups[0] = &opts->lun0.group; opts->func_inst.group.default_groups = opts->default_groups; diff --git a/drivers/usb/gadget/function/f_mass_storage.h b/drivers/usb/gadget/function/f_mass_storage.h index b4866fc..0a7c656 100644 --- a/drivers/usb/gadget/function/f_mass_storage.h +++ b/drivers/usb/gadget/function/f_mass_storage.h @@ -81,6 +81,7 @@ struct fsg_opts { struct fsg_common *common; struct usb_function_instance func_inst; struct fsg_lun_opts lun0; + struct fsg_lun_opts *lun_opts[FSG_MAX_LUNS]; struct config_group *default_groups[2]; bool no_configfs; /* for legacy gadgets */ -- 1.7.9.5 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/