From: jmoyer@redhat.com (Jeff Moyer)
Subject: [PATCH v2 01/12] block: Move integrity kobject to struct gendisk
Date: Fri, 23 Oct 2015 16:21:16 -0400 [thread overview]
Message-ID: <x49vb9xcp4z.fsf@segfault.boston.devel.redhat.com> (raw)
In-Reply-To: <20151015195945.20721.41097.stgit@dwillia2-desk3.jf.intel.com> (Dan Williams's message of "Thu, 15 Oct 2015 15:59:45 -0400")
Dan Williams <dan.j.williams at intel.com> writes:
> From: Martin K. Petersen <martin.petersen at oracle.com>
>
> The integrity kobject purely exists to support the integrity
> subdirectory in sysfs and doesn't really have anything to do with the
> blk_integrity data structure. Move the kobject to struct gendisk where
> it belongs.
>
> Signed-off-by: Martin K. Petersen <martin.petersen at oracle.com>
> Reported-by: Christoph Hellwig <hch at lst.de>
> Reviewed-by: Sagi Grimberg <sagig at mellanox.com>
> Tested-by: Ross Zwisler <ross.zwisler at linux.intel.com>
> Signed-off-by: Dan Williams <dan.j.williams at intel.com>
Reviewed-by: Jeff Moyer <jmoyer at redhat.com>
> ---
> block/blk-integrity.c | 22 +++++++++++-----------
> include/linux/blkdev.h | 2 --
> include/linux/genhd.h | 1 +
> 3 files changed, 12 insertions(+), 13 deletions(-)
>
> diff --git a/block/blk-integrity.c b/block/blk-integrity.c
> index 75f29cf70188..182bfd2383ea 100644
> --- a/block/blk-integrity.c
> +++ b/block/blk-integrity.c
> @@ -249,8 +249,8 @@ struct integrity_sysfs_entry {
> static ssize_t integrity_attr_show(struct kobject *kobj, struct attribute *attr,
> char *page)
> {
> - struct blk_integrity *bi =
> - container_of(kobj, struct blk_integrity, kobj);
> + struct gendisk *disk = container_of(kobj, struct gendisk, integrity_kobj);
> + struct blk_integrity *bi = blk_get_integrity(disk);
> struct integrity_sysfs_entry *entry =
> container_of(attr, struct integrity_sysfs_entry, attr);
>
> @@ -261,8 +261,8 @@ static ssize_t integrity_attr_store(struct kobject *kobj,
> struct attribute *attr, const char *page,
> size_t count)
> {
> - struct blk_integrity *bi =
> - container_of(kobj, struct blk_integrity, kobj);
> + struct gendisk *disk = container_of(kobj, struct gendisk, integrity_kobj);
> + struct blk_integrity *bi = blk_get_integrity(disk);
> struct integrity_sysfs_entry *entry =
> container_of(attr, struct integrity_sysfs_entry, attr);
> ssize_t ret = 0;
> @@ -385,8 +385,8 @@ subsys_initcall(blk_dev_integrity_init);
>
> static void blk_integrity_release(struct kobject *kobj)
> {
> - struct blk_integrity *bi =
> - container_of(kobj, struct blk_integrity, kobj);
> + struct gendisk *disk = container_of(kobj, struct gendisk, integrity_kobj);
> + struct blk_integrity *bi = blk_get_integrity(disk);
>
> kmem_cache_free(integrity_cachep, bi);
> }
> @@ -429,14 +429,14 @@ int blk_integrity_register(struct gendisk *disk, struct blk_integrity *template)
> if (!bi)
> return -1;
>
> - if (kobject_init_and_add(&bi->kobj, &integrity_ktype,
> + if (kobject_init_and_add(&disk->integrity_kobj, &integrity_ktype,
> &disk_to_dev(disk)->kobj,
> "%s", "integrity")) {
> kmem_cache_free(integrity_cachep, bi);
> return -1;
> }
>
> - kobject_uevent(&bi->kobj, KOBJ_ADD);
> + kobject_uevent(&disk->integrity_kobj, KOBJ_ADD);
>
> bi->flags |= BLK_INTEGRITY_VERIFY | BLK_INTEGRITY_GENERATE;
> bi->interval = queue_logical_block_size(disk->queue);
> @@ -479,9 +479,9 @@ void blk_integrity_unregister(struct gendisk *disk)
>
> bi = disk->integrity;
>
> - kobject_uevent(&bi->kobj, KOBJ_REMOVE);
> - kobject_del(&bi->kobj);
> - kobject_put(&bi->kobj);
> + kobject_uevent(&disk->integrity_kobj, KOBJ_REMOVE);
> + kobject_del(&disk->integrity_kobj);
> + kobject_put(&disk->integrity_kobj);
> disk->integrity = NULL;
> }
> EXPORT_SYMBOL(blk_integrity_unregister);
> diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
> index 19c2e947d4d1..830f9c07d4bb 100644
> --- a/include/linux/blkdev.h
> +++ b/include/linux/blkdev.h
> @@ -1472,8 +1472,6 @@ struct blk_integrity {
> unsigned short tag_size;
>
> const char *name;
> -
> - struct kobject kobj;
> };
>
> extern bool blk_integrity_is_initialized(struct gendisk *);
> diff --git a/include/linux/genhd.h b/include/linux/genhd.h
> index 2adbfa6d02bc..9e6e0dfa97ad 100644
> --- a/include/linux/genhd.h
> +++ b/include/linux/genhd.h
> @@ -199,6 +199,7 @@ struct gendisk {
> struct disk_events *ev;
> #ifdef CONFIG_BLK_DEV_INTEGRITY
> struct blk_integrity *integrity;
> + struct kobject integrity_kobj;
> #endif
> int node_id;
> };
>
> _______________________________________________
> Linux-nvdimm mailing list
> Linux-nvdimm at lists.01.org
> https://lists.01.org/mailman/listinfo/linux-nvdimm
next prev parent reply other threads:[~2015-10-23 20:21 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-15 19:59 [PATCH v2 00/12] blk-integrity lifetime fixes Dan Williams
2015-10-15 19:59 ` [PATCH v2 01/12] block: Move integrity kobject to struct gendisk Dan Williams
2015-10-23 20:21 ` Jeff Moyer [this message]
2015-10-15 19:59 ` [PATCH v2 02/12] block: Consolidate static integrity profile properties Dan Williams
2015-10-15 19:59 ` [PATCH v2 03/12] block: Reduce the size of struct blk_integrity Dan Williams
2015-10-15 20:00 ` [PATCH v2 04/12] block: Export integrity data interval size in sysfs Dan Williams
2015-10-15 20:00 ` [PATCH v2 05/12] block: Inline blk_integrity in struct gendisk Dan Williams
2015-10-15 20:00 ` [PATCH v2 06/12] md, dm, scsi, nvme, libnvdimm: drop blk_integrity_unregister() at shutdown Dan Williams
2015-10-15 20:00 ` [PATCH v2 07/12] md: suspend i/o during runtime blk_integrity_unregister Dan Williams
2015-10-15 20:00 ` [PATCH v2 08/12] nvme: " Dan Williams
2015-10-15 20:00 ` [PATCH v2 09/12] block: generic request_queue reference counting Dan Williams
2015-10-15 20:00 ` [PATCH v2 10/12] block: move blk_integrity to request_queue Dan Williams
2015-10-16 0:42 ` Williams, Dan J
2015-10-20 2:24 ` Martin K. Petersen
2015-10-20 2:45 ` Simplify block integrity registration v2 Martin K. Petersen
2015-10-20 2:45 ` [PATCH 1/5] block: Move integrity kobject to struct gendisk Martin K. Petersen
2015-10-20 2:45 ` [PATCH 2/5] block: Consolidate static integrity profile properties Martin K. Petersen
2015-10-20 18:20 ` Dan Williams
2015-10-20 2:45 ` [PATCH 3/5] block: Reduce the size of struct blk_integrity Martin K. Petersen
2015-10-20 2:45 ` [PATCH 4/5] block: Export integrity data interval size in sysfs Martin K. Petersen
2015-10-20 2:45 ` [PATCH 5/5] block: Inline blk_integrity in struct gendisk Martin K. Petersen
2015-10-21 7:22 ` Simplify block integrity registration v2 Christoph Hellwig
2015-10-21 15:45 ` Dan Williams
2015-10-21 16:35 ` Martin K. Petersen
2015-10-15 20:00 ` [PATCH v2 11/12] block: blk_flush_integrity() for bio-based drivers Dan Williams
2015-10-15 20:00 ` [PATCH v2 12/12] block, libnvdimm, nvme: provide a built-in blk_integrity nop profile Dan Williams
2015-10-15 23:53 ` [PATCH v2 00/12] blk-integrity lifetime fixes Martin K. Petersen
2015-10-16 0:06 ` Dan Williams
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=x49vb9xcp4z.fsf@segfault.boston.devel.redhat.com \
--to=jmoyer@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).