diff options
| author | Martin K. Petersen <martin.petersen@oracle.com> | 2015-10-21 13:19:27 -0400 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2015-10-21 14:42:36 -0600 |
| commit | aff34e192e4eeacfb8b5ffc68e10a240f2c0c6d7 (patch) | |
| tree | 473ef945270499d07fdd8c196fc828ec6dc0acd3 /include/linux | |
| parent | ef658fc2a6809b42dd7002229fd174a9a1645707 (diff) | |
| download | linux-stable-aff34e192e4eeacfb8b5ffc68e10a240f2c0c6d7.tar.gz linux-stable-aff34e192e4eeacfb8b5ffc68e10a240f2c0c6d7.tar.bz2 linux-stable-aff34e192e4eeacfb8b5ffc68e10a240f2c0c6d7.zip | |
block: Move integrity kobject to struct gendisk
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@oracle.com>
Reported-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Sagi Grimberg <sagig@mellanox.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/blkdev.h | 2 | ||||
| -rw-r--r-- | include/linux/genhd.h | 1 |
2 files changed, 1 insertions, 2 deletions
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; }; |