ubifs: switch to %pd
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro
Родитель
1e903edadf
Коммит
4cb2a01d8c
|
|
@ -192,8 +192,7 @@ static struct dentry *ubifs_lookup(struct inode *dir, struct dentry *dentry,
|
|||
struct ubifs_dent_node *dent;
|
||||
struct ubifs_info *c = dir->i_sb->s_fs_info;
|
||||
|
||||
dbg_gen("'%.*s' in dir ino %lu",
|
||||
dentry->d_name.len, dentry->d_name.name, dir->i_ino);
|
||||
dbg_gen("'%pd' in dir ino %lu", dentry, dir->i_ino);
|
||||
|
||||
if (dentry->d_name.len > UBIFS_MAX_NLEN)
|
||||
return ERR_PTR(-ENAMETOOLONG);
|
||||
|
|
@ -225,8 +224,8 @@ static struct dentry *ubifs_lookup(struct inode *dir, struct dentry *dentry,
|
|||
* checking.
|
||||
*/
|
||||
err = PTR_ERR(inode);
|
||||
ubifs_err("dead directory entry '%.*s', error %d",
|
||||
dentry->d_name.len, dentry->d_name.name, err);
|
||||
ubifs_err("dead directory entry '%pd', error %d",
|
||||
dentry, err);
|
||||
ubifs_ro_mode(c, err);
|
||||
goto out;
|
||||
}
|
||||
|
|
@ -260,8 +259,8 @@ static int ubifs_create(struct inode *dir, struct dentry *dentry, umode_t mode,
|
|||
* parent directory inode.
|
||||
*/
|
||||
|
||||
dbg_gen("dent '%.*s', mode %#hx in dir ino %lu",
|
||||
dentry->d_name.len, dentry->d_name.name, mode, dir->i_ino);
|
||||
dbg_gen("dent '%pd', mode %#hx in dir ino %lu",
|
||||
dentry, mode, dir->i_ino);
|
||||
|
||||
err = ubifs_budget_space(c, &req);
|
||||
if (err)
|
||||
|
|
@ -509,8 +508,8 @@ static int ubifs_link(struct dentry *old_dentry, struct inode *dir,
|
|||
* changing the parent inode.
|
||||
*/
|
||||
|
||||
dbg_gen("dent '%.*s' to ino %lu (nlink %d) in dir ino %lu",
|
||||
dentry->d_name.len, dentry->d_name.name, inode->i_ino,
|
||||
dbg_gen("dent '%pd' to ino %lu (nlink %d) in dir ino %lu",
|
||||
dentry, inode->i_ino,
|
||||
inode->i_nlink, dir->i_ino);
|
||||
ubifs_assert(mutex_is_locked(&dir->i_mutex));
|
||||
ubifs_assert(mutex_is_locked(&inode->i_mutex));
|
||||
|
|
@ -566,8 +565,8 @@ static int ubifs_unlink(struct inode *dir, struct dentry *dentry)
|
|||
* deletions.
|
||||
*/
|
||||
|
||||
dbg_gen("dent '%.*s' from ino %lu (nlink %d) in dir ino %lu",
|
||||
dentry->d_name.len, dentry->d_name.name, inode->i_ino,
|
||||
dbg_gen("dent '%pd' from ino %lu (nlink %d) in dir ino %lu",
|
||||
dentry, inode->i_ino,
|
||||
inode->i_nlink, dir->i_ino);
|
||||
ubifs_assert(mutex_is_locked(&dir->i_mutex));
|
||||
ubifs_assert(mutex_is_locked(&inode->i_mutex));
|
||||
|
|
@ -656,8 +655,8 @@ static int ubifs_rmdir(struct inode *dir, struct dentry *dentry)
|
|||
* because we have extra space reserved for deletions.
|
||||
*/
|
||||
|
||||
dbg_gen("directory '%.*s', ino %lu in dir ino %lu", dentry->d_name.len,
|
||||
dentry->d_name.name, inode->i_ino, dir->i_ino);
|
||||
dbg_gen("directory '%pd', ino %lu in dir ino %lu", dentry,
|
||||
inode->i_ino, dir->i_ino);
|
||||
ubifs_assert(mutex_is_locked(&dir->i_mutex));
|
||||
ubifs_assert(mutex_is_locked(&inode->i_mutex));
|
||||
err = check_dir_empty(c, dentry->d_inode);
|
||||
|
|
@ -716,8 +715,8 @@ static int ubifs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode)
|
|||
* directory inode.
|
||||
*/
|
||||
|
||||
dbg_gen("dent '%.*s', mode %#hx in dir ino %lu",
|
||||
dentry->d_name.len, dentry->d_name.name, mode, dir->i_ino);
|
||||
dbg_gen("dent '%pd', mode %#hx in dir ino %lu",
|
||||
dentry, mode, dir->i_ino);
|
||||
|
||||
err = ubifs_budget_space(c, &req);
|
||||
if (err)
|
||||
|
|
@ -778,8 +777,7 @@ static int ubifs_mknod(struct inode *dir, struct dentry *dentry,
|
|||
* directory inode.
|
||||
*/
|
||||
|
||||
dbg_gen("dent '%.*s' in dir ino %lu",
|
||||
dentry->d_name.len, dentry->d_name.name, dir->i_ino);
|
||||
dbg_gen("dent '%pd' in dir ino %lu", dentry, dir->i_ino);
|
||||
|
||||
if (!new_valid_dev(rdev))
|
||||
return -EINVAL;
|
||||
|
|
@ -853,8 +851,8 @@ static int ubifs_symlink(struct inode *dir, struct dentry *dentry,
|
|||
* directory inode.
|
||||
*/
|
||||
|
||||
dbg_gen("dent '%.*s', target '%s' in dir ino %lu", dentry->d_name.len,
|
||||
dentry->d_name.name, symname, dir->i_ino);
|
||||
dbg_gen("dent '%pd', target '%s' in dir ino %lu", dentry,
|
||||
symname, dir->i_ino);
|
||||
|
||||
if (len > UBIFS_MAX_INO_DATA)
|
||||
return -ENAMETOOLONG;
|
||||
|
|
@ -979,10 +977,9 @@ static int ubifs_rename(struct inode *old_dir, struct dentry *old_dentry,
|
|||
* separately.
|
||||
*/
|
||||
|
||||
dbg_gen("dent '%.*s' ino %lu in dir ino %lu to dent '%.*s' in dir ino %lu",
|
||||
old_dentry->d_name.len, old_dentry->d_name.name,
|
||||
old_inode->i_ino, old_dir->i_ino, new_dentry->d_name.len,
|
||||
new_dentry->d_name.name, new_dir->i_ino);
|
||||
dbg_gen("dent '%pd' ino %lu in dir ino %lu to dent '%pd' in dir ino %lu",
|
||||
old_dentry, old_inode->i_ino, old_dir->i_ino,
|
||||
new_dentry, new_dir->i_ino);
|
||||
ubifs_assert(mutex_is_locked(&old_dir->i_mutex));
|
||||
ubifs_assert(mutex_is_locked(&new_dir->i_mutex));
|
||||
if (unlink)
|
||||
|
|
|
|||
|
|
@ -933,10 +933,8 @@ int ubifs_jnl_rename(struct ubifs_info *c, const struct inode *old_dir,
|
|||
int move = (old_dir != new_dir);
|
||||
struct ubifs_inode *uninitialized_var(new_ui);
|
||||
|
||||
dbg_jnl("dent '%.*s' in dir ino %lu to dent '%.*s' in dir ino %lu",
|
||||
old_dentry->d_name.len, old_dentry->d_name.name,
|
||||
old_dir->i_ino, new_dentry->d_name.len,
|
||||
new_dentry->d_name.name, new_dir->i_ino);
|
||||
dbg_jnl("dent '%pd' in dir ino %lu to dent '%pd' in dir ino %lu",
|
||||
old_dentry, old_dir->i_ino, new_dentry, new_dir->i_ino);
|
||||
ubifs_assert(ubifs_inode(old_dir)->data_len == 0);
|
||||
ubifs_assert(ubifs_inode(new_dir)->data_len == 0);
|
||||
ubifs_assert(mutex_is_locked(&ubifs_inode(old_dir)->ui_mutex));
|
||||
|
|
|
|||
|
|
@ -303,8 +303,8 @@ int ubifs_setxattr(struct dentry *dentry, const char *name,
|
|||
union ubifs_key key;
|
||||
int err, type;
|
||||
|
||||
dbg_gen("xattr '%s', host ino %lu ('%.*s'), size %zd", name,
|
||||
host->i_ino, dentry->d_name.len, dentry->d_name.name, size);
|
||||
dbg_gen("xattr '%s', host ino %lu ('%pd'), size %zd", name,
|
||||
host->i_ino, dentry, size);
|
||||
ubifs_assert(mutex_is_locked(&host->i_mutex));
|
||||
|
||||
if (size > UBIFS_MAX_INO_DATA)
|
||||
|
|
@ -367,8 +367,8 @@ ssize_t ubifs_getxattr(struct dentry *dentry, const char *name, void *buf,
|
|||
union ubifs_key key;
|
||||
int err;
|
||||
|
||||
dbg_gen("xattr '%s', ino %lu ('%.*s'), buf size %zd", name,
|
||||
host->i_ino, dentry->d_name.len, dentry->d_name.name, size);
|
||||
dbg_gen("xattr '%s', ino %lu ('%pd'), buf size %zd", name,
|
||||
host->i_ino, dentry, size);
|
||||
|
||||
err = check_namespace(&nm);
|
||||
if (err < 0)
|
||||
|
|
@ -426,8 +426,8 @@ ssize_t ubifs_listxattr(struct dentry *dentry, char *buffer, size_t size)
|
|||
int err, len, written = 0;
|
||||
struct qstr nm = { .name = NULL };
|
||||
|
||||
dbg_gen("ino %lu ('%.*s'), buffer size %zd", host->i_ino,
|
||||
dentry->d_name.len, dentry->d_name.name, size);
|
||||
dbg_gen("ino %lu ('%pd'), buffer size %zd", host->i_ino,
|
||||
dentry, size);
|
||||
|
||||
len = host_ui->xattr_names + host_ui->xattr_cnt;
|
||||
if (!buffer)
|
||||
|
|
@ -529,8 +529,8 @@ int ubifs_removexattr(struct dentry *dentry, const char *name)
|
|||
union ubifs_key key;
|
||||
int err;
|
||||
|
||||
dbg_gen("xattr '%s', ino %lu ('%.*s')", name,
|
||||
host->i_ino, dentry->d_name.len, dentry->d_name.name);
|
||||
dbg_gen("xattr '%s', ino %lu ('%pd')", name,
|
||||
host->i_ino, dentry);
|
||||
ubifs_assert(mutex_is_locked(&host->i_mutex));
|
||||
|
||||
err = check_namespace(&nm);
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче