1 files changed, 74 insertions, 27 deletions

diff --git a/fs/ext4/ioctl.c b/fs/ext4/ioctl.c
index d26bcac291bb..3c4f8bb59f8a 100644
--- a/fs/ext4/ioctl.c
+++ b/fs/ext4/ioctl.c
@@ -63,18 +63,20 @@ static void swap_inode_data(struct inode *inode1, struct inode *inode2)
         loff_t isize;
         struct ext4_inode_info *ei1;
         struct ext4_inode_info *ei2;
+        unsigned long tmp;
 
         ei1 = EXT4_I(inode1);
         ei2 = EXT4_I(inode2);
 
         swap(inode1->i_version, inode2->i_version);
-        swap(inode1->i_blocks, inode2->i_blocks);
-        swap(inode1->i_bytes, inode2->i_bytes);
         swap(inode1->i_atime, inode2->i_atime);
         swap(inode1->i_mtime, inode2->i_mtime);
 
         memswap(ei1->i_data, ei2->i_data, sizeof(ei1->i_data));
-        swap(ei1->i_flags, ei2->i_flags);
+        tmp = ei1->i_flags & EXT4_FL_SHOULD_SWAP;
+        ei1->i_flags = (ei2->i_flags & EXT4_FL_SHOULD_SWAP) |
+                (ei1->i_flags & ~EXT4_FL_SHOULD_SWAP);
+        ei2->i_flags = tmp | (ei2->i_flags & ~EXT4_FL_SHOULD_SWAP);
         swap(ei1->i_disksize, ei2->i_disksize);
         ext4_es_remove_extent(inode1, 0, EXT_MAX_BLOCKS);
         ext4_es_remove_extent(inode2, 0, EXT_MAX_BLOCKS);
@@ -115,28 +117,42 @@ static long swap_inode_boot_loader(struct super_block *sb,
         int err;
         struct inode *inode_bl;
         struct ext4_inode_info *ei_bl;
-
-        if (inode->i_nlink != 1 || !S_ISREG(inode->i_mode) ||
-            IS_SWAPFILE(inode) || IS_ENCRYPTED(inode) ||
-            ext4_has_inline_data(inode))
-                return -EINVAL;
-
-        if (IS_RDONLY(inode) || IS_APPEND(inode) || IS_IMMUTABLE(inode) ||
-            !inode_owner_or_capable(inode) || !capable(CAP_SYS_ADMIN))
-                return -EPERM;
+        qsize_t size, size_bl, diff;
+        blkcnt_t blocks;
+        unsigned short bytes;
 
         inode_bl = ext4_iget(sb, EXT4_BOOT_LOADER_INO, EXT4_IGET_SPECIAL);
         if (IS_ERR(inode_bl))
                 return PTR_ERR(inode_bl);
         ei_bl = EXT4_I(inode_bl);
 
-        filemap_flush(inode->i_mapping);
-        filemap_flush(inode_bl->i_mapping);
-
         /* Protect orig inodes against a truncate and make sure,
          * that only 1 swap_inode_boot_loader is running. */
         lock_two_nondirectories(inode, inode_bl);
 
+        if (inode->i_nlink != 1 || !S_ISREG(inode->i_mode) ||
+            IS_SWAPFILE(inode) || IS_ENCRYPTED(inode) ||
+            (EXT4_I(inode)->i_flags & EXT4_JOURNAL_DATA_FL) ||
+            ext4_has_inline_data(inode)) {
+                err = -EINVAL;
+                goto journal_err_out;
+        }
+
+        if (IS_RDONLY(inode) || IS_APPEND(inode) || IS_IMMUTABLE(inode) ||
+            !inode_owner_or_capable(inode) || !capable(CAP_SYS_ADMIN)) {
+                err = -EPERM;
+                goto journal_err_out;
+        }
+
+        down_write(&EXT4_I(inode)->i_mmap_sem);
+        err = filemap_write_and_wait(inode->i_mapping);
+        if (err)
+                goto err_out;
+
+        err = filemap_write_and_wait(inode_bl->i_mapping);
+        if (err)
+                goto err_out;
+
         /* Wait for all existing dio workers */
         inode_dio_wait(inode);
         inode_dio_wait(inode_bl);
@@ -147,7 +163,7 @@ static long swap_inode_boot_loader(struct super_block *sb,
         handle = ext4_journal_start(inode_bl, EXT4_HT_MOVE_EXTENTS, 2);
         if (IS_ERR(handle)) {
                 err = -EINVAL;
-                goto journal_err_out;
+                goto err_out;
         }
 
         /* Protect extent tree against block allocations via delalloc */
@@ -170,6 +186,13 @@ static long swap_inode_boot_loader(struct super_block *sb,
                         memset(ei_bl->i_data, 0, sizeof(ei_bl->i_data));
         }
 
+        err = dquot_initialize(inode);
+        if (err)
+                goto err_out1;
+
+        size = (qsize_t)(inode->i_blocks) * (1 << 9) + inode->i_bytes;
+        size_bl = (qsize_t)(inode_bl->i_blocks) * (1 << 9) + inode_bl->i_bytes;
+        diff = size - size_bl;
         swap_inode_data(inode, inode_bl);
 
         inode->i_ctime = inode_bl->i_ctime = current_time(inode);
@@ -183,27 +206,51 @@ static long swap_inode_boot_loader(struct super_block *sb,
 
         err = ext4_mark_inode_dirty(handle, inode);
         if (err < 0) {
+                /* No need to update quota information. */
                 ext4_warning(inode->i_sb,
                         "couldn't mark inode #%lu dirty (err %d)",
                         inode->i_ino, err);
                 /* Revert all changes: */
                 swap_inode_data(inode, inode_bl);
                 ext4_mark_inode_dirty(handle, inode);
-        } else {
-                err = ext4_mark_inode_dirty(handle, inode_bl);
-                if (err < 0) {
-                        ext4_warning(inode_bl->i_sb,
-                                "couldn't mark inode #%lu dirty (err %d)",
-                                inode_bl->i_ino, err);
-                        /* Revert all changes: */
-                        swap_inode_data(inode, inode_bl);
-                        ext4_mark_inode_dirty(handle, inode);
-                        ext4_mark_inode_dirty(handle, inode_bl);
-                }
+                goto err_out1;
+        }
+
+        blocks = inode_bl->i_blocks;
+        bytes = inode_bl->i_bytes;
+        inode_bl->i_blocks = inode->i_blocks;
+        inode_bl->i_bytes = inode->i_bytes;
+        err = ext4_mark_inode_dirty(handle, inode_bl);
+        if (err < 0) {
+                /* No need to update quota information. */
+                ext4_warning(inode_bl->i_sb,
+                        "couldn't mark inode #%lu dirty (err %d)",
+                        inode_bl->i_ino, err);
+                goto revert;
+        }
+
+        /* Bootloader inode should not be counted into quota information. */
+        if (diff > 0)
+                dquot_free_space(inode, diff);
+        else
+                err = dquot_alloc_space(inode, -1 * diff);
+
+        if (err < 0) {
+revert:
+                /* Revert all changes: */
+                inode_bl->i_blocks = blocks;
+                inode_bl->i_bytes = bytes;
+                swap_inode_data(inode, inode_bl);
+                ext4_mark_inode_dirty(handle, inode);
+                ext4_mark_inode_dirty(handle, inode_bl);
         }
+
+err_out1:
         ext4_journal_stop(handle);
         ext4_double_up_write_data_sem(inode, inode_bl);
 
+err_out:
+        up_write(&EXT4_I(inode)->i_mmap_sem);
 journal_err_out:
         unlock_two_nondirectories(inode, inode_bl);
         iput(inode_bl);