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
d53d0f74
Commit
d53d0f74
authored
Dec 21, 2019
by
Al Viro
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ceph: use errorfc() and friends instead of spelling the prefix out
Signed-off-by:
Al Viro
<
viro@zeniv.linux.org.uk
>
parent
a3ff937b
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
9 deletions
+9
-9
fs/ceph/cache.c
fs/ceph/cache.c
+2
-2
fs/ceph/super.c
fs/ceph/super.c
+7
-7
No files found.
fs/ceph/cache.c
View file @
d53d0f74
...
@@ -67,7 +67,7 @@ int ceph_fscache_register_fs(struct ceph_fs_client* fsc, struct fs_context *fc)
...
@@ -67,7 +67,7 @@ int ceph_fscache_register_fs(struct ceph_fs_client* fsc, struct fs_context *fc)
if
(
uniq_len
&&
memcmp
(
ent
->
uniquifier
,
fscache_uniq
,
uniq_len
))
if
(
uniq_len
&&
memcmp
(
ent
->
uniquifier
,
fscache_uniq
,
uniq_len
))
continue
;
continue
;
errorf
(
fc
,
"ceph:
fscache cookie already registered for fsid %pU, use fsc=<uniquifier> option"
,
errorf
c
(
fc
,
"
fscache cookie already registered for fsid %pU, use fsc=<uniquifier> option"
,
fsid
);
fsid
);
err
=
-
EBUSY
;
err
=
-
EBUSY
;
goto
out_unlock
;
goto
out_unlock
;
...
@@ -96,7 +96,7 @@ int ceph_fscache_register_fs(struct ceph_fs_client* fsc, struct fs_context *fc)
...
@@ -96,7 +96,7 @@ int ceph_fscache_register_fs(struct ceph_fs_client* fsc, struct fs_context *fc)
list_add_tail
(
&
ent
->
list
,
&
ceph_fscache_list
);
list_add_tail
(
&
ent
->
list
,
&
ceph_fscache_list
);
}
else
{
}
else
{
kfree
(
ent
);
kfree
(
ent
);
errorf
(
fc
,
"ceph:
unable to register fscache cookie for fsid %pU"
,
errorf
c
(
fc
,
"
unable to register fscache cookie for fsid %pU"
,
fsid
);
fsid
);
/* all other fs ignore this error */
/* all other fs ignore this error */
}
}
...
...
fs/ceph/super.c
View file @
d53d0f74
...
@@ -222,7 +222,7 @@ static int ceph_parse_source(struct fs_parameter *param, struct fs_context *fc)
...
@@ -222,7 +222,7 @@ static int ceph_parse_source(struct fs_parameter *param, struct fs_context *fc)
dout
(
"%s '%s'
\n
"
,
__func__
,
dev_name
);
dout
(
"%s '%s'
\n
"
,
__func__
,
dev_name
);
if
(
!
dev_name
||
!*
dev_name
)
if
(
!
dev_name
||
!*
dev_name
)
return
invalf
(
fc
,
"ceph:
Empty source"
);
return
invalf
c
(
fc
,
"
Empty source"
);
dev_name_end
=
strchr
(
dev_name
,
'/'
);
dev_name_end
=
strchr
(
dev_name
,
'/'
);
if
(
dev_name_end
)
{
if
(
dev_name_end
)
{
...
@@ -238,7 +238,7 @@ static int ceph_parse_source(struct fs_parameter *param, struct fs_context *fc)
...
@@ -238,7 +238,7 @@ static int ceph_parse_source(struct fs_parameter *param, struct fs_context *fc)
dev_name_end
--
;
/* back up to ':' separator */
dev_name_end
--
;
/* back up to ':' separator */
if
(
dev_name_end
<
dev_name
||
*
dev_name_end
!=
':'
)
if
(
dev_name_end
<
dev_name
||
*
dev_name_end
!=
':'
)
return
invalf
(
fc
,
"ceph:
No path or : separator in source"
);
return
invalf
c
(
fc
,
"
No path or : separator in source"
);
dout
(
"device name '%.*s'
\n
"
,
(
int
)(
dev_name_end
-
dev_name
),
dev_name
);
dout
(
"device name '%.*s'
\n
"
,
(
int
)(
dev_name_end
-
dev_name
),
dev_name
);
if
(
fsopt
->
server_path
)
if
(
fsopt
->
server_path
)
...
@@ -294,7 +294,7 @@ static int ceph_parse_mount_param(struct fs_context *fc,
...
@@ -294,7 +294,7 @@ static int ceph_parse_mount_param(struct fs_context *fc,
break
;
break
;
case
Opt_source
:
case
Opt_source
:
if
(
fc
->
source
)
if
(
fc
->
source
)
return
invalf
(
fc
,
"ceph:
Multiple sources specified"
);
return
invalf
c
(
fc
,
"
Multiple sources specified"
);
return
ceph_parse_source
(
param
,
fc
);
return
ceph_parse_source
(
param
,
fc
);
case
Opt_wsize
:
case
Opt_wsize
:
if
(
result
.
uint_32
<
PAGE_SIZE
||
if
(
result
.
uint_32
<
PAGE_SIZE
||
...
@@ -385,7 +385,7 @@ static int ceph_parse_mount_param(struct fs_context *fc,
...
@@ -385,7 +385,7 @@ static int ceph_parse_mount_param(struct fs_context *fc,
}
}
break
;
break
;
#else
#else
return
invalf
(
fc
,
"ceph:
fscache support is disabled"
);
return
invalf
c
(
fc
,
"
fscache support is disabled"
);
#endif
#endif
case
Opt_poolperm
:
case
Opt_poolperm
:
if
(
!
result
.
negated
)
if
(
!
result
.
negated
)
...
@@ -416,7 +416,7 @@ static int ceph_parse_mount_param(struct fs_context *fc,
...
@@ -416,7 +416,7 @@ static int ceph_parse_mount_param(struct fs_context *fc,
#ifdef CONFIG_CEPH_FS_POSIX_ACL
#ifdef CONFIG_CEPH_FS_POSIX_ACL
fc
->
sb_flags
|=
SB_POSIXACL
;
fc
->
sb_flags
|=
SB_POSIXACL
;
#else
#else
return
invalf
(
fc
,
"ceph:
POSIX ACL support is disabled"
);
return
invalf
c
(
fc
,
"
POSIX ACL support is disabled"
);
#endif
#endif
}
else
{
}
else
{
fc
->
sb_flags
&=
~
SB_POSIXACL
;
fc
->
sb_flags
&=
~
SB_POSIXACL
;
...
@@ -428,7 +428,7 @@ static int ceph_parse_mount_param(struct fs_context *fc,
...
@@ -428,7 +428,7 @@ static int ceph_parse_mount_param(struct fs_context *fc,
return
0
;
return
0
;
out_of_range:
out_of_range:
return
invalf
(
fc
,
"ceph:
%s out of range"
,
param
->
key
);
return
invalf
c
(
fc
,
"
%s out of range"
,
param
->
key
);
}
}
static
void
destroy_mount_options
(
struct
ceph_mount_options
*
args
)
static
void
destroy_mount_options
(
struct
ceph_mount_options
*
args
)
...
@@ -1012,7 +1012,7 @@ static int ceph_get_tree(struct fs_context *fc)
...
@@ -1012,7 +1012,7 @@ static int ceph_get_tree(struct fs_context *fc)
dout
(
"ceph_get_tree
\n
"
);
dout
(
"ceph_get_tree
\n
"
);
if
(
!
fc
->
source
)
if
(
!
fc
->
source
)
return
invalf
(
fc
,
"ceph:
No source"
);
return
invalf
c
(
fc
,
"
No source"
);
#ifdef CONFIG_CEPH_FS_POSIX_ACL
#ifdef CONFIG_CEPH_FS_POSIX_ACL
fc
->
sb_flags
|=
SB_POSIXACL
;
fc
->
sb_flags
|=
SB_POSIXACL
;
...
...
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