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
ecaeb14b
Commit
ecaeb14b
authored
Oct 08, 2015
by
David Sterba
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
btrfs: switch message printers to _in_rcu variants
Signed-off-by:
David Sterba
<
dsterba@suse.com
>
parent
08a84e25
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
27 additions
and
27 deletions
+27
-27
fs/btrfs/check-integrity.c
fs/btrfs/check-integrity.c
+2
-2
fs/btrfs/dev-replace.c
fs/btrfs/dev-replace.c
+8
-8
fs/btrfs/ioctl.c
fs/btrfs/ioctl.c
+1
-1
fs/btrfs/scrub.c
fs/btrfs/scrub.c
+7
-7
fs/btrfs/volumes.c
fs/btrfs/volumes.c
+9
-9
No files found.
fs/btrfs/check-integrity.c
View file @
ecaeb14b
...
...
@@ -845,8 +845,8 @@ static int btrfsic_process_superblock_dev_mirror(
superblock_tmp
->
never_written
=
0
;
superblock_tmp
->
mirror_num
=
1
+
superblock_mirror_num
;
if
(
state
->
print_mask
&
BTRFSIC_PRINT_MASK_SUPERBLOCK_WRITE
)
printk_in_rcu
(
KERN_INFO
"New initial S-block (bdev %p, %s)"
" @%llu (%s/%llu/%d)
\n
"
,
btrfs_info_in_rcu
(
device
->
dev_root
->
fs_info
,
"new initial S-block (bdev %p, %s) @%llu (%s/%llu/%d)
"
,
superblock_bdev
,
rcu_str_deref
(
device
->
name
),
dev_bytenr
,
dev_state
->
name
,
dev_bytenr
,
...
...
fs/btrfs/dev-replace.c
View file @
ecaeb14b
...
...
@@ -379,8 +379,8 @@ int btrfs_dev_replace_start(struct btrfs_root *root,
if
(
ret
)
btrfs_err
(
root
->
fs_info
,
"kobj add dev failed %d
\n
"
,
ret
);
printk_in_rcu
(
KERN_INFO
"
BTRFS: dev_replace from %s (devid %llu) to %s started
\n
"
,
btrfs_info_in_rcu
(
root
->
fs_info
,
"
dev_replace from %s (devid %llu) to %s started
"
,
src_device
->
missing
?
"<missing disk>"
:
rcu_str_deref
(
src_device
->
name
),
src_device
->
devid
,
...
...
@@ -523,8 +523,8 @@ static int btrfs_dev_replace_finishing(struct btrfs_fs_info *fs_info,
src_device
,
tgt_device
);
}
else
{
printk_in_rcu
(
KERN_ERR
"
BTRFS: btrfs_scrub_dev(%s, %llu, %s) failed %d
\n
"
,
btrfs_err_in_rcu
(
root
->
fs_info
,
"
btrfs_scrub_dev(%s, %llu, %s) failed %d
"
,
src_device
->
missing
?
"<missing disk>"
:
rcu_str_deref
(
src_device
->
name
),
src_device
->
devid
,
...
...
@@ -540,8 +540,8 @@ static int btrfs_dev_replace_finishing(struct btrfs_fs_info *fs_info,
return
scrub_ret
;
}
printk_in_rcu
(
KERN_INFO
"
BTRFS: dev_replace from %s (devid %llu) to %s finished
\n
"
,
btrfs_info_in_rcu
(
root
->
fs_info
,
"
dev_replace from %s (devid %llu) to %s finished
"
,
src_device
->
missing
?
"<missing disk>"
:
rcu_str_deref
(
src_device
->
name
),
src_device
->
devid
,
...
...
@@ -809,8 +809,8 @@ static int btrfs_dev_replace_kthread(void *data)
progress
=
status_args
->
status
.
progress_1000
;
kfree
(
status_args
);
progress
=
div_u64
(
progress
,
10
);
printk_in_rcu
(
KERN_INFO
"
BTRFS: continuing dev_replace from %s (devid %llu) to %s @%u%%
\n
"
,
btrfs_info_in_rcu
(
fs_info
,
"
continuing dev_replace from %s (devid %llu) to %s @%u%%
"
,
dev_replace
->
srcdev
->
missing
?
"<missing disk>"
:
rcu_str_deref
(
dev_replace
->
srcdev
->
name
),
dev_replace
->
srcdev
->
devid
,
...
...
fs/btrfs/ioctl.c
View file @
ecaeb14b
...
...
@@ -1579,7 +1579,7 @@ static noinline int btrfs_ioctl_resize(struct file *file,
new_size
=
div_u64
(
new_size
,
root
->
sectorsize
);
new_size
*=
root
->
sectorsize
;
printk_in_rcu
(
KERN_INFO
"BTRFS: new size for %s is %llu
\n
"
,
btrfs_info_in_rcu
(
root
->
fs_info
,
"new size for %s is %llu
"
,
rcu_str_deref
(
device
->
name
),
new_size
);
if
(
new_size
>
old_size
)
{
...
...
fs/btrfs/scrub.c
View file @
ecaeb14b
...
...
@@ -580,9 +580,9 @@ static int scrub_print_warning_inode(u64 inum, u64 offset, u64 root,
* hold all of the paths here
*/
for
(
i
=
0
;
i
<
ipath
->
fspath
->
elem_cnt
;
++
i
)
printk_in_rcu
(
KERN_WARNING
"BTRFS:
%s at logical %llu on dev "
btrfs_warn_in_rcu
(
fs_info
,
"
%s at logical %llu on dev "
"%s, sector %llu, root %llu, inode %llu, offset %llu, "
"length %llu, links %u (path: %s)
\n
"
,
swarn
->
errstr
,
"length %llu, links %u (path: %s)"
,
swarn
->
errstr
,
swarn
->
logical
,
rcu_str_deref
(
swarn
->
dev
->
name
),
(
unsigned
long
long
)
swarn
->
sector
,
root
,
inum
,
offset
,
min
(
isize
-
offset
,
(
u64
)
PAGE_SIZE
),
nlink
,
...
...
@@ -592,9 +592,9 @@ static int scrub_print_warning_inode(u64 inum, u64 offset, u64 root,
return
0
;
err:
printk_in_rcu
(
KERN_WARNING
"BTRFS:
%s at logical %llu on dev "
btrfs_warn_in_rcu
(
fs_info
,
"
%s at logical %llu on dev "
"%s, sector %llu, root %llu, inode %llu, offset %llu: path "
"resolving failed with ret=%d
\n
"
,
swarn
->
errstr
,
"resolving failed with ret=%d"
,
swarn
->
errstr
,
swarn
->
logical
,
rcu_str_deref
(
swarn
->
dev
->
name
),
(
unsigned
long
long
)
swarn
->
sector
,
root
,
inum
,
offset
,
ret
);
...
...
@@ -649,10 +649,10 @@ static void scrub_print_warning(const char *errstr, struct scrub_block *sblock)
ret
=
tree_backref_for_extent
(
&
ptr
,
eb
,
&
found_key
,
ei
,
item_size
,
&
ref_root
,
&
ref_level
);
printk_in_rcu
(
KERN_WARNING
"
BTRFS:
%s at logical %llu on dev %s, "
btrfs_warn_in_rcu
(
fs_info
,
"%s at logical %llu on dev %s, "
"sector %llu: metadata %s (level %d) in tree "
"%llu
\n
"
,
errstr
,
swarn
.
logical
,
"%llu"
,
errstr
,
swarn
.
logical
,
rcu_str_deref
(
dev
->
name
),
(
unsigned
long
long
)
swarn
.
sector
,
ref_level
?
"node"
:
"leaf"
,
...
...
fs/btrfs/volumes.c
View file @
ecaeb14b
...
...
@@ -6594,8 +6594,8 @@ static int update_dev_stat_item(struct btrfs_trans_handle *trans,
BUG_ON
(
!
path
);
ret
=
btrfs_search_slot
(
trans
,
dev_root
,
&
key
,
path
,
-
1
,
1
);
if
(
ret
<
0
)
{
printk_in_rcu
(
KERN_WARNING
"BTRFS: "
"error %d while searching for dev_stats item for device %s
!
\n
"
,
btrfs_warn_in_rcu
(
dev_root
->
fs_info
,
"error %d while searching for dev_stats item for device %s"
,
ret
,
rcu_str_deref
(
device
->
name
));
goto
out
;
}
...
...
@@ -6605,8 +6605,8 @@ static int update_dev_stat_item(struct btrfs_trans_handle *trans,
/* need to delete old one and insert a new one */
ret
=
btrfs_del_item
(
trans
,
dev_root
,
path
);
if
(
ret
!=
0
)
{
printk_in_rcu
(
KERN_WARNING
"BTRFS: "
"delete too small dev_stats item for device %s failed %d
!
\n
"
,
btrfs_warn_in_rcu
(
dev_root
->
fs_info
,
"delete too small dev_stats item for device %s failed %d"
,
rcu_str_deref
(
device
->
name
),
ret
);
goto
out
;
}
...
...
@@ -6619,9 +6619,9 @@ static int update_dev_stat_item(struct btrfs_trans_handle *trans,
ret
=
btrfs_insert_empty_item
(
trans
,
dev_root
,
path
,
&
key
,
sizeof
(
*
ptr
));
if
(
ret
<
0
)
{
printk_in_rcu
(
KERN_WARNING
"BTRFS: "
"insert dev_stats item for device %s failed %d!
\n
"
,
rcu_str_deref
(
device
->
name
),
ret
);
btrfs_warn_in_rcu
(
dev_root
->
fs_info
,
"insert dev_stats item for device %s failed %d
"
,
rcu_str_deref
(
device
->
name
),
ret
);
goto
out
;
}
}
...
...
@@ -6695,8 +6695,8 @@ static void btrfs_dev_stat_print_on_load(struct btrfs_device *dev)
if
(
i
==
BTRFS_DEV_STAT_VALUES_MAX
)
return
;
/* all values == 0, suppress message */
printk_in_rcu
(
KERN_INFO
"BTRFS: "
"bdev %s errs: wr %u, rd %u, flush %u, corrupt %u, gen %u
\n
"
,
btrfs_info_in_rcu
(
dev
->
dev_root
->
fs_info
,
"bdev %s errs: wr %u, rd %u, flush %u, corrupt %u, gen %u
"
,
rcu_str_deref
(
dev
->
name
),
btrfs_dev_stat_read
(
dev
,
BTRFS_DEV_STAT_WRITE_ERRS
),
btrfs_dev_stat_read
(
dev
,
BTRFS_DEV_STAT_READ_ERRS
),
...
...
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