RepoMirrors/btrfs-progs
1
0
Fork 0
mirror of https://github.com/kdave/btrfs-progs synced 2025-04-22 06:55:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

btrfs-progs: remove unused parameter from btrfs_header_fsid

Browse Source 
Remove unused parameter, 'eb'. Unused since introduction in
7777e63b42

Signed-off-by: Ross Kirk <ross.kirk@gmail.com>
Reviewed-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: David Sterba <dsterba@suse.cz>
Signed-off-by: Chris Mason <chris.mason@fusionio.com>
This commit is contained in:
Ross Kirk 2013-09-20 14:27:32 +01:00 committed by Chris Mason
parent af86684e9b
commit db6feaadfe
8 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
chunk-recover.c
View File

@ -743,7 +743,7 @@ static int scan_one_device(struct recover_control *rc, int fd,
break; break;
if (memcmp_extent_buffer(buf, rc->fs_devices->fsid, if (memcmp_extent_buffer(buf, rc->fs_devices->fsid,
(unsigned long)btrfs_header_fsid(buf), (unsigned long)btrfs_header_fsid(),
BTRFS_FSID_SIZE)) { BTRFS_FSID_SIZE)) {
bytenr += rc->sectorsize; bytenr += rc->sectorsize;
continue; continue;
@ -1044,7 +1044,7 @@ static int __rebuild_chunk_root(struct btrfs_trans_handle *trans,
btrfs_set_header_backref_rev(cow, BTRFS_MIXED_BACKREF_REV); btrfs_set_header_backref_rev(cow, BTRFS_MIXED_BACKREF_REV);
btrfs_set_header_owner(cow, BTRFS_CHUNK_TREE_OBJECTID); btrfs_set_header_owner(cow, BTRFS_CHUNK_TREE_OBJECTID);
write_extent_buffer(cow, root->fs_info->fsid, write_extent_buffer(cow, root->fs_info->fsid,
(unsigned long)btrfs_header_fsid(cow), (unsigned long)btrfs_header_fsid(),
BTRFS_FSID_SIZE); BTRFS_FSID_SIZE);
write_extent_buffer(cow, root->fs_info->chunk_tree_uuid, write_extent_buffer(cow, root->fs_info->chunk_tree_uuid,

2
cmds-check.c
View File

@ -5597,7 +5597,7 @@ init:
btrfs_set_header_owner(c, root->root_key.objectid); btrfs_set_header_owner(c, root->root_key.objectid);
write_extent_buffer(c, root->fs_info->fsid, write_extent_buffer(c, root->fs_info->fsid,
(unsigned long)btrfs_header_fsid(c), (unsigned long)btrfs_header_fsid(),
BTRFS_FSID_SIZE); BTRFS_FSID_SIZE);
write_extent_buffer(c, root->fs_info->chunk_tree_uuid, write_extent_buffer(c, root->fs_info->chunk_tree_uuid,

4
cmds-chunk.c
View File

@ -744,7 +744,7 @@ static int scan_one_device(struct recover_control *rc, int fd,
break; break;
if (memcmp_extent_buffer(buf, rc->fs_devices->fsid, if (memcmp_extent_buffer(buf, rc->fs_devices->fsid,
(unsigned long)btrfs_header_fsid(buf), (unsigned long)btrfs_header_fsid(),
BTRFS_FSID_SIZE)) { BTRFS_FSID_SIZE)) {
bytenr += rc->sectorsize; bytenr += rc->sectorsize;
continue; continue;
@ -1047,7 +1047,7 @@ static int __rebuild_chunk_root(struct btrfs_trans_handle *trans,
btrfs_set_header_backref_rev(cow, BTRFS_MIXED_BACKREF_REV); btrfs_set_header_backref_rev(cow, BTRFS_MIXED_BACKREF_REV);
btrfs_set_header_owner(cow, BTRFS_CHUNK_TREE_OBJECTID); btrfs_set_header_owner(cow, BTRFS_CHUNK_TREE_OBJECTID);
write_extent_buffer(cow, root->fs_info->fsid, write_extent_buffer(cow, root->fs_info->fsid,
(unsigned long)btrfs_header_fsid(cow), (unsigned long)btrfs_header_fsid(),
BTRFS_FSID_SIZE); BTRFS_FSID_SIZE);
write_extent_buffer(cow, root->fs_info->chunk_tree_uuid, write_extent_buffer(cow, root->fs_info->chunk_tree_uuid,

10
ctree.c
View File

@ -118,7 +118,7 @@ int btrfs_copy_root(struct btrfs_trans_handle *trans,
btrfs_set_header_owner(cow, new_root_objectid); btrfs_set_header_owner(cow, new_root_objectid);
write_extent_buffer(cow, root->fs_info->fsid, write_extent_buffer(cow, root->fs_info->fsid,
(unsigned long)btrfs_header_fsid(cow), (unsigned long)btrfs_header_fsid(),
BTRFS_FSID_SIZE); BTRFS_FSID_SIZE);
WARN_ON(btrfs_header_generation(buf) > trans->transid); WARN_ON(btrfs_header_generation(buf) > trans->transid);
@ -292,7 +292,7 @@ int __btrfs_cow_block(struct btrfs_trans_handle *trans,
btrfs_set_header_owner(cow, root->root_key.objectid); btrfs_set_header_owner(cow, root->root_key.objectid);
write_extent_buffer(cow, root->fs_info->fsid, write_extent_buffer(cow, root->fs_info->fsid,
(unsigned long)btrfs_header_fsid(cow), (unsigned long)btrfs_header_fsid(),
BTRFS_FSID_SIZE); BTRFS_FSID_SIZE);
WARN_ON(btrfs_header_generation(buf) > trans->transid); WARN_ON(btrfs_header_generation(buf) > trans->transid);
@ -1338,7 +1338,7 @@ static int noinline insert_new_root(struct btrfs_trans_handle *trans,
btrfs_set_header_owner(c, root->root_key.objectid); btrfs_set_header_owner(c, root->root_key.objectid);
write_extent_buffer(c, root->fs_info->fsid, write_extent_buffer(c, root->fs_info->fsid,
(unsigned long)btrfs_header_fsid(c), (unsigned long)btrfs_header_fsid(),
BTRFS_FSID_SIZE); BTRFS_FSID_SIZE);
write_extent_buffer(c, root->fs_info->chunk_tree_uuid, write_extent_buffer(c, root->fs_info->chunk_tree_uuid,
@ -1459,7 +1459,7 @@ static int split_node(struct btrfs_trans_handle *trans, struct btrfs_root
btrfs_set_header_backref_rev(split, BTRFS_MIXED_BACKREF_REV); btrfs_set_header_backref_rev(split, BTRFS_MIXED_BACKREF_REV);
btrfs_set_header_owner(split, root->root_key.objectid); btrfs_set_header_owner(split, root->root_key.objectid);
write_extent_buffer(split, root->fs_info->fsid, write_extent_buffer(split, root->fs_info->fsid,
(unsigned long)btrfs_header_fsid(split), (unsigned long)btrfs_header_fsid(),
BTRFS_FSID_SIZE); BTRFS_FSID_SIZE);
write_extent_buffer(split, root->fs_info->chunk_tree_uuid, write_extent_buffer(split, root->fs_info->chunk_tree_uuid,
(unsigned long)btrfs_header_chunk_tree_uuid(split), (unsigned long)btrfs_header_chunk_tree_uuid(split),
@ -2020,7 +2020,7 @@ again:
btrfs_set_header_owner(right, root->root_key.objectid); btrfs_set_header_owner(right, root->root_key.objectid);
btrfs_set_header_level(right, 0); btrfs_set_header_level(right, 0);
write_extent_buffer(right, root->fs_info->fsid, write_extent_buffer(right, root->fs_info->fsid,
(unsigned long)btrfs_header_fsid(right), (unsigned long)btrfs_header_fsid(),
BTRFS_FSID_SIZE); BTRFS_FSID_SIZE);
write_extent_buffer(right, root->fs_info->chunk_tree_uuid, write_extent_buffer(right, root->fs_info->chunk_tree_uuid,

2
ctree.h
View File

@ -1777,7 +1777,7 @@ static inline void btrfs_set_header_backref_rev(struct extent_buffer *eb,
btrfs_set_header_flags(eb, flags); btrfs_set_header_flags(eb, flags);
} }
static inline u8 *btrfs_header_fsid(struct extent_buffer *eb) static inline u8 *btrfs_header_fsid(void)
{ {
unsigned long ptr = offsetof(struct btrfs_header, fsid); unsigned long ptr = offsetof(struct btrfs_header, fsid);
return (u8 *)ptr; return (u8 *)ptr;

2
disk-io.c
View File

@ -50,7 +50,7 @@ static int check_tree_block(struct btrfs_root *root, struct extent_buffer *buf)
fs_devices = root->fs_info->fs_devices; fs_devices = root->fs_info->fs_devices;
while (fs_devices) { while (fs_devices) {
if (!memcmp_extent_buffer(buf, fs_devices->fsid, if (!memcmp_extent_buffer(buf, fs_devices->fsid,
(unsigned long)btrfs_header_fsid(buf), (unsigned long)btrfs_header_fsid(),
BTRFS_FSID_SIZE)) { BTRFS_FSID_SIZE)) {
ret = 0; ret = 0;
break; break;

2
print-tree.c
View File

@ -191,7 +191,7 @@ static void print_uuids(struct extent_buffer *eb)
char chunk_uuid[37]; char chunk_uuid[37];
u8 disk_uuid[BTRFS_UUID_SIZE]; u8 disk_uuid[BTRFS_UUID_SIZE];
read_extent_buffer(eb, disk_uuid, (unsigned long)btrfs_header_fsid(eb), read_extent_buffer(eb, disk_uuid, (unsigned long)btrfs_header_fsid(),
BTRFS_FSID_SIZE); BTRFS_FSID_SIZE);
fs_uuid[36] = '\0'; fs_uuid[36] = '\0';

2
utils.c
View File

@ -137,7 +137,7 @@ int make_btrfs(int fd, const char *device, const char *label,
btrfs_set_header_backref_rev(buf, BTRFS_MIXED_BACKREF_REV); btrfs_set_header_backref_rev(buf, BTRFS_MIXED_BACKREF_REV);
btrfs_set_header_owner(buf, BTRFS_ROOT_TREE_OBJECTID); btrfs_set_header_owner(buf, BTRFS_ROOT_TREE_OBJECTID);
write_extent_buffer(buf, super.fsid, (unsigned long) write_extent_buffer(buf, super.fsid, (unsigned long)
btrfs_header_fsid(buf), BTRFS_FSID_SIZE); btrfs_header_fsid(), BTRFS_FSID_SIZE);
write_extent_buffer(buf, chunk_tree_uuid, (unsigned long) write_extent_buffer(buf, chunk_tree_uuid, (unsigned long)
btrfs_header_chunk_tree_uuid(buf), btrfs_header_chunk_tree_uuid(buf),