1 files changed, 16 insertions, 2 deletions

diff --git a/fs/ubifs/dir.c b/fs/ubifs/dir.c
index ea41649e4ca5..0fa6c803992e 100644
--- a/fs/ubifs/dir.c
+++ b/fs/ubifs/dir.c
@@ -108,8 +108,6 @@ struct inode *ubifs_new_inode(struct ubifs_info *c, const struct inode *dir,
         inode->i_mtime = inode->i_atime = inode->i_ctime =
                          ubifs_current_time(inode);
         inode->i_mapping->nrpages = 0;
-        /* Disable readahead */
-        inode->i_mapping->backing_dev_info = &c->bdi;
 
         switch (mode & S_IFMT) {
         case S_IFREG:
@@ -272,6 +270,10 @@ static int ubifs_create(struct inode *dir, struct dentry *dentry, umode_t mode,
                 goto out_budg;
         }
 
+        err = ubifs_init_security(dir, inode, &dentry->d_name);
+        if (err)
+                goto out_cancel;
+
         mutex_lock(&dir_ui->ui_mutex);
         dir->i_size += sz_change;
         dir_ui->ui_size = dir->i_size;
@@ -728,6 +730,10 @@ static int ubifs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode)
                 goto out_budg;
         }
 
+        err = ubifs_init_security(dir, inode, &dentry->d_name);
+        if (err)
+                goto out_cancel;
+
         mutex_lock(&dir_ui->ui_mutex);
         insert_inode_hash(inode);
         inc_nlink(inode);
@@ -808,6 +814,10 @@ static int ubifs_mknod(struct inode *dir, struct dentry *dentry,
         ui->data = dev;
         ui->data_len = devlen;
 
+        err = ubifs_init_security(dir, inode, &dentry->d_name);
+        if (err)
+                goto out_cancel;
+
         mutex_lock(&dir_ui->ui_mutex);
         dir->i_size += sz_change;
         dir_ui->ui_size = dir->i_size;
@@ -884,6 +894,10 @@ static int ubifs_symlink(struct inode *dir, struct dentry *dentry,
         ui->data_len = len;
         inode->i_size = ubifs_inode(inode)->ui_size = len;
 
+        err = ubifs_init_security(dir, inode, &dentry->d_name);
+        if (err)
+                goto out_cancel;
+
         mutex_lock(&dir_ui->ui_mutex);
         dir->i_size += sz_change;
         dir_ui->ui_size = dir->i_size;