From 2dbcc6a59fb55b01a29e460a7f65828d87658615 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Sun, 26 Aug 2012 21:01:46 -0400 Subject: [PATCH] --- yaml --- r: 328998 b: refs/heads/master c: 6bdf2954016ef7c1f4d4fa07a338ee197d9c3506 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/ext4/ioctl.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index a708c98e61b2..6a19bed33446 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4557c669ef9801d96cf663331cdd1dcb8fa9c2f1 +refs/heads/master: 6bdf2954016ef7c1f4d4fa07a338ee197d9c3506 diff --git a/trunk/fs/ext4/ioctl.c b/trunk/fs/ext4/ioctl.c index a0ee682dc394..39646f224514 100644 --- a/trunk/fs/ext4/ioctl.c +++ b/trunk/fs/ext4/ioctl.c @@ -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)) @@ -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; @@ -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; }