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/befs | |
parent | 41d28bca2da4bd75a8915c1ccf2cacf7f4a2e531 (diff) |
assorted conversions to %p[dD]
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/befs')
-rw-r--r-- | fs/befs/linuxvfs.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/fs/befs/linuxvfs.c b/fs/befs/linuxvfs.c index 4cf61ec6b7a8..b94d1cc9cd30 100644 --- a/fs/befs/linuxvfs.c +++ b/fs/befs/linuxvfs.c | |||
@@ -172,8 +172,8 @@ befs_lookup(struct inode *dir, struct dentry *dentry, unsigned int flags) | |||
172 | char *utfname; | 172 | char *utfname; |
173 | const char *name = dentry->d_name.name; | 173 | const char *name = dentry->d_name.name; |
174 | 174 | ||
175 | befs_debug(sb, "---> %s name %s inode %ld", __func__, | 175 | befs_debug(sb, "---> %s name %pd inode %ld", __func__, |
176 | dentry->d_name.name, dir->i_ino); | 176 | dentry, dir->i_ino); |
177 | 177 | ||
178 | /* Convert to UTF-8 */ | 178 | /* Convert to UTF-8 */ |
179 | if (BEFS_SB(sb)->nls) { | 179 | if (BEFS_SB(sb)->nls) { |
@@ -191,8 +191,7 @@ befs_lookup(struct inode *dir, struct dentry *dentry, unsigned int flags) | |||
191 | } | 191 | } |
192 | 192 | ||
193 | if (ret == BEFS_BT_NOT_FOUND) { | 193 | if (ret == BEFS_BT_NOT_FOUND) { |
194 | befs_debug(sb, "<--- %s %s not found", __func__, | 194 | befs_debug(sb, "<--- %s %pd not found", __func__, dentry); |
195 | dentry->d_name.name); | ||
196 | return ERR_PTR(-ENOENT); | 195 | return ERR_PTR(-ENOENT); |
197 | 196 | ||
198 | } else if (ret != BEFS_OK || offset == 0) { | 197 | } else if (ret != BEFS_OK || offset == 0) { |
@@ -222,10 +221,9 @@ befs_readdir(struct file *file, struct dir_context *ctx) | |||
222 | size_t keysize; | 221 | size_t keysize; |
223 | unsigned char d_type; | 222 | unsigned char d_type; |
224 | char keybuf[BEFS_NAME_LEN + 1]; | 223 | char keybuf[BEFS_NAME_LEN + 1]; |
225 | const char *dirname = file->f_path.dentry->d_name.name; | ||
226 | 224 | ||
227 | befs_debug(sb, "---> %s name %s, inode %ld, ctx->pos %lld", | 225 | befs_debug(sb, "---> %s name %pD, inode %ld, ctx->pos %lld", |
228 | __func__, dirname, inode->i_ino, ctx->pos); | 226 | __func__, file, inode->i_ino, ctx->pos); |
229 | 227 | ||
230 | more: | 228 | more: |
231 | result = befs_btree_read(sb, ds, ctx->pos, BEFS_NAME_LEN + 1, | 229 | result = befs_btree_read(sb, ds, ctx->pos, BEFS_NAME_LEN + 1, |
@@ -233,8 +231,8 @@ more: | |||
233 | 231 | ||
234 | if (result == BEFS_ERR) { | 232 | if (result == BEFS_ERR) { |
235 | befs_debug(sb, "<--- %s ERROR", __func__); | 233 | befs_debug(sb, "<--- %s ERROR", __func__); |
236 | befs_error(sb, "IO error reading %s (inode %lu)", | 234 | befs_error(sb, "IO error reading %pD (inode %lu)", |
237 | dirname, inode->i_ino); | 235 | file, inode->i_ino); |
238 | return -EIO; | 236 | return -EIO; |
239 | 237 | ||
240 | } else if (result == BEFS_BT_END) { | 238 | } else if (result == BEFS_BT_END) { |