projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'sound-4.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...
[firefly-linux-kernel-4.4.55.git]
/
fs
/
ubifs
/
dir.c
diff --git
a/fs/ubifs/dir.c
b/fs/ubifs/dir.c
index 0fa6c803992ea2a6d791c7eb20d128038ca20b37..02d1ee778df032b884ac4d63988d6f7616c59698 100644
(file)
--- 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,
if (c->highest_inum >= INUM_WARN_WATERMARK) {
if (c->highest_inum >= INUM_WATERMARK) {
spin_unlock(&c->cnt_lock);
if (c->highest_inum >= INUM_WARN_WATERMARK) {
if (c->highest_inum >= INUM_WATERMARK) {
spin_unlock(&c->cnt_lock);
- ubifs_err("out of inode numbers");
+ ubifs_err(
c,
"out of inode numbers");
make_bad_inode(inode);
iput(inode);
return ERR_PTR(-EINVAL);
}
make_bad_inode(inode);
iput(inode);
return ERR_PTR(-EINVAL);
}
- ubifs_warn(
"running out of inode numbers (current %lu, max %d
)",
+ ubifs_warn(
c, "running out of inode numbers (current %lu, max %u
)",
(unsigned long)c->highest_inum, INUM_WATERMARK);
}
(unsigned long)c->highest_inum, INUM_WATERMARK);
}
@@
-222,7
+222,7
@@
static struct dentry *ubifs_lookup(struct inode *dir, struct dentry *dentry,
* checking.
*/
err = PTR_ERR(inode);
* checking.
*/
err = PTR_ERR(inode);
- ubifs_err("dead directory entry '%pd', error %d",
+ ubifs_err(
c,
"dead directory entry '%pd', error %d",
dentry, err);
ubifs_ro_mode(c, err);
goto out;
dentry, err);
ubifs_ro_mode(c, err);
goto out;
@@
-272,7
+272,7
@@
static int ubifs_create(struct inode *dir, struct dentry *dentry, umode_t mode,
err = ubifs_init_security(dir, inode, &dentry->d_name);
if (err)
err = ubifs_init_security(dir, inode, &dentry->d_name);
if (err)
- goto out_
cancel
;
+ goto out_
inode
;
mutex_lock(&dir_ui->ui_mutex);
dir->i_size += sz_change;
mutex_lock(&dir_ui->ui_mutex);
dir->i_size += sz_change;
@@
-292,11
+292,12
@@
out_cancel:
dir->i_size -= sz_change;
dir_ui->ui_size = dir->i_size;
mutex_unlock(&dir_ui->ui_mutex);
dir->i_size -= sz_change;
dir_ui->ui_size = dir->i_size;
mutex_unlock(&dir_ui->ui_mutex);
+out_inode:
make_bad_inode(inode);
iput(inode);
out_budg:
ubifs_release_budget(c, &req);
make_bad_inode(inode);
iput(inode);
out_budg:
ubifs_release_budget(c, &req);
- ubifs_err("cannot create regular file, error %d", err);
+ ubifs_err(
c,
"cannot create regular file, error %d", err);
return err;
}
return err;
}
@@
-449,7
+450,7
@@
static int ubifs_readdir(struct file *file, struct dir_context *ctx)
out:
if (err != -ENOENT) {
out:
if (err != -ENOENT) {
- ubifs_err("cannot find next direntry, error %d", err);
+ ubifs_err(
c,
"cannot find next direntry, error %d", err);
return err;
}
return err;
}
@@
-732,7
+733,7
@@
static int ubifs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode)
err = ubifs_init_security(dir, inode, &dentry->d_name);
if (err)
err = ubifs_init_security(dir, inode, &dentry->d_name);
if (err)
- goto out_
cancel
;
+ goto out_
inode
;
mutex_lock(&dir_ui->ui_mutex);
insert_inode_hash(inode);
mutex_lock(&dir_ui->ui_mutex);
insert_inode_hash(inode);
@@
-743,7
+744,7
@@
static int ubifs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode)
dir->i_mtime = dir->i_ctime = inode->i_ctime;
err = ubifs_jnl_update(c, dir, &dentry->d_name, inode, 0, 0);
if (err) {
dir->i_mtime = dir->i_ctime = inode->i_ctime;
err = ubifs_jnl_update(c, dir, &dentry->d_name, inode, 0, 0);
if (err) {
- ubifs_err("cannot create directory, error %d", err);
+ ubifs_err(
c,
"cannot create directory, error %d", err);
goto out_cancel;
}
mutex_unlock(&dir_ui->ui_mutex);
goto out_cancel;
}
mutex_unlock(&dir_ui->ui_mutex);
@@
-757,6
+758,7
@@
out_cancel:
dir_ui->ui_size = dir->i_size;
drop_nlink(dir);
mutex_unlock(&dir_ui->ui_mutex);
dir_ui->ui_size = dir->i_size;
drop_nlink(dir);
mutex_unlock(&dir_ui->ui_mutex);
+out_inode:
make_bad_inode(inode);
iput(inode);
out_budg:
make_bad_inode(inode);
iput(inode);
out_budg:
@@
-816,7
+818,7
@@
static int ubifs_mknod(struct inode *dir, struct dentry *dentry,
err = ubifs_init_security(dir, inode, &dentry->d_name);
if (err)
err = ubifs_init_security(dir, inode, &dentry->d_name);
if (err)
- goto out_
cancel
;
+ goto out_
inode
;
mutex_lock(&dir_ui->ui_mutex);
dir->i_size += sz_change;
mutex_lock(&dir_ui->ui_mutex);
dir->i_size += sz_change;
@@
-836,6
+838,7
@@
out_cancel:
dir->i_size -= sz_change;
dir_ui->ui_size = dir->i_size;
mutex_unlock(&dir_ui->ui_mutex);
dir->i_size -= sz_change;
dir_ui->ui_size = dir->i_size;
mutex_unlock(&dir_ui->ui_mutex);
+out_inode:
make_bad_inode(inode);
iput(inode);
out_budg:
make_bad_inode(inode);
iput(inode);
out_budg:
@@
-896,7
+899,7
@@
static int ubifs_symlink(struct inode *dir, struct dentry *dentry,
err = ubifs_init_security(dir, inode, &dentry->d_name);
if (err)
err = ubifs_init_security(dir, inode, &dentry->d_name);
if (err)
- goto out_
cancel
;
+ goto out_
inode
;
mutex_lock(&dir_ui->ui_mutex);
dir->i_size += sz_change;
mutex_lock(&dir_ui->ui_mutex);
dir->i_size += sz_change;