ubifs: Move ui->data initialization after initializing security

Host inode and its' xattr will be written on disk after initializing
security when creating symlink or dev, then the host inode and its
dentry will be written again in ubifs_jnl_update.
There is no need to write inode data in the security initialization
pass, just move the ui->data initialization after initializing
security.

Signed-off-by: Zhihao Cheng <[email protected]>
Signed-off-by: Richard Weinberger <[email protected]>

diff --git a/fs/ubifs/dir.c b/fs/ubifs/dir.c
index 551148de66cd86dbf76484d73c4c3acdc5969a1c..848988f2b7dcfb880da6782344f1780ccd182823 100644 (file)
--- a/fs/ubifs/dir.c
+++ b/fs/ubifs/dir.c
@@ -1102,16 +1102,18 @@ static int ubifs_mknod(struct mnt_idmap *idmap, struct inode *dir,
                goto out_fname;
        }
 
+       err = ubifs_init_security(dir, inode, &dentry->d_name);
+       if (err) {
+               kfree(dev);
+               goto out_inode;
+       }
+
        init_special_inode(inode, inode->i_mode, rdev);
        inode->i_size = ubifs_inode(inode)->ui_size = devlen;
        ui = ubifs_inode(inode);
        ui->data = dev;
        ui->data_len = devlen;
 
-       err = ubifs_init_security(dir, inode, &dentry->d_name);
-       if (err)
-               goto out_inode;
-
        mutex_lock(&dir_ui->ui_mutex);
        dir->i_size += sz_change;
        dir_ui->ui_size = dir->i_size;
@@ -1184,6 +1186,10 @@ static int ubifs_symlink(struct mnt_idmap *idmap, struct inode *dir,
                goto out_fname;
        }
 
+       err = ubifs_init_security(dir, inode, &dentry->d_name);
+       if (err)
+               goto out_inode;
+
        ui = ubifs_inode(inode);
        ui->data = kmalloc(disk_link.len, GFP_NOFS);
        if (!ui->data) {
@@ -1209,10 +1215,6 @@ static int ubifs_symlink(struct mnt_idmap *idmap, struct inode *dir,
        ui->data_len = disk_link.len - 1;
        inode->i_size = ubifs_inode(inode)->ui_size = disk_link.len - 1;
 
-       err = ubifs_init_security(dir, inode, &dentry->d_name);
-       if (err)
-               goto out_inode;
-
        mutex_lock(&dir_ui->ui_mutex);
        dir->i_size += sz_change;
        dir_ui->ui_size = dir->i_size;