diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2014-08-19 20:17:38 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2014-10-09 02:39:04 -0400 |
commit | 4b8e992392a2468f90ae8b5b9f3e95c5f54a61c9 (patch) | |
tree | 9da39bc68079ecfc83bda50f1fada069948f8409 /fs/9p/vfs_inode.c | |
parent | 35c265e008b2c4e56765f07d47750d13f95a55c1 (diff) |
9p: switch to %p[dD]
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/9p/vfs_inode.c')
-rw-r--r-- | fs/9p/vfs_inode.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c index 7fa4f7a7653d..296482fc77a9 100644 --- a/fs/9p/vfs_inode.c +++ b/fs/9p/vfs_inode.c | |||
@@ -648,7 +648,7 @@ v9fs_create(struct v9fs_session_info *v9ses, struct inode *dir, | |||
648 | struct p9_fid *dfid, *ofid, *fid; | 648 | struct p9_fid *dfid, *ofid, *fid; |
649 | struct inode *inode; | 649 | struct inode *inode; |
650 | 650 | ||
651 | p9_debug(P9_DEBUG_VFS, "name %s\n", dentry->d_name.name); | 651 | p9_debug(P9_DEBUG_VFS, "name %pd\n", dentry); |
652 | 652 | ||
653 | err = 0; | 653 | err = 0; |
654 | ofid = NULL; | 654 | ofid = NULL; |
@@ -755,7 +755,7 @@ static int v9fs_vfs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode | |||
755 | struct p9_fid *fid; | 755 | struct p9_fid *fid; |
756 | struct v9fs_session_info *v9ses; | 756 | struct v9fs_session_info *v9ses; |
757 | 757 | ||
758 | p9_debug(P9_DEBUG_VFS, "name %s\n", dentry->d_name.name); | 758 | p9_debug(P9_DEBUG_VFS, "name %pd\n", dentry); |
759 | err = 0; | 759 | err = 0; |
760 | v9ses = v9fs_inode2v9ses(dir); | 760 | v9ses = v9fs_inode2v9ses(dir); |
761 | perm = unixmode2p9mode(v9ses, mode | S_IFDIR); | 761 | perm = unixmode2p9mode(v9ses, mode | S_IFDIR); |
@@ -791,8 +791,8 @@ struct dentry *v9fs_vfs_lookup(struct inode *dir, struct dentry *dentry, | |||
791 | struct inode *inode; | 791 | struct inode *inode; |
792 | char *name; | 792 | char *name; |
793 | 793 | ||
794 | p9_debug(P9_DEBUG_VFS, "dir: %p dentry: (%s) %p flags: %x\n", | 794 | p9_debug(P9_DEBUG_VFS, "dir: %p dentry: (%pd) %p flags: %x\n", |
795 | dir, dentry->d_name.name, dentry, flags); | 795 | dir, dentry, dentry, flags); |
796 | 796 | ||
797 | if (dentry->d_name.len > NAME_MAX) | 797 | if (dentry->d_name.len > NAME_MAX) |
798 | return ERR_PTR(-ENAMETOOLONG); | 798 | return ERR_PTR(-ENAMETOOLONG); |
@@ -1239,7 +1239,7 @@ static int v9fs_readlink(struct dentry *dentry, char *buffer, int buflen) | |||
1239 | struct p9_fid *fid; | 1239 | struct p9_fid *fid; |
1240 | struct p9_wstat *st; | 1240 | struct p9_wstat *st; |
1241 | 1241 | ||
1242 | p9_debug(P9_DEBUG_VFS, " %s\n", dentry->d_name.name); | 1242 | p9_debug(P9_DEBUG_VFS, " %pd\n", dentry); |
1243 | retval = -EPERM; | 1243 | retval = -EPERM; |
1244 | v9ses = v9fs_dentry2v9ses(dentry); | 1244 | v9ses = v9fs_dentry2v9ses(dentry); |
1245 | fid = v9fs_fid_lookup(dentry); | 1245 | fid = v9fs_fid_lookup(dentry); |
@@ -1262,8 +1262,8 @@ static int v9fs_readlink(struct dentry *dentry, char *buffer, int buflen) | |||
1262 | retval = min(strlen(st->extension)+1, (size_t)buflen); | 1262 | retval = min(strlen(st->extension)+1, (size_t)buflen); |
1263 | memcpy(buffer, st->extension, retval); | 1263 | memcpy(buffer, st->extension, retval); |
1264 | 1264 | ||
1265 | p9_debug(P9_DEBUG_VFS, "%s -> %s (%.*s)\n", | 1265 | p9_debug(P9_DEBUG_VFS, "%pd -> %s (%.*s)\n", |
1266 | dentry->d_name.name, st->extension, buflen, buffer); | 1266 | dentry, st->extension, buflen, buffer); |
1267 | 1267 | ||
1268 | done: | 1268 | done: |
1269 | p9stat_free(st); | 1269 | p9stat_free(st); |
@@ -1283,7 +1283,7 @@ static void *v9fs_vfs_follow_link(struct dentry *dentry, struct nameidata *nd) | |||
1283 | int len = 0; | 1283 | int len = 0; |
1284 | char *link = __getname(); | 1284 | char *link = __getname(); |
1285 | 1285 | ||
1286 | p9_debug(P9_DEBUG_VFS, "%s\n", dentry->d_name.name); | 1286 | p9_debug(P9_DEBUG_VFS, "%pd\n", dentry); |
1287 | 1287 | ||
1288 | if (!link) | 1288 | if (!link) |
1289 | link = ERR_PTR(-ENOMEM); | 1289 | link = ERR_PTR(-ENOMEM); |
@@ -1314,8 +1314,8 @@ v9fs_vfs_put_link(struct dentry *dentry, struct nameidata *nd, void *p) | |||
1314 | { | 1314 | { |
1315 | char *s = nd_get_link(nd); | 1315 | char *s = nd_get_link(nd); |
1316 | 1316 | ||
1317 | p9_debug(P9_DEBUG_VFS, " %s %s\n", | 1317 | p9_debug(P9_DEBUG_VFS, " %pd %s\n", |
1318 | dentry->d_name.name, IS_ERR(s) ? "<error>" : s); | 1318 | dentry, IS_ERR(s) ? "<error>" : s); |
1319 | if (!IS_ERR(s)) | 1319 | if (!IS_ERR(s)) |
1320 | __putname(s); | 1320 | __putname(s); |
1321 | } | 1321 | } |
@@ -1364,8 +1364,8 @@ static int v9fs_vfs_mkspecial(struct inode *dir, struct dentry *dentry, | |||
1364 | static int | 1364 | static int |
1365 | v9fs_vfs_symlink(struct inode *dir, struct dentry *dentry, const char *symname) | 1365 | v9fs_vfs_symlink(struct inode *dir, struct dentry *dentry, const char *symname) |
1366 | { | 1366 | { |
1367 | p9_debug(P9_DEBUG_VFS, " %lu,%s,%s\n", | 1367 | p9_debug(P9_DEBUG_VFS, " %lu,%pd,%s\n", |
1368 | dir->i_ino, dentry->d_name.name, symname); | 1368 | dir->i_ino, dentry, symname); |
1369 | 1369 | ||
1370 | return v9fs_vfs_mkspecial(dir, dentry, P9_DMSYMLINK, symname); | 1370 | return v9fs_vfs_mkspecial(dir, dentry, P9_DMSYMLINK, symname); |
1371 | } | 1371 | } |
@@ -1386,8 +1386,8 @@ v9fs_vfs_link(struct dentry *old_dentry, struct inode *dir, | |||
1386 | char *name; | 1386 | char *name; |
1387 | struct p9_fid *oldfid; | 1387 | struct p9_fid *oldfid; |
1388 | 1388 | ||
1389 | p9_debug(P9_DEBUG_VFS, " %lu,%s,%s\n", | 1389 | p9_debug(P9_DEBUG_VFS, " %lu,%pd,%pd\n", |
1390 | dir->i_ino, dentry->d_name.name, old_dentry->d_name.name); | 1390 | dir->i_ino, dentry, old_dentry); |
1391 | 1391 | ||
1392 | oldfid = v9fs_fid_clone(old_dentry); | 1392 | oldfid = v9fs_fid_clone(old_dentry); |
1393 | if (IS_ERR(oldfid)) | 1393 | if (IS_ERR(oldfid)) |
@@ -1428,8 +1428,8 @@ v9fs_vfs_mknod(struct inode *dir, struct dentry *dentry, umode_t mode, dev_t rde | |||
1428 | char *name; | 1428 | char *name; |
1429 | u32 perm; | 1429 | u32 perm; |
1430 | 1430 | ||
1431 | p9_debug(P9_DEBUG_VFS, " %lu,%s mode: %hx MAJOR: %u MINOR: %u\n", | 1431 | p9_debug(P9_DEBUG_VFS, " %lu,%pd mode: %hx MAJOR: %u MINOR: %u\n", |
1432 | dir->i_ino, dentry->d_name.name, mode, | 1432 | dir->i_ino, dentry, mode, |
1433 | MAJOR(rdev), MINOR(rdev)); | 1433 | MAJOR(rdev), MINOR(rdev)); |
1434 | 1434 | ||
1435 | if (!new_valid_dev(rdev)) | 1435 | if (!new_valid_dev(rdev)) |