OSDN Git Service

null_blk: fix inline misuse
authorJens Axboe <axboe@kernel.dk>
Fri, 23 Aug 2019 18:49:00 +0000 (12:49 -0600)
committerJens Axboe <axboe@kernel.dk>
Fri, 23 Aug 2019 18:49:00 +0000 (12:49 -0600)
You can't magically mark a function inline and expect that to work.

Fixes: fceb5d1b19cb ("null_blk: create a helper for zoned devices")
Signed-off-by: Jens Axboe <axboe@kernel.dk>
drivers/block/null_blk.h
drivers/block/null_blk_zoned.c

index 4895c02..6fa3c07 100644 (file)
@@ -90,9 +90,9 @@ int null_zone_init(struct nullb_device *dev);
 void null_zone_exit(struct nullb_device *dev);
 int null_zone_report(struct gendisk *disk, sector_t sector,
                     struct blk_zone *zones, unsigned int *nr_zones);
-inline blk_status_t null_handle_zoned(struct nullb_cmd *cmd,
-                                     enum req_opf op, sector_t sector,
-                                     sector_t nr_sectors);
+blk_status_t null_handle_zoned(struct nullb_cmd *cmd,
+                               enum req_opf op, sector_t sector,
+                               sector_t nr_sectors);
 #else
 static inline int null_zone_init(struct nullb_device *dev)
 {
index 9009224..c07a053 100644 (file)
@@ -148,9 +148,8 @@ static blk_status_t null_zone_reset(struct nullb_cmd *cmd, sector_t sector)
        return BLK_STS_OK;
 }
 
-inline blk_status_t null_handle_zoned(struct nullb_cmd *cmd,
-                                      enum req_opf op, sector_t sector,
-                                      sector_t nr_sectors)
+blk_status_t null_handle_zoned(struct nullb_cmd *cmd, enum req_opf op,
+                              sector_t sector, sector_t nr_sectors)
 {
        switch (op) {
        case REQ_OP_WRITE: