From 65c5f11734be10f04c1c3ec7e68c858c1e5a86ab Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Thu, 2 Apr 2009 16:59:25 -0700 Subject: [PATCH] --- yaml --- r: 139752 b: refs/heads/master c: 10c7db279218eda4b19d29ee17db8a815b18d564 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/compat.c | 20 ++++++++++++-------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index f6a89365916d..81bb0ef2fa03 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ddd9e91b71072b8ebe89311c3a44b077defa1756 +refs/heads/master: 10c7db279218eda4b19d29ee17db8a815b18d564 diff --git a/trunk/fs/compat.c b/trunk/fs/compat.c index 7c1615183d1e..440a019256dd 100644 --- a/trunk/fs/compat.c +++ b/trunk/fs/compat.c @@ -1222,13 +1222,14 @@ compat_sys_readv(unsigned long fd, const struct compat_iovec __user *vec, unsigned long vlen) { struct file *file; + int fput_needed; ssize_t ret; - file = fget(fd); + file = fget_light(fd, &fput_needed); if (!file) return -EBADF; ret = compat_readv(file, vec, vlen, &file->f_pos); - fput(file); + fput_light(file, fput_needed); return ret; } @@ -1238,15 +1239,16 @@ compat_sys_preadv(unsigned long fd, const struct compat_iovec __user *vec, { loff_t pos = ((loff_t)pos_high << 32) | pos_low; struct file *file; + int fput_needed; ssize_t ret; if (pos < 0) return -EINVAL; - file = fget(fd); + file = fget_light(fd, &fput_needed); if (!file) return -EBADF; ret = compat_readv(file, vec, vlen, &pos); - fput(file); + fput_light(file, fput_needed); return ret; } @@ -1277,13 +1279,14 @@ compat_sys_writev(unsigned long fd, const struct compat_iovec __user *vec, unsigned long vlen) { struct file *file; + int fput_needed; ssize_t ret; - file = fget(fd); + file = fget_light(fd, &fput_needed); if (!file) return -EBADF; ret = compat_writev(file, vec, vlen, &file->f_pos); - fput(file); + fput_light(file, fput_needed); return ret; } @@ -1293,15 +1296,16 @@ compat_sys_pwritev(unsigned long fd, const struct compat_iovec __user *vec, { loff_t pos = ((loff_t)pos_high << 32) | pos_low; struct file *file; + int fput_needed; ssize_t ret; if (pos < 0) return -EINVAL; - file = fget(fd); + file = fget_light(fd, &fput_needed); if (!file) return -EBADF; ret = compat_writev(file, vec, vlen, &pos); - fput(file); + fput_light(file, fput_needed); return ret; }