Patched in Tegra support.

1 files changed, 24 insertions, 21 deletions

diff --git a/fs/timerfd.c b/fs/timerfd.c
index d03822bbf19..dffeb3795af 100644
--- a/fs/timerfd.c
+++ b/fs/timerfd.c
@@ -234,17 +234,19 @@ static const struct file_operations timerfd_fops = {
         .llseek         = noop_llseek,
 };
 
-static int timerfd_fget(int fd, struct fd *p)
+static struct file *timerfd_fget(int fd)
 {
-        struct fd f = fdget(fd);
-        if (!f.file)
-                return -EBADF;
-        if (f.file->f_op != &timerfd_fops) {
-                fdput(f);
-                return -EINVAL;
+        struct file *file;
+
+        file = fget(fd);
+        if (!file)
+                return ERR_PTR(-EBADF);
+        if (file->f_op != &timerfd_fops) {
+                fput(file);
+                return ERR_PTR(-EINVAL);
         }
-        *p = f;
-        return 0;
+
+        return file;
 }
 
 SYSCALL_DEFINE2(timerfd_create, int, clockid, int, flags)
@@ -282,7 +284,7 @@ SYSCALL_DEFINE4(timerfd_settime, int, ufd, int, flags,
                 const struct itimerspec __user *, utmr,
                 struct itimerspec __user *, otmr)
 {
-        struct fd f;
+        struct file *file;
         struct timerfd_ctx *ctx;
         struct itimerspec ktmr, kotmr;
         int ret;
@@ -295,10 +297,10 @@ SYSCALL_DEFINE4(timerfd_settime, int, ufd, int, flags,
             !timespec_valid(&ktmr.it_interval))
                 return -EINVAL;
 
-        ret = timerfd_fget(ufd, &f);
-        if (ret)
-                return ret;
-        ctx = f.file->private_data;
+        file = timerfd_fget(ufd);
+        if (IS_ERR(file))
+                return PTR_ERR(file);
+        ctx = file->private_data;
 
         timerfd_setup_cancel(ctx, flags);
 
@@ -332,7 +334,7 @@ SYSCALL_DEFINE4(timerfd_settime, int, ufd, int, flags,
         ret = timerfd_setup(ctx, flags, &ktmr);
 
         spin_unlock_irq(&ctx->wqh.lock);
-        fdput(f);
+        fput(file);
         if (otmr && copy_to_user(otmr, &kotmr, sizeof(kotmr)))
                 return -EFAULT;
 
@@ -341,13 +343,14 @@ SYSCALL_DEFINE4(timerfd_settime, int, ufd, int, flags,
 
 SYSCALL_DEFINE2(timerfd_gettime, int, ufd, struct itimerspec __user *, otmr)
 {
-        struct fd f;
+        struct file *file;
         struct timerfd_ctx *ctx;
         struct itimerspec kotmr;
-        int ret = timerfd_fget(ufd, &f);
-        if (ret)
-                return ret;
-        ctx = f.file->private_data;
+
+        file = timerfd_fget(ufd);
+        if (IS_ERR(file))
+                return PTR_ERR(file);
+        ctx = file->private_data;
 
         spin_lock_irq(&ctx->wqh.lock);
         if (ctx->expired && ctx->tintv.tv64) {
@@ -359,7 +362,7 @@ SYSCALL_DEFINE2(timerfd_gettime, int, ufd, struct itimerspec __user *, otmr)
         kotmr.it_value = ktime_to_timespec(timerfd_get_remaining(ctx));
         kotmr.it_interval = ktime_to_timespec(ctx->tintv);
         spin_unlock_irq(&ctx->wqh.lock);
-        fdput(f);
+        fput(file);
 
         return copy_to_user(otmr, &kotmr, sizeof(kotmr)) ? -EFAULT: 0;
 }