diff options
Diffstat (limited to 'fs/ubifs/dir.c')
-rw-r--r-- | fs/ubifs/dir.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/fs/ubifs/dir.c b/fs/ubifs/dir.c index 5b24bc42cad9..90fe60c2f112 100644 --- a/fs/ubifs/dir.c +++ b/fs/ubifs/dir.c | |||
@@ -146,12 +146,12 @@ struct inode *ubifs_new_inode(struct ubifs_info *c, const struct inode *dir, | |||
146 | if (c->highest_inum >= INUM_WARN_WATERMARK) { | 146 | if (c->highest_inum >= INUM_WARN_WATERMARK) { |
147 | if (c->highest_inum >= INUM_WATERMARK) { | 147 | if (c->highest_inum >= INUM_WATERMARK) { |
148 | spin_unlock(&c->cnt_lock); | 148 | spin_unlock(&c->cnt_lock); |
149 | ubifs_err("out of inode numbers"); | 149 | ubifs_err(c, "out of inode numbers"); |
150 | make_bad_inode(inode); | 150 | make_bad_inode(inode); |
151 | iput(inode); | 151 | iput(inode); |
152 | return ERR_PTR(-EINVAL); | 152 | return ERR_PTR(-EINVAL); |
153 | } | 153 | } |
154 | ubifs_warn("running out of inode numbers (current %lu, max %d)", | 154 | ubifs_warn(c, "running out of inode numbers (current %lu, max %d)", |
155 | (unsigned long)c->highest_inum, INUM_WATERMARK); | 155 | (unsigned long)c->highest_inum, INUM_WATERMARK); |
156 | } | 156 | } |
157 | 157 | ||
@@ -222,7 +222,7 @@ static struct dentry *ubifs_lookup(struct inode *dir, struct dentry *dentry, | |||
222 | * checking. | 222 | * checking. |
223 | */ | 223 | */ |
224 | err = PTR_ERR(inode); | 224 | err = PTR_ERR(inode); |
225 | ubifs_err("dead directory entry '%pd', error %d", | 225 | ubifs_err(c, "dead directory entry '%pd', error %d", |
226 | dentry, err); | 226 | dentry, err); |
227 | ubifs_ro_mode(c, err); | 227 | ubifs_ro_mode(c, err); |
228 | goto out; | 228 | goto out; |
@@ -297,7 +297,7 @@ out_inode: | |||
297 | iput(inode); | 297 | iput(inode); |
298 | out_budg: | 298 | out_budg: |
299 | ubifs_release_budget(c, &req); | 299 | ubifs_release_budget(c, &req); |
300 | ubifs_err("cannot create regular file, error %d", err); | 300 | ubifs_err(c, "cannot create regular file, error %d", err); |
301 | return err; | 301 | return err; |
302 | } | 302 | } |
303 | 303 | ||
@@ -450,7 +450,7 @@ static int ubifs_readdir(struct file *file, struct dir_context *ctx) | |||
450 | 450 | ||
451 | out: | 451 | out: |
452 | if (err != -ENOENT) { | 452 | if (err != -ENOENT) { |
453 | ubifs_err("cannot find next direntry, error %d", err); | 453 | ubifs_err(c, "cannot find next direntry, error %d", err); |
454 | return err; | 454 | return err; |
455 | } | 455 | } |
456 | 456 | ||
@@ -744,7 +744,7 @@ static int ubifs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode) | |||
744 | dir->i_mtime = dir->i_ctime = inode->i_ctime; | 744 | dir->i_mtime = dir->i_ctime = inode->i_ctime; |
745 | err = ubifs_jnl_update(c, dir, &dentry->d_name, inode, 0, 0); | 745 | err = ubifs_jnl_update(c, dir, &dentry->d_name, inode, 0, 0); |
746 | if (err) { | 746 | if (err) { |
747 | ubifs_err("cannot create directory, error %d", err); | 747 | ubifs_err(c, "cannot create directory, error %d", err); |
748 | goto out_cancel; | 748 | goto out_cancel; |
749 | } | 749 | } |
750 | mutex_unlock(&dir_ui->ui_mutex); | 750 | mutex_unlock(&dir_ui->ui_mutex); |