|
@@ -953,14 +953,6 @@ mext_check_arguments(struct inode *orig_inode,
|
|
unsigned int blkbits = orig_inode->i_blkbits;
|
|
unsigned int blkbits = orig_inode->i_blkbits;
|
|
unsigned int blocksize = 1 << 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)) {
|
|
if (donor_inode->i_mode & (S_ISUID|S_ISGID)) {
|
|
ext4_debug("ext4 move extent: suid or sgid is set"
|
|
ext4_debug("ext4 move extent: suid or sgid is set"
|
|
" to donor file [ino:orig %lu, donor %lu]\n",
|
|
" 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;
|
|
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 */
|
|
/* Protect orig and donor inodes against a truncate */
|
|
ret1 = mext_inode_double_lock(orig_inode, donor_inode);
|
|
ret1 = mext_inode_double_lock(orig_inode, donor_inode);
|
|
if (ret1 < 0)
|
|
if (ret1 < 0)
|