From c03ee0d1091f5724248f7b21b6a3236b2f63bb14 Mon Sep 17 00:00:00 2001 From: Akira Fujita Date: Thu, 4 Mar 2010 00:34:58 -0500 Subject: [PATCH] --- yaml --- r: 185883 b: refs/heads/master c: 7247c0caa23d94a1cb6b307edba9dc45fb0798d4 h: refs/heads/master i: 185881: 117a14d7c75d1f47608fa17c763999e5a6d49e16 185879: 15d9c18dd7123b57e3f6f66e5609bfcc1e9d795f v: v3 --- [refs] | 2 +- trunk/fs/ext4/move_extent.c | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 60e320a65dfd..191765a4d83c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5fd5249aa36fad98c9fd5edced352939e54f9324 +refs/heads/master: 7247c0caa23d94a1cb6b307edba9dc45fb0798d4 diff --git a/trunk/fs/ext4/move_extent.c b/trunk/fs/ext4/move_extent.c index 9eca1c0ec546..7e99f4e72bf5 100644 --- a/trunk/fs/ext4/move_extent.c +++ b/trunk/fs/ext4/move_extent.c @@ -953,14 +953,6 @@ mext_check_arguments(struct inode *orig_inode, unsigned int blkbits = orig_inode->i_blkbits; unsigned int blocksize = 1 << blkbits; - /* Regular file check */ - if (!S_ISREG(orig_inode->i_mode) || !S_ISREG(donor_inode->i_mode)) { - ext4_debug("ext4 move extent: The argument files should be " - "regular file [ino:orig %lu, donor %lu]\n", - orig_inode->i_ino, donor_inode->i_ino); - return -EINVAL; - } - if (donor_inode->i_mode & (S_ISUID|S_ISGID)) { ext4_debug("ext4 move extent: suid or sgid is set" " to donor file [ino:orig %lu, donor %lu]\n", @@ -1208,6 +1200,14 @@ ext4_move_extents(struct file *o_filp, struct file *d_filp, return -EINVAL; } + /* Regular file check */ + if (!S_ISREG(orig_inode->i_mode) || !S_ISREG(donor_inode->i_mode)) { + ext4_debug("ext4 move extent: The argument files should be " + "regular file [ino:orig %lu, donor %lu]\n", + orig_inode->i_ino, donor_inode->i_ino); + return -EINVAL; + } + /* Protect orig and donor inodes against a truncate */ ret1 = mext_inode_double_lock(orig_inode, donor_inode); if (ret1 < 0)