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
78ac4f9e
Commit
78ac4f9e
authored
Mar 20, 2019
by
David Sterba
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
btrfs: remove unused parameter fs_info from btrfs_truncate_item
Signed-off-by:
David Sterba
<
dsterba@suse.com
>
parent
25263cd7
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
12 additions
and
17 deletions
+12
-17
fs/btrfs/ctree.c
fs/btrfs/ctree.c
+1
-2
fs/btrfs/ctree.h
fs/btrfs/ctree.h
+1
-2
fs/btrfs/dir-item.c
fs/btrfs/dir-item.c
+1
-2
fs/btrfs/extent-tree.c
fs/btrfs/extent-tree.c
+1
-2
fs/btrfs/file-item.c
fs/btrfs/file-item.c
+2
-2
fs/btrfs/inode-item.c
fs/btrfs/inode-item.c
+2
-2
fs/btrfs/inode.c
fs/btrfs/inode.c
+1
-1
fs/btrfs/tree-log.c
fs/btrfs/tree-log.c
+1
-1
fs/btrfs/uuid-tree.c
fs/btrfs/uuid-tree.c
+1
-1
fs/btrfs/xattr.c
fs/btrfs/xattr.c
+1
-2
No files found.
fs/btrfs/ctree.c
View file @
78ac4f9e
...
...
@@ -4541,8 +4541,7 @@ int btrfs_duplicate_item(struct btrfs_trans_handle *trans,
* off the end of the item or if we shift the item to chop bytes off
* the front.
*/
void
btrfs_truncate_item
(
struct
btrfs_fs_info
*
fs_info
,
struct
btrfs_path
*
path
,
u32
new_size
,
int
from_end
)
void
btrfs_truncate_item
(
struct
btrfs_path
*
path
,
u32
new_size
,
int
from_end
)
{
int
slot
;
struct
extent_buffer
*
leaf
;
...
...
fs/btrfs/ctree.h
View file @
78ac4f9e
...
...
@@ -2932,8 +2932,7 @@ int btrfs_block_can_be_shared(struct btrfs_root *root,
struct
extent_buffer
*
buf
);
void
btrfs_extend_item
(
struct
btrfs_fs_info
*
fs_info
,
struct
btrfs_path
*
path
,
u32
data_size
);
void
btrfs_truncate_item
(
struct
btrfs_fs_info
*
fs_info
,
struct
btrfs_path
*
path
,
u32
new_size
,
int
from_end
);
void
btrfs_truncate_item
(
struct
btrfs_path
*
path
,
u32
new_size
,
int
from_end
);
int
btrfs_split_item
(
struct
btrfs_trans_handle
*
trans
,
struct
btrfs_root
*
root
,
struct
btrfs_path
*
path
,
...
...
fs/btrfs/dir-item.c
View file @
78ac4f9e
...
...
@@ -429,8 +429,7 @@ int btrfs_delete_one_dir_name(struct btrfs_trans_handle *trans,
start
=
btrfs_item_ptr_offset
(
leaf
,
path
->
slots
[
0
]);
memmove_extent_buffer
(
leaf
,
ptr
,
ptr
+
sub_item_len
,
item_len
-
(
ptr
+
sub_item_len
-
start
));
btrfs_truncate_item
(
root
->
fs_info
,
path
,
item_len
-
sub_item_len
,
1
);
btrfs_truncate_item
(
path
,
item_len
-
sub_item_len
,
1
);
}
return
ret
;
}
fs/btrfs/extent-tree.c
View file @
78ac4f9e
...
...
@@ -1780,7 +1780,6 @@ void update_inline_extent_backref(struct btrfs_path *path,
int
*
last_ref
)
{
struct
extent_buffer
*
leaf
=
path
->
nodes
[
0
];
struct
btrfs_fs_info
*
fs_info
=
leaf
->
fs_info
;
struct
btrfs_extent_item
*
ei
;
struct
btrfs_extent_data_ref
*
dref
=
NULL
;
struct
btrfs_shared_data_ref
*
sref
=
NULL
;
...
...
@@ -1835,7 +1834,7 @@ void update_inline_extent_backref(struct btrfs_path *path,
memmove_extent_buffer
(
leaf
,
ptr
,
ptr
+
size
,
end
-
ptr
-
size
);
item_size
-=
size
;
btrfs_truncate_item
(
fs_info
,
path
,
item_size
,
1
);
btrfs_truncate_item
(
path
,
item_size
,
1
);
}
btrfs_mark_buffer_dirty
(
leaf
);
}
...
...
fs/btrfs/file-item.c
View file @
78ac4f9e
...
...
@@ -547,7 +547,7 @@ static noinline void truncate_one_csum(struct btrfs_fs_info *fs_info,
*/
u32
new_size
=
(
bytenr
-
key
->
offset
)
>>
blocksize_bits
;
new_size
*=
csum_size
;
btrfs_truncate_item
(
fs_info
,
path
,
new_size
,
1
);
btrfs_truncate_item
(
path
,
new_size
,
1
);
}
else
if
(
key
->
offset
>=
bytenr
&&
csum_end
>
end_byte
&&
end_byte
>
key
->
offset
)
{
/*
...
...
@@ -559,7 +559,7 @@ static noinline void truncate_one_csum(struct btrfs_fs_info *fs_info,
u32
new_size
=
(
csum_end
-
end_byte
)
>>
blocksize_bits
;
new_size
*=
csum_size
;
btrfs_truncate_item
(
fs_info
,
path
,
new_size
,
0
);
btrfs_truncate_item
(
path
,
new_size
,
0
);
key
->
offset
=
end_byte
;
btrfs_set_item_key_safe
(
fs_info
,
path
,
key
);
...
...
fs/btrfs/inode-item.c
View file @
78ac4f9e
...
...
@@ -170,7 +170,7 @@ static int btrfs_del_inode_extref(struct btrfs_trans_handle *trans,
memmove_extent_buffer
(
leaf
,
ptr
,
ptr
+
del_len
,
item_size
-
(
ptr
+
del_len
-
item_start
));
btrfs_truncate_item
(
root
->
fs_info
,
path
,
item_size
-
del_len
,
1
);
btrfs_truncate_item
(
path
,
item_size
-
del_len
,
1
);
out:
btrfs_free_path
(
path
);
...
...
@@ -234,7 +234,7 @@ int btrfs_del_inode_ref(struct btrfs_trans_handle *trans,
item_start
=
btrfs_item_ptr_offset
(
leaf
,
path
->
slots
[
0
]);
memmove_extent_buffer
(
leaf
,
ptr
,
ptr
+
sub_item_len
,
item_size
-
(
ptr
+
sub_item_len
-
item_start
));
btrfs_truncate_item
(
root
->
fs_info
,
path
,
item_size
-
sub_item_len
,
1
);
btrfs_truncate_item
(
path
,
item_size
-
sub_item_len
,
1
);
out:
btrfs_free_path
(
path
);
...
...
fs/btrfs/inode.c
View file @
78ac4f9e
...
...
@@ -4669,7 +4669,7 @@ int btrfs_truncate_inode_items(struct btrfs_trans_handle *trans,
btrfs_set_file_extent_ram_bytes
(
leaf
,
fi
,
size
);
size
=
btrfs_file_extent_calc_inline_size
(
size
);
btrfs_truncate_item
(
root
->
fs_info
,
path
,
size
,
1
);
btrfs_truncate_item
(
path
,
size
,
1
);
}
else
if
(
!
del_item
)
{
/*
* We have to bail so the last_size is set to
...
...
fs/btrfs/tree-log.c
View file @
78ac4f9e
...
...
@@ -465,7 +465,7 @@ static noinline int overwrite_item(struct btrfs_trans_handle *trans,
found_size
=
btrfs_item_size_nr
(
path
->
nodes
[
0
],
path
->
slots
[
0
]);
if
(
found_size
>
item_size
)
btrfs_truncate_item
(
fs_info
,
path
,
item_size
,
1
);
btrfs_truncate_item
(
path
,
item_size
,
1
);
else
if
(
found_size
<
item_size
)
btrfs_extend_item
(
fs_info
,
path
,
item_size
-
found_size
);
...
...
fs/btrfs/uuid-tree.c
View file @
78ac4f9e
...
...
@@ -219,7 +219,7 @@ int btrfs_uuid_tree_remove(struct btrfs_trans_handle *trans, u8 *uuid, u8 type,
move_src
=
offset
+
sizeof
(
subid
);
move_len
=
item_size
-
(
move_src
-
btrfs_item_ptr_offset
(
eb
,
slot
));
memmove_extent_buffer
(
eb
,
move_dst
,
move_src
,
move_len
);
btrfs_truncate_item
(
fs_info
,
path
,
item_size
-
sizeof
(
subid
),
1
);
btrfs_truncate_item
(
path
,
item_size
-
sizeof
(
subid
),
1
);
out:
btrfs_free_path
(
path
);
...
...
fs/btrfs/xattr.c
View file @
78ac4f9e
...
...
@@ -188,8 +188,7 @@ int btrfs_setxattr(struct btrfs_trans_handle *trans, struct inode *inode,
btrfs_extend_item
(
fs_info
,
path
,
size
-
old_data_len
);
else
if
(
size
<
old_data_len
)
btrfs_truncate_item
(
fs_info
,
path
,
data_size
,
1
);
btrfs_truncate_item
(
path
,
data_size
,
1
);
}
else
{
/* There are other xattrs packed in the same item. */
ret
=
btrfs_delete_one_dir_name
(
trans
,
root
,
path
,
di
);
...
...
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