Skip to content

Commit a412279

Browse files
committed
btrfs-progs: move extent-cache.c to common/
Signed-off-by: David Sterba <dsterba@suse.com>
1 parent 9f45694 commit a412279

16 files changed

+17
-17
lines changed

Android.mk

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ btrfs_shared_libraries := libext2_uuid \
1919

2020
objects := ctree.c disk-io.c kernel-lib/radix-tree.c extent-tree.c print-tree.c \
2121
root-tree.c dir-item.c file-item.c inode-item.c inode-map.c \
22-
extent-cache.c extent_io.c volumes.c utils.c repair.c \
22+
common/extent-cache.c extent_io.c volumes.c utils.c repair.c \
2323
qgroup.c free-space-cache.c kernel-lib/list_sort.c props.c \
2424
kernel-shared/ulist.c qgroup-verify.c backref.c common/string-table.c task-utils.c \
2525
inode.c file.c find-root.c free-space-tree.c help.c send-dump.c \
@@ -37,7 +37,7 @@ libbtrfs_objects := send-stream.c send-utils.c kernel-lib/rbtree.c btrfs-list.c
3737
libbtrfs_headers := send-stream.h send-utils.h send.h kernel-lib/rbtree.h btrfs-list.h \
3838
crypto/crc32c.h kernel-lib/list.h kerncompat.h \
3939
kernel-lib/radix-tree.h kernel-lib/sizes.h kernel-lib/raid56.h \
40-
extent-cache.h extent_io.h ioctl.h ctree.h btrfsck.h version.h
40+
common/extent-cache.h extent_io.h ioctl.h ctree.h btrfsck.h version.h
4141
blkid_objects := partition/ superblocks/ topology/
4242

4343

Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ cmds_objects = cmds/subvolume.o cmds/filesystem.o cmds/device.o cmds/scrub.o \
160160
cmds/inspect-dump-super.o cmds/inspect-tree-stats.o cmds/filesystem-du.o \
161161
mkfs/common.o check/mode-common.o check/mode-lowmem.o
162162
libbtrfs_objects = send-stream.o send-utils.o kernel-lib/rbtree.o btrfs-list.o \
163-
kernel-lib/radix-tree.o extent-cache.o extent_io.o \
163+
kernel-lib/radix-tree.o common/extent-cache.o extent_io.o \
164164
crypto/crc32c.o common/messages.o \
165165
kernel-shared/uuid-tree.o utils-lib.o common/rbtree-utils.o \
166166
ctree.o disk-io.o extent-tree.o kernel-shared/delayed-ref.o print-tree.o \
@@ -174,7 +174,7 @@ libbtrfs_objects = send-stream.o send-utils.o kernel-lib/rbtree.o btrfs-list.o \
174174
libbtrfs_headers = send-stream.h send-utils.h send.h kernel-lib/rbtree.h btrfs-list.h \
175175
crypto/crc32c.h kernel-lib/list.h kerncompat.h \
176176
kernel-lib/radix-tree.h kernel-lib/sizes.h kernel-lib/raid56.h \
177-
extent-cache.h extent_io.h ioctl.h ctree.h btrfsck.h version.h
177+
common/extent-cache.h extent_io.h ioctl.h ctree.h btrfsck.h version.h
178178
libbtrfsutil_major := $(shell sed -rn 's/^\#define BTRFS_UTIL_VERSION_MAJOR ([0-9])+$$/\1/p' libbtrfsutil/btrfsutil.h)
179179
libbtrfsutil_minor := $(shell sed -rn 's/^\#define BTRFS_UTIL_VERSION_MINOR ([0-9])+$$/\1/p' libbtrfsutil/btrfsutil.h)
180180
libbtrfsutil_patch := $(shell sed -rn 's/^\#define BTRFS_UTIL_VERSION_PATCH ([0-9])+$$/\1/p' libbtrfsutil/btrfsutil.h)

btrfs-find-root.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
#include "volumes.h"
3434
#include "common/utils.h"
3535
#include "crypto/crc32c.h"
36-
#include "extent-cache.h"
36+
#include "common/extent-cache.h"
3737
#include "find-root.h"
3838
#include "common/help.h"
3939
#include "cmds/commands.h"

btrfsck.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#if BTRFS_FLAT_INCLUDES
2424
#include "kerncompat.h"
2525
#include "ctree.h"
26-
#include "extent-cache.h"
26+
#include "common/extent-cache.h"
2727
#include "kernel-lib/list.h"
2828
#else
2929
#include <btrfs/kerncompat.h>

check/common.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
#include "kerncompat.h"
2424
#include "ctree.h"
25-
#include "extent-cache.h"
25+
#include "common/extent-cache.h"
2626
#include "kernel-lib/list.h"
2727

2828
struct block_group_record {

cmds/rescue-chunk-recover.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
#include "kernel-lib/list.h"
3333
#include "kernel-lib/radix-tree.h"
3434
#include "ctree.h"
35-
#include "extent-cache.h"
35+
#include "common/extent-cache.h"
3636
#include "disk-io.h"
3737
#include "volumes.h"
3838
#include "transaction.h"

extent-cache.c renamed to common/extent-cache.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#include <stdio.h>
1919
#include <stdlib.h>
2020
#include "kerncompat.h"
21-
#include "extent-cache.h"
21+
#include "common/extent-cache.h"
2222
#include "common/rbtree-utils.h"
2323

2424
struct cache_extent_search_range {
File renamed without changes.

convert/common.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
#include "kerncompat.h"
2626
#include "common/defs.h"
27-
#include "extent-cache.h"
27+
#include "common/extent-cache.h"
2828

2929
struct btrfs_mkfs_config;
3030

ctree.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#include "kernel-lib/list.h"
2626
#include "kerncompat.h"
2727
#include "kernel-lib/radix-tree.h"
28-
#include "extent-cache.h"
28+
#include "common/extent-cache.h"
2929
#include "extent_io.h"
3030
#include "ioctl.h"
3131
#include "kernel-lib/sizes.h"

extent_io.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
#if BTRFS_FLAT_INCLUDES
2323
#include "kerncompat.h"
24-
#include "extent-cache.h"
24+
#include "common/extent-cache.h"
2525
#include "kernel-lib/list.h"
2626
#else
2727
#include <btrfs/kerncompat.h>

find-root.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#include "find-root.h"
2626
#include "volumes.h"
2727
#include "disk-io.h"
28-
#include "extent-cache.h"
28+
#include "common/extent-cache.h"
2929

3030
/* Return value is the same as btrfs_find_root_search(). */
3131
static int add_eb_to_result(struct extent_buffer *eb,

find-root.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
#include "ctree.h"
2525
#include "kernel-lib/list.h"
26-
#include "extent-cache.h"
26+
#include "common/extent-cache.h"
2727

2828
/*
2929
* Find-root will restore the search result in a 2-level trees.

image/main.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
#include "common/utils.h"
3636
#include "volumes.h"
3737
#include "extent_io.h"
38-
#include "extent-cache.h"
38+
#include "common/extent-cache.h"
3939
#include "common/help.h"
4040
#include "common/device-utils.h"
4141
#include "image/metadump.h"

repair.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
*/
1818

1919
#include "ctree.h"
20-
#include "extent-cache.h"
20+
#include "common/extent-cache.h"
2121
#include "common/utils.h"
2222
#include "repair.h"
2323

tests/library-test.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#include "ioctl.h"
3030
#include "btrfs-list.h"
3131
#include "check/btrfsck.h"
32-
#include "extent-cache.h"
32+
#include "common/extent-cache.h"
3333
#include "send.h"
3434
#include "send-stream.h"
3535
#include "send-utils.h"

0 commit comments

Comments
 (0)