Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 328998
b: refs/heads/master
c: 6bdf295
h: refs/heads/master
v: v3
  • Loading branch information
Al Viro committed Sep 27, 2012
1 parent 962f64b commit 2dbcc6a
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 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: 4557c669ef9801d96cf663331cdd1dcb8fa9c2f1
refs/heads/master: 6bdf2954016ef7c1f4d4fa07a338ee197d9c3506
6 changes: 3 additions & 3 deletions trunk/fs/ext4/ioctl.c
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ long ext4_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
case EXT4_IOC_MOVE_EXT: {
struct move_extent me;
struct file *donor_filp;
int err;
int err, fput_needed;

if (!(filp->f_mode & FMODE_READ) ||
!(filp->f_mode & FMODE_WRITE))
Expand All @@ -245,7 +245,7 @@ long ext4_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
return -EFAULT;
me.moved_len = 0;

donor_filp = fget(me.donor_fd);
donor_filp = fget_light(me.donor_fd, &fput_needed);
if (!donor_filp)
return -EBADF;

Expand Down Expand Up @@ -274,7 +274,7 @@ long ext4_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
&me, sizeof(me)))
err = -EFAULT;
mext_out:
fput(donor_filp);
fput_light(donor_filp, fput_needed);
return err;
}

Expand Down

0 comments on commit 2dbcc6a

Please sign in to comment.