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
nexedi
linux
Commits
bd09835d
Commit
bd09835d
authored
Jan 03, 2008
by
Chris Mason
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
count_snapshots: Properly update the leaf pointer after btrfs_next_leaf
Signed-off-by:
Chris Mason
<
chris.mason@oracle.com
>
parent
98ed5174
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
fs/btrfs/extent-tree.c
fs/btrfs/extent-tree.c
+2
-2
fs/btrfs/inode.c
fs/btrfs/inode.c
+1
-1
No files found.
fs/btrfs/extent-tree.c
View file @
bd09835d
...
@@ -693,7 +693,6 @@ u32 btrfs_count_snapshots_in_path(struct btrfs_root *root,
...
@@ -693,7 +693,6 @@ u32 btrfs_count_snapshots_in_path(struct btrfs_root *root,
u64
root_objectid
=
root
->
root_key
.
objectid
;
u64
root_objectid
=
root
->
root_key
.
objectid
;
u32
total_count
=
0
;
u32
total_count
=
0
;
u32
cur_count
;
u32
cur_count
;
u32
refs
;
u32
nritems
;
u32
nritems
;
int
ret
;
int
ret
;
struct
btrfs_key
key
;
struct
btrfs_key
key
;
...
@@ -729,8 +728,8 @@ u32 btrfs_count_snapshots_in_path(struct btrfs_root *root,
...
@@ -729,8 +728,8 @@ u32 btrfs_count_snapshots_in_path(struct btrfs_root *root,
}
}
item
=
btrfs_item_ptr
(
l
,
path
->
slots
[
0
],
struct
btrfs_extent_item
);
item
=
btrfs_item_ptr
(
l
,
path
->
slots
[
0
],
struct
btrfs_extent_item
);
refs
=
btrfs_extent_refs
(
l
,
item
);
while
(
1
)
{
while
(
1
)
{
l
=
path
->
nodes
[
0
];
nritems
=
btrfs_header_nritems
(
l
);
nritems
=
btrfs_header_nritems
(
l
);
if
(
path
->
slots
[
0
]
>=
nritems
)
{
if
(
path
->
slots
[
0
]
>=
nritems
)
{
ret
=
btrfs_next_leaf
(
extent_root
,
path
);
ret
=
btrfs_next_leaf
(
extent_root
,
path
);
...
@@ -741,6 +740,7 @@ u32 btrfs_count_snapshots_in_path(struct btrfs_root *root,
...
@@ -741,6 +740,7 @@ u32 btrfs_count_snapshots_in_path(struct btrfs_root *root,
btrfs_item_key_to_cpu
(
l
,
&
found_key
,
path
->
slots
[
0
]);
btrfs_item_key_to_cpu
(
l
,
&
found_key
,
path
->
slots
[
0
]);
if
(
found_key
.
objectid
!=
bytenr
)
if
(
found_key
.
objectid
!=
bytenr
)
break
;
break
;
if
(
found_key
.
type
!=
BTRFS_EXTENT_REF_KEY
)
{
if
(
found_key
.
type
!=
BTRFS_EXTENT_REF_KEY
)
{
path
->
slots
[
0
]
++
;
path
->
slots
[
0
]
++
;
continue
;
continue
;
...
...
fs/btrfs/inode.c
View file @
bd09835d
...
@@ -208,7 +208,7 @@ static int run_delalloc_nocow(struct inode *inode, u64 start, u64 end)
...
@@ -208,7 +208,7 @@ static int run_delalloc_nocow(struct inode *inode, u64 start, u64 end)
}
}
start
=
extent_end
;
start
=
extent_end
;
}
else
if
(
found_type
==
BTRFS_FILE_EXTENT_INLINE
)
{
}
else
{
goto
not_found
;
goto
not_found
;
}
}
loop:
loop:
...
...
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