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
4b8e9923
Commit
4b8e9923
authored
Aug 19, 2014
by
Al Viro
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
9p: switch to %p[dD]
Signed-off-by:
Al Viro
<
viro@zeniv.linux.org.uk
>
parent
35c265e0
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
34 additions
and
34 deletions
+34
-34
fs/9p/fid.c
fs/9p/fid.c
+2
-2
fs/9p/vfs_addr.c
fs/9p/vfs_addr.c
+2
-2
fs/9p/vfs_dentry.c
fs/9p/vfs_dentry.c
+4
-4
fs/9p/vfs_dir.c
fs/9p/vfs_dir.c
+2
-2
fs/9p/vfs_file.c
fs/9p/vfs_file.c
+4
-4
fs/9p/vfs_inode.c
fs/9p/vfs_inode.c
+16
-16
fs/9p/vfs_inode_dotl.c
fs/9p/vfs_inode_dotl.c
+4
-4
No files found.
fs/9p/fid.c
View file @
4b8e9923
...
...
@@ -65,8 +65,8 @@ static struct p9_fid *v9fs_fid_find(struct dentry *dentry, kuid_t uid, int any)
{
struct
p9_fid
*
fid
,
*
ret
;
p9_debug
(
P9_DEBUG_VFS
,
" dentry: %
s
(%p) uid %d any %d
\n
"
,
dentry
->
d_name
.
name
,
dentry
,
from_kuid
(
&
init_user_ns
,
uid
),
p9_debug
(
P9_DEBUG_VFS
,
" dentry: %
pd
(%p) uid %d any %d
\n
"
,
dentry
,
dentry
,
from_kuid
(
&
init_user_ns
,
uid
),
any
);
ret
=
NULL
;
/* we'll recheck under lock if there's anything to look in */
...
...
fs/9p/vfs_addr.c
View file @
4b8e9923
...
...
@@ -266,8 +266,8 @@ v9fs_direct_IO(int rw, struct kiocb *iocb, struct iov_iter *iter, loff_t pos)
* Now that we do caching with cache mode enabled, We need
* to support direct IO
*/
p9_debug
(
P9_DEBUG_VFS
,
"v9fs_direct_IO: v9fs_direct_IO (%
s
) off/no(%lld/%lu) EINVAL
\n
"
,
iocb
->
ki_filp
->
f_path
.
dentry
->
d_name
.
name
,
p9_debug
(
P9_DEBUG_VFS
,
"v9fs_direct_IO: v9fs_direct_IO (%
pD
) off/no(%lld/%lu) EINVAL
\n
"
,
iocb
->
ki_filp
,
(
long
long
)
pos
,
iter
->
nr_segs
);
return
-
EINVAL
;
...
...
fs/9p/vfs_dentry.c
View file @
4b8e9923
...
...
@@ -49,8 +49,8 @@
*/
static
int
v9fs_cached_dentry_delete
(
const
struct
dentry
*
dentry
)
{
p9_debug
(
P9_DEBUG_VFS
,
" dentry: %
s
(%p)
\n
"
,
dentry
->
d_name
.
name
,
dentry
);
p9_debug
(
P9_DEBUG_VFS
,
" dentry: %
pd
(%p)
\n
"
,
dentry
,
dentry
);
/* Don't cache negative dentries */
if
(
!
dentry
->
d_inode
)
...
...
@@ -67,8 +67,8 @@ static int v9fs_cached_dentry_delete(const struct dentry *dentry)
static
void
v9fs_dentry_release
(
struct
dentry
*
dentry
)
{
struct
hlist_node
*
p
,
*
n
;
p9_debug
(
P9_DEBUG_VFS
,
" dentry: %
s
(%p)
\n
"
,
dentry
->
d_name
.
name
,
dentry
);
p9_debug
(
P9_DEBUG_VFS
,
" dentry: %
pd
(%p)
\n
"
,
dentry
,
dentry
);
hlist_for_each_safe
(
p
,
n
,
(
struct
hlist_head
*
)
&
dentry
->
d_fsdata
)
p9_client_clunk
(
hlist_entry
(
p
,
struct
p9_fid
,
dlist
));
dentry
->
d_fsdata
=
NULL
;
...
...
fs/9p/vfs_dir.c
View file @
4b8e9923
...
...
@@ -116,7 +116,7 @@ static int v9fs_dir_readdir(struct file *file, struct dir_context *ctx)
int
reclen
=
0
;
struct
p9_rdir
*
rdir
;
p9_debug
(
P9_DEBUG_VFS
,
"name %
s
\n
"
,
file
->
f_path
.
dentry
->
d_name
.
nam
e
);
p9_debug
(
P9_DEBUG_VFS
,
"name %
pD
\n
"
,
fil
e
);
fid
=
file
->
private_data
;
buflen
=
fid
->
clnt
->
msize
-
P9_IOHDRSZ
;
...
...
@@ -172,7 +172,7 @@ static int v9fs_dir_readdir_dotl(struct file *file, struct dir_context *ctx)
struct
p9_rdir
*
rdir
;
struct
p9_dirent
curdirent
;
p9_debug
(
P9_DEBUG_VFS
,
"name %
s
\n
"
,
file
->
f_path
.
dentry
->
d_name
.
nam
e
);
p9_debug
(
P9_DEBUG_VFS
,
"name %
pD
\n
"
,
fil
e
);
fid
=
file
->
private_data
;
buflen
=
fid
->
clnt
->
msize
-
P9_READDIRHDRSZ
;
...
...
fs/9p/vfs_file.c
View file @
4b8e9923
...
...
@@ -301,8 +301,8 @@ static int v9fs_file_lock_dotl(struct file *filp, int cmd, struct file_lock *fl)
struct
inode
*
inode
=
file_inode
(
filp
);
int
ret
=
-
ENOLCK
;
p9_debug
(
P9_DEBUG_VFS
,
"filp: %p cmd:%d lock: %p name: %
s
\n
"
,
filp
,
cmd
,
fl
,
filp
->
f_path
.
dentry
->
d_name
.
name
);
p9_debug
(
P9_DEBUG_VFS
,
"filp: %p cmd:%d lock: %p name: %
pD
\n
"
,
filp
,
cmd
,
fl
,
filp
);
/* No mandatory locks */
if
(
__mandatory_lock
(
inode
)
&&
fl
->
fl_type
!=
F_UNLCK
)
...
...
@@ -337,8 +337,8 @@ static int v9fs_file_flock_dotl(struct file *filp, int cmd,
struct
inode
*
inode
=
file_inode
(
filp
);
int
ret
=
-
ENOLCK
;
p9_debug
(
P9_DEBUG_VFS
,
"filp: %p cmd:%d lock: %p name: %
s
\n
"
,
filp
,
cmd
,
fl
,
filp
->
f_path
.
dentry
->
d_name
.
name
);
p9_debug
(
P9_DEBUG_VFS
,
"filp: %p cmd:%d lock: %p name: %
pD
\n
"
,
filp
,
cmd
,
fl
,
filp
);
/* No mandatory locks */
if
(
__mandatory_lock
(
inode
)
&&
fl
->
fl_type
!=
F_UNLCK
)
...
...
fs/9p/vfs_inode.c
View file @
4b8e9923
...
...
@@ -648,7 +648,7 @@ v9fs_create(struct v9fs_session_info *v9ses, struct inode *dir,
struct
p9_fid
*
dfid
,
*
ofid
,
*
fid
;
struct
inode
*
inode
;
p9_debug
(
P9_DEBUG_VFS
,
"name %
s
\n
"
,
dentry
->
d_name
.
name
);
p9_debug
(
P9_DEBUG_VFS
,
"name %
pd
\n
"
,
dentry
);
err
=
0
;
ofid
=
NULL
;
...
...
@@ -755,7 +755,7 @@ static int v9fs_vfs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode
struct
p9_fid
*
fid
;
struct
v9fs_session_info
*
v9ses
;
p9_debug
(
P9_DEBUG_VFS
,
"name %
s
\n
"
,
dentry
->
d_name
.
name
);
p9_debug
(
P9_DEBUG_VFS
,
"name %
pd
\n
"
,
dentry
);
err
=
0
;
v9ses
=
v9fs_inode2v9ses
(
dir
);
perm
=
unixmode2p9mode
(
v9ses
,
mode
|
S_IFDIR
);
...
...
@@ -791,8 +791,8 @@ struct dentry *v9fs_vfs_lookup(struct inode *dir, struct dentry *dentry,
struct
inode
*
inode
;
char
*
name
;
p9_debug
(
P9_DEBUG_VFS
,
"dir: %p dentry: (%
s
) %p flags: %x
\n
"
,
dir
,
dentry
->
d_name
.
name
,
dentry
,
flags
);
p9_debug
(
P9_DEBUG_VFS
,
"dir: %p dentry: (%
pd
) %p flags: %x
\n
"
,
dir
,
dentry
,
dentry
,
flags
);
if
(
dentry
->
d_name
.
len
>
NAME_MAX
)
return
ERR_PTR
(
-
ENAMETOOLONG
);
...
...
@@ -1239,7 +1239,7 @@ static int v9fs_readlink(struct dentry *dentry, char *buffer, int buflen)
struct
p9_fid
*
fid
;
struct
p9_wstat
*
st
;
p9_debug
(
P9_DEBUG_VFS
,
" %
s
\n
"
,
dentry
->
d_name
.
name
);
p9_debug
(
P9_DEBUG_VFS
,
" %
pd
\n
"
,
dentry
);
retval
=
-
EPERM
;
v9ses
=
v9fs_dentry2v9ses
(
dentry
);
fid
=
v9fs_fid_lookup
(
dentry
);
...
...
@@ -1262,8 +1262,8 @@ static int v9fs_readlink(struct dentry *dentry, char *buffer, int buflen)
retval
=
min
(
strlen
(
st
->
extension
)
+
1
,
(
size_t
)
buflen
);
memcpy
(
buffer
,
st
->
extension
,
retval
);
p9_debug
(
P9_DEBUG_VFS
,
"%
s
-> %s (%.*s)
\n
"
,
dentry
->
d_name
.
name
,
st
->
extension
,
buflen
,
buffer
);
p9_debug
(
P9_DEBUG_VFS
,
"%
pd
-> %s (%.*s)
\n
"
,
dentry
,
st
->
extension
,
buflen
,
buffer
);
done:
p9stat_free
(
st
);
...
...
@@ -1283,7 +1283,7 @@ static void *v9fs_vfs_follow_link(struct dentry *dentry, struct nameidata *nd)
int
len
=
0
;
char
*
link
=
__getname
();
p9_debug
(
P9_DEBUG_VFS
,
"%
s
\n
"
,
dentry
->
d_name
.
name
);
p9_debug
(
P9_DEBUG_VFS
,
"%
pd
\n
"
,
dentry
);
if
(
!
link
)
link
=
ERR_PTR
(
-
ENOMEM
);
...
...
@@ -1314,8 +1314,8 @@ v9fs_vfs_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
{
char
*
s
=
nd_get_link
(
nd
);
p9_debug
(
P9_DEBUG_VFS
,
" %
s
%s
\n
"
,
dentry
->
d_name
.
name
,
IS_ERR
(
s
)
?
"<error>"
:
s
);
p9_debug
(
P9_DEBUG_VFS
,
" %
pd
%s
\n
"
,
dentry
,
IS_ERR
(
s
)
?
"<error>"
:
s
);
if
(
!
IS_ERR
(
s
))
__putname
(
s
);
}
...
...
@@ -1364,8 +1364,8 @@ static int v9fs_vfs_mkspecial(struct inode *dir, struct dentry *dentry,
static
int
v9fs_vfs_symlink
(
struct
inode
*
dir
,
struct
dentry
*
dentry
,
const
char
*
symname
)
{
p9_debug
(
P9_DEBUG_VFS
,
" %lu,%
s
,%s
\n
"
,
dir
->
i_ino
,
dentry
->
d_name
.
name
,
symname
);
p9_debug
(
P9_DEBUG_VFS
,
" %lu,%
pd
,%s
\n
"
,
dir
->
i_ino
,
dentry
,
symname
);
return
v9fs_vfs_mkspecial
(
dir
,
dentry
,
P9_DMSYMLINK
,
symname
);
}
...
...
@@ -1386,8 +1386,8 @@ v9fs_vfs_link(struct dentry *old_dentry, struct inode *dir,
char
*
name
;
struct
p9_fid
*
oldfid
;
p9_debug
(
P9_DEBUG_VFS
,
" %lu,%
s,%s
\n
"
,
dir
->
i_ino
,
dentry
->
d_name
.
name
,
old_dentry
->
d_name
.
name
);
p9_debug
(
P9_DEBUG_VFS
,
" %lu,%
pd,%pd
\n
"
,
dir
->
i_ino
,
dentry
,
old_dentry
);
oldfid
=
v9fs_fid_clone
(
old_dentry
);
if
(
IS_ERR
(
oldfid
))
...
...
@@ -1428,8 +1428,8 @@ v9fs_vfs_mknod(struct inode *dir, struct dentry *dentry, umode_t mode, dev_t rde
char
*
name
;
u32
perm
;
p9_debug
(
P9_DEBUG_VFS
,
" %lu,%
s
mode: %hx MAJOR: %u MINOR: %u
\n
"
,
dir
->
i_ino
,
dentry
->
d_name
.
name
,
mode
,
p9_debug
(
P9_DEBUG_VFS
,
" %lu,%
pd
mode: %hx MAJOR: %u MINOR: %u
\n
"
,
dir
->
i_ino
,
dentry
,
mode
,
MAJOR
(
rdev
),
MINOR
(
rdev
));
if
(
!
new_valid_dev
(
rdev
))
...
...
fs/9p/vfs_inode_dotl.c
View file @
4b8e9923
...
...
@@ -393,7 +393,7 @@ static int v9fs_vfs_mkdir_dotl(struct inode *dir,
struct
dentry
*
dir_dentry
;
struct
posix_acl
*
dacl
=
NULL
,
*
pacl
=
NULL
;
p9_debug
(
P9_DEBUG_VFS
,
"name %
s
\n
"
,
dentry
->
d_name
.
name
);
p9_debug
(
P9_DEBUG_VFS
,
"name %
pd
\n
"
,
dentry
);
err
=
0
;
v9ses
=
v9fs_inode2v9ses
(
dir
);
...
...
@@ -767,8 +767,8 @@ v9fs_vfs_link_dotl(struct dentry *old_dentry, struct inode *dir,
struct
p9_fid
*
dfid
,
*
oldfid
;
struct
v9fs_session_info
*
v9ses
;
p9_debug
(
P9_DEBUG_VFS
,
"dir ino: %lu, old_name: %
s, new_name: %s
\n
"
,
dir
->
i_ino
,
old_dentry
->
d_name
.
name
,
dentry
->
d_name
.
name
);
p9_debug
(
P9_DEBUG_VFS
,
"dir ino: %lu, old_name: %
pd, new_name: %pd
\n
"
,
dir
->
i_ino
,
old_dentry
,
dentry
);
v9ses
=
v9fs_inode2v9ses
(
dir
);
dir_dentry
=
dentry
->
d_parent
;
...
...
@@ -917,7 +917,7 @@ v9fs_vfs_follow_link_dotl(struct dentry *dentry, struct nameidata *nd)
char
*
link
=
__getname
();
char
*
target
;
p9_debug
(
P9_DEBUG_VFS
,
"%
s
\n
"
,
dentry
->
d_name
.
name
);
p9_debug
(
P9_DEBUG_VFS
,
"%
pd
\n
"
,
dentry
);
if
(
!
link
)
{
link
=
ERR_PTR
(
-
ENOMEM
);
...
...
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