Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 48a3b636 authored by Eric Sandeen's avatar Eric Sandeen Committed by Josef Bacik
Browse files

btrfs: make static code static & remove dead code 



Big patch, but all it does is add statics to functions which
are in fact static, then remove the associated dead-code fallout.

removed functions:

btrfs_iref_to_path()
__btrfs_lookup_delayed_deletion_item()
__btrfs_search_delayed_insertion_item()
__btrfs_search_delayed_deletion_item()
find_eb_for_page()
btrfs_find_block_group()
range_straddles_pages()
extent_range_uptodate()
btrfs_file_extent_length()
btrfs_scrub_cancel_devid()
btrfs_start_transaction_lflush()

btrfs_print_tree() is left because it is used for debugging.
btrfs_start_transaction_lflush() and btrfs_reada_detach() are
left for symmetry.

ulist.c functions are left, another patch will take care of those.

Signed-off-by: default avatarEric Sandeen <sandeen@redhat.com>
Signed-off-by: default avatarJosef Bacik <jbacik@fusionio.com>
parent 634554dc

fs/btrfs/backref.c

+14 −26
Original line number Diff line number Diff line
@@ -1189,6 +1189,20 @@ int btrfs_find_one_extref(struct btrfs_root *root, u64 inode_objectid, 
	return ret;

}



/*

 * this iterates to turn a name (from iref/extref) into a full filesystem path.

 * Elements of the path are separated by '/' and the path is guaranteed to be

 * 0-terminated. the path is only given within the current file system.

 * Therefore, it never starts with a '/'. the caller is responsible to provide

 * "size" bytes in "dest". the dest buffer will be filled backwards. finally,

 * the start point of the resulting string is returned. this pointer is within

 * dest, normally.

 * in case the path buffer would overflow, the pointer is decremented further

 * as if output was written to the buffer, though no more output is actually

 * generated. that way, the caller can determine how much space would be

 * required for the path to fit into the buffer. in that case, the returned

 * value will be smaller than dest. callers must check this!

 */

char *btrfs_ref_to_path(struct btrfs_root *fs_root, struct btrfs_path *path,

			u32 name_len, unsigned long name_off,

			struct extent_buffer *eb_in, u64 parent,
@@ -1257,32 +1271,6 @@ char *btrfs_ref_to_path(struct btrfs_root *fs_root, struct btrfs_path *path, 
	return dest + bytes_left;

}



/*

 * this iterates to turn a btrfs_inode_ref into a full filesystem path. elements

 * of the path are separated by '/' and the path is guaranteed to be

 * 0-terminated. the path is only given within the current file system.

 * Therefore, it never starts with a '/'. the caller is responsible to provide

 * "size" bytes in "dest". the dest buffer will be filled backwards. finally,

 * the start point of the resulting string is returned. this pointer is within

 * dest, normally.

 * in case the path buffer would overflow, the pointer is decremented further

 * as if output was written to the buffer, though no more output is actually

 * generated. that way, the caller can determine how much space would be

 * required for the path to fit into the buffer. in that case, the returned

 * value will be smaller than dest. callers must check this!

 */

char *btrfs_iref_to_path(struct btrfs_root *fs_root,

			 struct btrfs_path *path,

			 struct btrfs_inode_ref *iref,

			 struct extent_buffer *eb_in, u64 parent,

			 char *dest, u32 size)

{

	return btrfs_ref_to_path(fs_root, path,

				 btrfs_inode_ref_name_len(eb_in, iref),

				 (unsigned long)(iref + 1),

				 eb_in, parent, dest, size);

}



/*

 * this makes the path point to (logical EXTENT_ITEM *)

 * returns BTRFS_EXTENT_FLAG_DATA for data, BTRFS_EXTENT_FLAG_TREE_BLOCK for

fs/btrfs/backref.h

+0 −3
Original line number Diff line number Diff line
@@ -59,9 +59,6 @@ int paths_from_inode(u64 inum, struct inode_fs_paths *ipath); 
int btrfs_find_all_roots(struct btrfs_trans_handle *trans,

				struct btrfs_fs_info *fs_info, u64 bytenr,

				u64 time_seq, struct ulist **roots);

char *btrfs_iref_to_path(struct btrfs_root *fs_root, struct btrfs_path *path,

			 struct btrfs_inode_ref *iref, struct extent_buffer *eb,

			 u64 parent, char *dest, u32 size);

char *btrfs_ref_to_path(struct btrfs_root *fs_root, struct btrfs_path *path,

			u32 name_len, unsigned long name_off,

			struct extent_buffer *eb_in, u64 parent,

fs/btrfs/compression.c

+8 −3
Original line number Diff line number Diff line
@@ -82,6 +82,10 @@ struct compressed_bio { 
	u32 sums;

};



static int btrfs_decompress_biovec(int type, struct page **pages_in,

				   u64 disk_start, struct bio_vec *bvec,

				   int vcnt, size_t srclen);



static inline int compressed_bio_size(struct btrfs_root *root,

				      unsigned long disk_size)

{
@@ -738,7 +742,7 @@ static int comp_num_workspace[BTRFS_COMPRESS_TYPES]; 
static atomic_t comp_alloc_workspace[BTRFS_COMPRESS_TYPES];

static wait_queue_head_t comp_workspace_wait[BTRFS_COMPRESS_TYPES];



struct btrfs_compress_op *btrfs_compress_op[] = {

static struct btrfs_compress_op *btrfs_compress_op[] = {

	&btrfs_zlib_compress,

	&btrfs_lzo_compress,

};
@@ -909,8 +913,9 @@ int btrfs_compress_pages(int type, struct address_space *mapping, 
 * be contiguous.  They all correspond to the range of bytes covered by

 * the compressed extent.

 */

int btrfs_decompress_biovec(int type, struct page **pages_in, u64 disk_start,

			    struct bio_vec *bvec, int vcnt, size_t srclen)

static int btrfs_decompress_biovec(int type, struct page **pages_in,

				   u64 disk_start, struct bio_vec *bvec,

				   int vcnt, size_t srclen)

{

	struct list_head *workspace;

	int ret;

fs/btrfs/compression.h

+0 −2
Original line number Diff line number Diff line
@@ -30,8 +30,6 @@ int btrfs_compress_pages(int type, struct address_space *mapping, 
			 unsigned long *total_in,

			 unsigned long *total_out,

			 unsigned long max_out);

int btrfs_decompress_biovec(int type, struct page **pages_in, u64 disk_start,

			    struct bio_vec *bvec, int vcnt, size_t srclen);

int btrfs_decompress(int type, unsigned char *data_in, struct page *dest_page,

		     unsigned long start_byte, size_t srclen, size_t destlen);

int btrfs_decompress_buf2page(char *buf, unsigned long buf_start,

fs/btrfs/ctree.c

+2 −7
Original line number Diff line number Diff line
@@ -41,12 +41,7 @@ static void del_ptr(struct btrfs_root *root, struct btrfs_path *path, 
		    int level, int slot);

static void tree_mod_log_free_eb(struct btrfs_fs_info *fs_info,

				 struct extent_buffer *eb);

struct extent_buffer *read_old_tree_block(struct btrfs_root *root, u64 bytenr,

					  u32 blocksize, u64 parent_transid,

					  u64 time_seq);

struct extent_buffer *btrfs_find_old_tree_block(struct btrfs_root *root,

						u64 bytenr, u32 blocksize,

						u64 time_seq);

static int btrfs_prev_leaf(struct btrfs_root *root, struct btrfs_path *path);



struct btrfs_path *btrfs_alloc_path(void)

{
@@ -208,7 +203,7 @@ struct extent_buffer *btrfs_lock_root_node(struct btrfs_root *root) 
 * tree until you end up with a lock on the root.  A locked buffer

 * is returned, with a reference held.

 */

struct extent_buffer *btrfs_read_lock_root_node(struct btrfs_root *root)

static struct extent_buffer *btrfs_read_lock_root_node(struct btrfs_root *root)

{

	struct extent_buffer *eb;