1 files changed, 17 insertions, 10 deletions

diff --git a/fs/ext4/move_extent.c b/fs/ext4/move_extent.c
index 4098acc701c3..325cef48b39a 100644
--- a/fs/ext4/move_extent.c
+++ b/fs/ext4/move_extent.c
@@ -60,10 +60,10 @@ ext4_double_down_write_data_sem(struct inode *first, struct inode *second)
 {
         if (first < second) {
                 down_write(&EXT4_I(first)->i_data_sem);
-                down_write_nested(&EXT4_I(second)->i_data_sem, SINGLE_DEPTH_NESTING);
+                down_write_nested(&EXT4_I(second)->i_data_sem, I_DATA_SEM_OTHER);
         } else {
                 down_write(&EXT4_I(second)->i_data_sem);
-                down_write_nested(&EXT4_I(first)->i_data_sem, SINGLE_DEPTH_NESTING);
+                down_write_nested(&EXT4_I(first)->i_data_sem, I_DATA_SEM_OTHER);
 
         }
 }
@@ -156,7 +156,7 @@ mext_page_double_lock(struct inode *inode1, struct inode *inode2,
         page[1] = grab_cache_page_write_begin(mapping[1], index2, fl);
         if (!page[1]) {
                 unlock_page(page[0]);
-                page_cache_release(page[0]);
+                put_page(page[0]);
                 return -ENOMEM;
         }
         /*
@@ -192,7 +192,7 @@ mext_page_mkuptodate(struct page *page, unsigned from, unsigned to)
                 create_empty_buffers(page, blocksize, 0);
 
         head = page_buffers(page);
-        block = (sector_t)page->index << (PAGE_CACHE_SHIFT - inode->i_blkbits);
+        block = (sector_t)page->index << (PAGE_SHIFT - inode->i_blkbits);
         for (bh = head, block_start = 0; bh != head || !block_start;
              block++, block_start = block_end, bh = bh->b_this_page) {
                 block_end = block_start + blocksize;
@@ -268,7 +268,7 @@ move_extent_per_page(struct file *o_filp, struct inode *donor_inode,
         int i, err2, jblocks, retries = 0;
         int replaced_count = 0;
         int from = data_offset_in_page << orig_inode->i_blkbits;
-        int blocks_per_page = PAGE_CACHE_SIZE >> orig_inode->i_blkbits;
+        int blocks_per_page = PAGE_SIZE >> orig_inode->i_blkbits;
         struct super_block *sb = orig_inode->i_sb;
         struct buffer_head *bh = NULL;
 
@@ -404,9 +404,9 @@ data_copy:
 
 unlock_pages:
         unlock_page(pagep[0]);
-        page_cache_release(pagep[0]);
+        put_page(pagep[0]);
         unlock_page(pagep[1]);
-        page_cache_release(pagep[1]);
+        put_page(pagep[1]);
 stop_journal:
         ext4_journal_stop(handle);
         if (*err == -ENOSPC &&
@@ -484,6 +484,13 @@ mext_check_arguments(struct inode *orig_inode,
                 return -EBUSY;
         }
 
+        if (IS_NOQUOTA(orig_inode) || IS_NOQUOTA(donor_inode)) {
+                ext4_debug("ext4 move extent: The argument files should "
+                        "not be quota files [ino:orig %lu, donor %lu]\n",
+                        orig_inode->i_ino, donor_inode->i_ino);
+                return -EBUSY;
+        }
+
         /* Ext4 move extent supports only extent based file */
         if (!(ext4_test_inode_flag(orig_inode, EXT4_INODE_EXTENTS))) {
                 ext4_debug("ext4 move extent: orig file is not extents "
@@ -554,7 +561,7 @@ ext4_move_extents(struct file *o_filp, struct file *d_filp, __u64 orig_blk,
         struct inode *orig_inode = file_inode(o_filp);
         struct inode *donor_inode = file_inode(d_filp);
         struct ext4_ext_path *path = NULL;
-        int blocks_per_page = PAGE_CACHE_SIZE >> orig_inode->i_blkbits;
+        int blocks_per_page = PAGE_SIZE >> orig_inode->i_blkbits;
         ext4_lblk_t o_end, o_start = orig_blk;
         ext4_lblk_t d_start = donor_blk;
         int ret;
@@ -648,9 +655,9 @@ ext4_move_extents(struct file *o_filp, struct file *d_filp, __u64 orig_blk,
                 if (o_end - o_start < cur_len)
                         cur_len = o_end - o_start;
 
-                orig_page_index = o_start >> (PAGE_CACHE_SHIFT -
+                orig_page_index = o_start >> (PAGE_SHIFT -
                                                orig_inode->i_blkbits);
-                donor_page_index = d_start >> (PAGE_CACHE_SHIFT -
+                donor_page_index = d_start >> (PAGE_SHIFT -
                                                donor_inode->i_blkbits);
                 offset_in_page = o_start % blocks_per_page;
                 if (cur_len > blocks_per_page- offset_in_page)