Skip to content

Commit

Permalink
Btrfs: trivial sparse fixes
Browse files Browse the repository at this point in the history
Fix a bunch of trivial sparse complaints.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Chris Mason <chris.mason@oracle.com>
  • Loading branch information
Christoph Hellwig authored and Chris Mason committed Sep 25, 2008
1 parent a237d2a commit b214107
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 11 deletions.
2 changes: 0 additions & 2 deletions fs/btrfs/ctree.c
Original file line number Diff line number Diff line change
Expand Up @@ -2749,7 +2749,6 @@ int btrfs_insert_empty_items(struct btrfs_trans_handle *trans,
BUG_ON(slot < 0);

if (slot != nritems) {
int i;
unsigned int old_data = btrfs_item_end_nr(leaf, slot);

if (old_data < data_end) {
Expand Down Expand Up @@ -2913,7 +2912,6 @@ int btrfs_del_items(struct btrfs_trans_handle *trans, struct btrfs_root *root,
nritems = btrfs_header_nritems(leaf);

if (slot + nr != nritems) {
int i;
int data_end = leaf_data_end(root, leaf);

memmove_extent_buffer(leaf, btrfs_leaf_data(leaf) +
Expand Down
6 changes: 2 additions & 4 deletions fs/btrfs/extent_io.c
Original file line number Diff line number Diff line change
Expand Up @@ -3400,10 +3400,8 @@ int try_release_extent_buffer(struct extent_io_tree *tree, struct page *page)
}
/* at this point we can safely release the extent buffer */
num_pages = num_extent_pages(eb->start, eb->len);
for (i = 0; i < num_pages; i++) {
struct page *page = extent_buffer_page(eb, i);
page_cache_release(page);
}
for (i = 0; i < num_pages; i++)
page_cache_release(extent_buffer_page(eb, i));
rb_erase(&eb->rb_node, &tree->buffer);
__free_extent_buffer(eb);
out:
Expand Down
2 changes: 1 addition & 1 deletion fs/btrfs/ioctl.c
Original file line number Diff line number Diff line change
Expand Up @@ -739,7 +739,7 @@ long btrfs_ioctl_trans_end(struct file *file)
goto out;
}
btrfs_end_transaction(trans, root);
file->private_data = 0;
file->private_data = NULL;

mutex_lock(&root->fs_info->trans_mutex);
root->fs_info->open_ioctl_trans--;
Expand Down
8 changes: 4 additions & 4 deletions fs/btrfs/sysfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -254,15 +254,15 @@ void btrfs_sysfs_del_super(struct btrfs_fs_info *fs)
wait_for_completion(&fs->kobj_unregister);
}

int btrfs_init_sysfs()
int btrfs_init_sysfs(void)
{
btrfs_kset = kset_create_and_add("btrfs", NULL, fs_kobj);
if (!btrfs_kset)
return -ENOMEM;
return 0;
}

void btrfs_exit_sysfs()
void btrfs_exit_sysfs(void)
{
kset_unregister(btrfs_kset);
}
Expand All @@ -289,12 +289,12 @@ void btrfs_sysfs_del_super(struct btrfs_fs_info *fs)
return;
}

int btrfs_init_sysfs()
int btrfs_init_sysfs(void)
{
return 0;
}

void btrfs_exit_sysfs()
void btrfs_exit_sysfs(void)
{
return;
}
Expand Down

0 comments on commit b214107

Please sign in to comment.