Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 185884
b: refs/heads/master
c: c437b27
h: refs/heads/master
v: v3
  • Loading branch information
Akira Fujita authored and Theodore Ts'o committed Mar 4, 2010
1 parent c03ee0d commit ffeb3ac
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 7247c0caa23d94a1cb6b307edba9dc45fb0798d4
refs/heads/master: c437b2733520599a2c6e0dbcdeae611319f84707
3 changes: 2 additions & 1 deletion trunk/fs/ext4/ioctl.c
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,8 @@ long ext4_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
if (me.moved_len > 0)
file_remove_suid(donor_filp);

if (copy_to_user((struct move_extent *)arg, &me, sizeof(me)))
if (copy_to_user((struct move_extent __user *)arg,
&me, sizeof(me)))
err = -EFAULT;
mext_out:
fput(donor_filp);
Expand Down
4 changes: 1 addition & 3 deletions trunk/fs/ext4/move_extent.c
Original file line number Diff line number Diff line change
Expand Up @@ -477,7 +477,6 @@ mext_leaf_block(handle_t *handle, struct inode *orig_inode,
struct ext4_extent *oext, *o_start, *o_end, *prev_ext;
struct ext4_extent new_ext, start_ext, end_ext;
ext4_lblk_t new_ext_end;
ext4_fsblk_t new_phys_end;
int oext_alen, new_ext_alen, end_ext_alen;
int depth = ext_depth(orig_inode);
int ret;
Expand All @@ -491,7 +490,6 @@ mext_leaf_block(handle_t *handle, struct inode *orig_inode,
new_ext.ee_len = dext->ee_len;
new_ext_alen = ext4_ext_get_actual_len(&new_ext);
new_ext_end = le32_to_cpu(new_ext.ee_block) + new_ext_alen - 1;
new_phys_end = ext_pblock(&new_ext) + new_ext_alen - 1;

/*
* Case: original extent is first
Expand Down Expand Up @@ -932,7 +930,7 @@ move_extent_per_page(struct file *o_filp, struct inode *donor_inode,
}

/**
* mext_check_argumants - Check whether move extent can be done
* mext_check_arguments - Check whether move extent can be done
*
* @orig_inode: original inode
* @donor_inode: donor inode
Expand Down

0 comments on commit ffeb3ac

Please sign in to comment.