diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2014-10-21 20:11:25 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2014-11-19 13:01:20 -0500 |
commit | a455589f181e60439c736c6c6a068bb7e6dc23f0 (patch) | |
tree | 48d377e7db8d21fd606ba8c84a72b95f3d23c10b /fs/affs/namei.c | |
parent | 41d28bca2da4bd75a8915c1ccf2cacf7f4a2e531 (diff) |
assorted conversions to %p[dD]
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/affs/namei.c')
-rw-r--r-- | fs/affs/namei.c | 40 |
1 files changed, 17 insertions, 23 deletions
diff --git a/fs/affs/namei.c b/fs/affs/namei.c index 035bd31556fc..bbc38530e924 100644 --- a/fs/affs/namei.c +++ b/fs/affs/namei.c | |||
@@ -190,8 +190,7 @@ affs_find_entry(struct inode *dir, struct dentry *dentry) | |||
190 | toupper_t toupper = affs_get_toupper(sb); | 190 | toupper_t toupper = affs_get_toupper(sb); |
191 | u32 key; | 191 | u32 key; |
192 | 192 | ||
193 | pr_debug("%s(\"%.*s\")\n", | 193 | pr_debug("%s(\"%pd\")\n", __func__, dentry); |
194 | __func__, (int)dentry->d_name.len, dentry->d_name.name); | ||
195 | 194 | ||
196 | bh = affs_bread(sb, dir->i_ino); | 195 | bh = affs_bread(sb, dir->i_ino); |
197 | if (!bh) | 196 | if (!bh) |
@@ -219,8 +218,7 @@ affs_lookup(struct inode *dir, struct dentry *dentry, unsigned int flags) | |||
219 | struct buffer_head *bh; | 218 | struct buffer_head *bh; |
220 | struct inode *inode = NULL; | 219 | struct inode *inode = NULL; |
221 | 220 | ||
222 | pr_debug("%s(\"%.*s\")\n", | 221 | pr_debug("%s(\"%pd\")\n", __func__, dentry); |
223 | __func__, (int)dentry->d_name.len, dentry->d_name.name); | ||
224 | 222 | ||
225 | affs_lock_dir(dir); | 223 | affs_lock_dir(dir); |
226 | bh = affs_find_entry(dir, dentry); | 224 | bh = affs_find_entry(dir, dentry); |
@@ -250,9 +248,9 @@ affs_lookup(struct inode *dir, struct dentry *dentry, unsigned int flags) | |||
250 | int | 248 | int |
251 | affs_unlink(struct inode *dir, struct dentry *dentry) | 249 | affs_unlink(struct inode *dir, struct dentry *dentry) |
252 | { | 250 | { |
253 | pr_debug("%s(dir=%d, %lu \"%.*s\")\n", | 251 | pr_debug("%s(dir=%d, %lu \"%pd\")\n", |
254 | __func__, (u32)dir->i_ino, dentry->d_inode->i_ino, | 252 | __func__, (u32)dir->i_ino, dentry->d_inode->i_ino, |
255 | (int)dentry->d_name.len, dentry->d_name.name); | 253 | dentry); |
256 | 254 | ||
257 | return affs_remove_header(dentry); | 255 | return affs_remove_header(dentry); |
258 | } | 256 | } |
@@ -264,9 +262,8 @@ affs_create(struct inode *dir, struct dentry *dentry, umode_t mode, bool excl) | |||
264 | struct inode *inode; | 262 | struct inode *inode; |
265 | int error; | 263 | int error; |
266 | 264 | ||
267 | pr_debug("%s(%lu,\"%.*s\",0%ho)\n", | 265 | pr_debug("%s(%lu,\"%pd\",0%ho)\n", |
268 | __func__, dir->i_ino, (int)dentry->d_name.len, | 266 | __func__, dir->i_ino, dentry, mode); |
269 | dentry->d_name.name,mode); | ||
270 | 267 | ||
271 | inode = affs_new_inode(dir); | 268 | inode = affs_new_inode(dir); |
272 | if (!inode) | 269 | if (!inode) |
@@ -294,9 +291,8 @@ affs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode) | |||
294 | struct inode *inode; | 291 | struct inode *inode; |
295 | int error; | 292 | int error; |
296 | 293 | ||
297 | pr_debug("%s(%lu,\"%.*s\",0%ho)\n", | 294 | pr_debug("%s(%lu,\"%pd\",0%ho)\n", |
298 | __func__, dir->i_ino, (int)dentry->d_name.len, | 295 | __func__, dir->i_ino, dentry, mode); |
299 | dentry->d_name.name, mode); | ||
300 | 296 | ||
301 | inode = affs_new_inode(dir); | 297 | inode = affs_new_inode(dir); |
302 | if (!inode) | 298 | if (!inode) |
@@ -321,9 +317,9 @@ affs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode) | |||
321 | int | 317 | int |
322 | affs_rmdir(struct inode *dir, struct dentry *dentry) | 318 | affs_rmdir(struct inode *dir, struct dentry *dentry) |
323 | { | 319 | { |
324 | pr_debug("%s(dir=%u, %lu \"%.*s\")\n", | 320 | pr_debug("%s(dir=%u, %lu \"%pd\")\n", |
325 | __func__, (u32)dir->i_ino, dentry->d_inode->i_ino, | 321 | __func__, (u32)dir->i_ino, dentry->d_inode->i_ino, |
326 | (int)dentry->d_name.len, dentry->d_name.name); | 322 | dentry); |
327 | 323 | ||
328 | return affs_remove_header(dentry); | 324 | return affs_remove_header(dentry); |
329 | } | 325 | } |
@@ -338,9 +334,8 @@ affs_symlink(struct inode *dir, struct dentry *dentry, const char *symname) | |||
338 | int i, maxlen, error; | 334 | int i, maxlen, error; |
339 | char c, lc; | 335 | char c, lc; |
340 | 336 | ||
341 | pr_debug("%s(%lu,\"%.*s\" -> \"%s\")\n", | 337 | pr_debug("%s(%lu,\"%pd\" -> \"%s\")\n", |
342 | __func__, dir->i_ino, (int)dentry->d_name.len, | 338 | __func__, dir->i_ino, dentry, symname); |
343 | dentry->d_name.name, symname); | ||
344 | 339 | ||
345 | maxlen = AFFS_SB(sb)->s_hashsize * sizeof(u32) - 1; | 340 | maxlen = AFFS_SB(sb)->s_hashsize * sizeof(u32) - 1; |
346 | inode = affs_new_inode(dir); | 341 | inode = affs_new_inode(dir); |
@@ -409,9 +404,9 @@ affs_link(struct dentry *old_dentry, struct inode *dir, struct dentry *dentry) | |||
409 | { | 404 | { |
410 | struct inode *inode = old_dentry->d_inode; | 405 | struct inode *inode = old_dentry->d_inode; |
411 | 406 | ||
412 | pr_debug("%s(%u, %u, \"%.*s\")\n", | 407 | pr_debug("%s(%u, %u, \"%pd\")\n", |
413 | __func__, (u32)inode->i_ino, (u32)dir->i_ino, | 408 | __func__, (u32)inode->i_ino, (u32)dir->i_ino, |
414 | (int)dentry->d_name.len,dentry->d_name.name); | 409 | dentry); |
415 | 410 | ||
416 | return affs_add_entry(dir, inode, dentry, ST_LINKFILE); | 411 | return affs_add_entry(dir, inode, dentry, ST_LINKFILE); |
417 | } | 412 | } |
@@ -424,10 +419,9 @@ affs_rename(struct inode *old_dir, struct dentry *old_dentry, | |||
424 | struct buffer_head *bh = NULL; | 419 | struct buffer_head *bh = NULL; |
425 | int retval; | 420 | int retval; |
426 | 421 | ||
427 | pr_debug("%s(old=%u,\"%*s\" to new=%u,\"%*s\")\n", | 422 | pr_debug("%s(old=%u,\"%pd\" to new=%u,\"%pd\")\n", |
428 | __func__, (u32)old_dir->i_ino, (int)old_dentry->d_name.len, | 423 | __func__, (u32)old_dir->i_ino, old_dentry, |
429 | old_dentry->d_name.name, (u32)new_dir->i_ino, | 424 | (u32)new_dir->i_ino, new_dentry); |
430 | (int)new_dentry->d_name.len, new_dentry->d_name.name); | ||
431 | 425 | ||
432 | retval = affs_check_name(new_dentry->d_name.name, | 426 | retval = affs_check_name(new_dentry->d_name.name, |
433 | new_dentry->d_name.len, | 427 | new_dentry->d_name.len, |