Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

bcache: move uapi header bcache.h to bcache code directory

The header file include/uapi/linux/bcache.h is not really a user space
API heaer. This file defines the ondisk format of bcache internal meta
data but no one includes it from user space, bcache-tools has its own
copy of this header with minor modification.

Therefore, this patch moves include/uapi/linux/bcache.h to bcache code
directory as drivers/md/bcache/bcache_ondisk.h.

Suggested-by: Arnd Bergmann <arnd@kernel.org>
Suggested-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Coly Li <colyli@suse.de>
Link: https://lore.kernel.org/r/20211029060930.119923-2-colyli@suse.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>

authored by

Coly Li and committed by
Jens Axboe
cf2197ca ca778797

+5 -4
+1 -1
drivers/md/bcache/bcache.h
··· 178 178 179 179 #define pr_fmt(fmt) "bcache: %s() " fmt, __func__ 180 180 181 - #include <linux/bcache.h> 182 181 #include <linux/bio.h> 183 182 #include <linux/kobject.h> 184 183 #include <linux/list.h> ··· 189 190 #include <linux/workqueue.h> 190 191 #include <linux/kthread.h> 191 192 193 + #include "bcache_ondisk.h" 192 194 #include "bset.h" 193 195 #include "util.h" 194 196 #include "closure.h"
+1 -1
drivers/md/bcache/bset.h
··· 2 2 #ifndef _BCACHE_BSET_H 3 3 #define _BCACHE_BSET_H 4 4 5 - #include <linux/bcache.h> 6 5 #include <linux/kernel.h> 7 6 #include <linux/types.h> 8 7 8 + #include "bcache_ondisk.h" 9 9 #include "util.h" /* for time_stats */ 10 10 11 11 /*
+1 -1
drivers/md/bcache/features.c
··· 6 6 * Copyright 2020 Coly Li <colyli@suse.de> 7 7 * 8 8 */ 9 - #include <linux/bcache.h> 9 + #include "bcache_ondisk.h" 10 10 #include "bcache.h" 11 11 #include "features.h" 12 12
+2 -1
drivers/md/bcache/features.h
··· 2 2 #ifndef _BCACHE_FEATURES_H 3 3 #define _BCACHE_FEATURES_H 4 4 5 - #include <linux/bcache.h> 6 5 #include <linux/kernel.h> 7 6 #include <linux/types.h> 7 + 8 + #include "bcache_ondisk.h" 8 9 9 10 #define BCH_FEATURE_COMPAT 0 10 11 #define BCH_FEATURE_RO_COMPAT 1
include/uapi/linux/bcache.h drivers/md/bcache/bcache_ondisk.h