Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
a4f78750
Commit
a4f78750
authored
Jun 29, 2017
by
David Sterba
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
btrfs: get fs_info from eb in btrfs_print_leaf, remove argument
Signed-off-by:
David Sterba
<
dsterba@suse.com
>
parent
f1b8a1e8
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
17 additions
and
15 deletions
+17
-15
fs/btrfs/ctree.c
fs/btrfs/ctree.c
+7
-7
fs/btrfs/disk-io.c
fs/btrfs/disk-io.c
+1
-1
fs/btrfs/extent-tree.c
fs/btrfs/extent-tree.c
+3
-3
fs/btrfs/print-tree.c
fs/btrfs/print-tree.c
+4
-2
fs/btrfs/print-tree.h
fs/btrfs/print-tree.h
+1
-1
fs/btrfs/root-tree.c
fs/btrfs/root-tree.c
+1
-1
No files found.
fs/btrfs/ctree.c
View file @
a4f78750
...
@@ -4650,7 +4650,7 @@ void btrfs_truncate_item(struct btrfs_fs_info *fs_info,
...
@@ -4650,7 +4650,7 @@ void btrfs_truncate_item(struct btrfs_fs_info *fs_info,
btrfs_mark_buffer_dirty
(
leaf
);
btrfs_mark_buffer_dirty
(
leaf
);
if
(
btrfs_leaf_free_space
(
fs_info
,
leaf
)
<
0
)
{
if
(
btrfs_leaf_free_space
(
fs_info
,
leaf
)
<
0
)
{
btrfs_print_leaf
(
fs_info
,
leaf
);
btrfs_print_leaf
(
leaf
);
BUG
();
BUG
();
}
}
}
}
...
@@ -4679,7 +4679,7 @@ void btrfs_extend_item(struct btrfs_fs_info *fs_info, struct btrfs_path *path,
...
@@ -4679,7 +4679,7 @@ void btrfs_extend_item(struct btrfs_fs_info *fs_info, struct btrfs_path *path,
data_end
=
leaf_data_end
(
fs_info
,
leaf
);
data_end
=
leaf_data_end
(
fs_info
,
leaf
);
if
(
btrfs_leaf_free_space
(
fs_info
,
leaf
)
<
data_size
)
{
if
(
btrfs_leaf_free_space
(
fs_info
,
leaf
)
<
data_size
)
{
btrfs_print_leaf
(
fs_info
,
leaf
);
btrfs_print_leaf
(
leaf
);
BUG
();
BUG
();
}
}
slot
=
path
->
slots
[
0
];
slot
=
path
->
slots
[
0
];
...
@@ -4687,7 +4687,7 @@ void btrfs_extend_item(struct btrfs_fs_info *fs_info, struct btrfs_path *path,
...
@@ -4687,7 +4687,7 @@ void btrfs_extend_item(struct btrfs_fs_info *fs_info, struct btrfs_path *path,
BUG_ON
(
slot
<
0
);
BUG_ON
(
slot
<
0
);
if
(
slot
>=
nritems
)
{
if
(
slot
>=
nritems
)
{
btrfs_print_leaf
(
fs_info
,
leaf
);
btrfs_print_leaf
(
leaf
);
btrfs_crit
(
fs_info
,
"slot %d too large, nritems %d"
,
btrfs_crit
(
fs_info
,
"slot %d too large, nritems %d"
,
slot
,
nritems
);
slot
,
nritems
);
BUG_ON
(
1
);
BUG_ON
(
1
);
...
@@ -4718,7 +4718,7 @@ void btrfs_extend_item(struct btrfs_fs_info *fs_info, struct btrfs_path *path,
...
@@ -4718,7 +4718,7 @@ void btrfs_extend_item(struct btrfs_fs_info *fs_info, struct btrfs_path *path,
btrfs_mark_buffer_dirty
(
leaf
);
btrfs_mark_buffer_dirty
(
leaf
);
if
(
btrfs_leaf_free_space
(
fs_info
,
leaf
)
<
0
)
{
if
(
btrfs_leaf_free_space
(
fs_info
,
leaf
)
<
0
)
{
btrfs_print_leaf
(
fs_info
,
leaf
);
btrfs_print_leaf
(
leaf
);
BUG
();
BUG
();
}
}
}
}
...
@@ -4757,7 +4757,7 @@ void setup_items_for_insert(struct btrfs_root *root, struct btrfs_path *path,
...
@@ -4757,7 +4757,7 @@ void setup_items_for_insert(struct btrfs_root *root, struct btrfs_path *path,
data_end
=
leaf_data_end
(
fs_info
,
leaf
);
data_end
=
leaf_data_end
(
fs_info
,
leaf
);
if
(
btrfs_leaf_free_space
(
fs_info
,
leaf
)
<
total_size
)
{
if
(
btrfs_leaf_free_space
(
fs_info
,
leaf
)
<
total_size
)
{
btrfs_print_leaf
(
fs_info
,
leaf
);
btrfs_print_leaf
(
leaf
);
btrfs_crit
(
fs_info
,
"not enough freespace need %u have %d"
,
btrfs_crit
(
fs_info
,
"not enough freespace need %u have %d"
,
total_size
,
btrfs_leaf_free_space
(
fs_info
,
leaf
));
total_size
,
btrfs_leaf_free_space
(
fs_info
,
leaf
));
BUG
();
BUG
();
...
@@ -4767,7 +4767,7 @@ void setup_items_for_insert(struct btrfs_root *root, struct btrfs_path *path,
...
@@ -4767,7 +4767,7 @@ void setup_items_for_insert(struct btrfs_root *root, struct btrfs_path *path,
unsigned
int
old_data
=
btrfs_item_end_nr
(
leaf
,
slot
);
unsigned
int
old_data
=
btrfs_item_end_nr
(
leaf
,
slot
);
if
(
old_data
<
data_end
)
{
if
(
old_data
<
data_end
)
{
btrfs_print_leaf
(
fs_info
,
leaf
);
btrfs_print_leaf
(
leaf
);
btrfs_crit
(
fs_info
,
"slot %d old_data %d data_end %d"
,
btrfs_crit
(
fs_info
,
"slot %d old_data %d data_end %d"
,
slot
,
old_data
,
data_end
);
slot
,
old_data
,
data_end
);
BUG_ON
(
1
);
BUG_ON
(
1
);
...
@@ -4811,7 +4811,7 @@ void setup_items_for_insert(struct btrfs_root *root, struct btrfs_path *path,
...
@@ -4811,7 +4811,7 @@ void setup_items_for_insert(struct btrfs_root *root, struct btrfs_path *path,
btrfs_mark_buffer_dirty
(
leaf
);
btrfs_mark_buffer_dirty
(
leaf
);
if
(
btrfs_leaf_free_space
(
fs_info
,
leaf
)
<
0
)
{
if
(
btrfs_leaf_free_space
(
fs_info
,
leaf
)
<
0
)
{
btrfs_print_leaf
(
fs_info
,
leaf
);
btrfs_print_leaf
(
leaf
);
BUG
();
BUG
();
}
}
}
}
...
...
fs/btrfs/disk-io.c
View file @
a4f78750
...
@@ -3984,7 +3984,7 @@ void btrfs_mark_buffer_dirty(struct extent_buffer *buf)
...
@@ -3984,7 +3984,7 @@ void btrfs_mark_buffer_dirty(struct extent_buffer *buf)
fs_info
->
dirty_metadata_batch
);
fs_info
->
dirty_metadata_batch
);
#ifdef CONFIG_BTRFS_FS_CHECK_INTEGRITY
#ifdef CONFIG_BTRFS_FS_CHECK_INTEGRITY
if
(
btrfs_header_level
(
buf
)
==
0
&&
check_leaf
(
root
,
buf
))
{
if
(
btrfs_header_level
(
buf
)
==
0
&&
check_leaf
(
root
,
buf
))
{
btrfs_print_leaf
(
fs_info
,
buf
);
btrfs_print_leaf
(
buf
);
ASSERT
(
0
);
ASSERT
(
0
);
}
}
#endif
#endif
...
...
fs/btrfs/extent-tree.c
View file @
a4f78750
...
@@ -6960,7 +6960,7 @@ static int __btrfs_free_extent(struct btrfs_trans_handle *trans,
...
@@ -6960,7 +6960,7 @@ static int __btrfs_free_extent(struct btrfs_trans_handle *trans,
"umm, got %d back from search, was looking for %llu"
,
"umm, got %d back from search, was looking for %llu"
,
ret
,
bytenr
);
ret
,
bytenr
);
if
(
ret
>
0
)
if
(
ret
>
0
)
btrfs_print_leaf
(
info
,
path
->
nodes
[
0
]);
btrfs_print_leaf
(
path
->
nodes
[
0
]);
}
}
if
(
ret
<
0
)
{
if
(
ret
<
0
)
{
btrfs_abort_transaction
(
trans
,
ret
);
btrfs_abort_transaction
(
trans
,
ret
);
...
@@ -6969,7 +6969,7 @@ static int __btrfs_free_extent(struct btrfs_trans_handle *trans,
...
@@ -6969,7 +6969,7 @@ static int __btrfs_free_extent(struct btrfs_trans_handle *trans,
extent_slot
=
path
->
slots
[
0
];
extent_slot
=
path
->
slots
[
0
];
}
}
}
else
if
(
WARN_ON
(
ret
==
-
ENOENT
))
{
}
else
if
(
WARN_ON
(
ret
==
-
ENOENT
))
{
btrfs_print_leaf
(
info
,
path
->
nodes
[
0
]);
btrfs_print_leaf
(
path
->
nodes
[
0
]);
btrfs_err
(
info
,
btrfs_err
(
info
,
"unable to find ref byte nr %llu parent %llu root %llu owner %llu offset %llu"
,
"unable to find ref byte nr %llu parent %llu root %llu owner %llu offset %llu"
,
bytenr
,
parent
,
root_objectid
,
owner_objectid
,
bytenr
,
parent
,
root_objectid
,
owner_objectid
,
...
@@ -7006,7 +7006,7 @@ static int __btrfs_free_extent(struct btrfs_trans_handle *trans,
...
@@ -7006,7 +7006,7 @@ static int __btrfs_free_extent(struct btrfs_trans_handle *trans,
btrfs_err
(
info
,
btrfs_err
(
info
,
"umm, got %d back from search, was looking for %llu"
,
"umm, got %d back from search, was looking for %llu"
,
ret
,
bytenr
);
ret
,
bytenr
);
btrfs_print_leaf
(
info
,
path
->
nodes
[
0
]);
btrfs_print_leaf
(
path
->
nodes
[
0
]);
}
}
if
(
ret
<
0
)
{
if
(
ret
<
0
)
{
btrfs_abort_transaction
(
trans
,
ret
);
btrfs_abort_transaction
(
trans
,
ret
);
...
...
fs/btrfs/print-tree.c
View file @
a4f78750
...
@@ -161,8 +161,9 @@ static void print_uuid_item(struct extent_buffer *l, unsigned long offset,
...
@@ -161,8 +161,9 @@ static void print_uuid_item(struct extent_buffer *l, unsigned long offset,
}
}
}
}
void
btrfs_print_leaf
(
struct
btrfs_fs_info
*
fs_info
,
struct
extent_buffer
*
l
)
void
btrfs_print_leaf
(
struct
extent_buffer
*
l
)
{
{
struct
btrfs_fs_info
*
fs_info
;
int
i
;
int
i
;
u32
type
,
nr
;
u32
type
,
nr
;
struct
btrfs_item
*
item
;
struct
btrfs_item
*
item
;
...
@@ -180,6 +181,7 @@ void btrfs_print_leaf(struct btrfs_fs_info *fs_info, struct extent_buffer *l)
...
@@ -180,6 +181,7 @@ void btrfs_print_leaf(struct btrfs_fs_info *fs_info, struct extent_buffer *l)
if
(
!
l
)
if
(
!
l
)
return
;
return
;
fs_info
=
l
->
fs_info
;
nr
=
btrfs_header_nritems
(
l
);
nr
=
btrfs_header_nritems
(
l
);
btrfs_info
(
fs_info
,
"leaf %llu total ptrs %d free space %d"
,
btrfs_info
(
fs_info
,
"leaf %llu total ptrs %d free space %d"
,
...
@@ -329,7 +331,7 @@ void btrfs_print_tree(struct btrfs_fs_info *fs_info, struct extent_buffer *c)
...
@@ -329,7 +331,7 @@ void btrfs_print_tree(struct btrfs_fs_info *fs_info, struct extent_buffer *c)
nr
=
btrfs_header_nritems
(
c
);
nr
=
btrfs_header_nritems
(
c
);
level
=
btrfs_header_level
(
c
);
level
=
btrfs_header_level
(
c
);
if
(
level
==
0
)
{
if
(
level
==
0
)
{
btrfs_print_leaf
(
fs_info
,
c
);
btrfs_print_leaf
(
c
);
return
;
return
;
}
}
btrfs_info
(
fs_info
,
btrfs_info
(
fs_info
,
...
...
fs/btrfs/print-tree.h
View file @
a4f78750
...
@@ -18,6 +18,6 @@
...
@@ -18,6 +18,6 @@
#ifndef __PRINT_TREE_
#ifndef __PRINT_TREE_
#define __PRINT_TREE_
#define __PRINT_TREE_
void
btrfs_print_leaf
(
struct
btrfs_fs_info
*
fs_info
,
struct
extent_buffer
*
l
);
void
btrfs_print_leaf
(
struct
extent_buffer
*
l
);
void
btrfs_print_tree
(
struct
btrfs_fs_info
*
fs_info
,
struct
extent_buffer
*
c
);
void
btrfs_print_tree
(
struct
btrfs_fs_info
*
fs_info
,
struct
extent_buffer
*
c
);
#endif
#endif
fs/btrfs/root-tree.c
View file @
a4f78750
...
@@ -151,7 +151,7 @@ int btrfs_update_root(struct btrfs_trans_handle *trans, struct btrfs_root
...
@@ -151,7 +151,7 @@ int btrfs_update_root(struct btrfs_trans_handle *trans, struct btrfs_root
}
}
if
(
ret
!=
0
)
{
if
(
ret
!=
0
)
{
btrfs_print_leaf
(
fs_info
,
path
->
nodes
[
0
]);
btrfs_print_leaf
(
path
->
nodes
[
0
]);
btrfs_crit
(
fs_info
,
"unable to update root key %llu %u %llu"
,
btrfs_crit
(
fs_info
,
"unable to update root key %llu %u %llu"
,
key
->
objectid
,
key
->
type
,
key
->
offset
);
key
->
objectid
,
key
->
type
,
key
->
offset
);
BUG_ON
(
1
);
BUG_ON
(
1
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment