]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
amdgpu: switch to fdget()
authorAl Viro <viro@zeniv.linux.org.uk>
Sun, 14 Apr 2019 16:49:44 +0000 (12:49 -0400)
committerAl Viro <viro@zeniv.linux.org.uk>
Thu, 2 May 2019 06:25:53 +0000 (02:25 -0400)
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c

index 0767a93e4d9136c9f79bd46f1d041e4e7433ca1a..639297250c210ce5bd9dffaa1ba4a910b1cb8417 100644 (file)
@@ -53,26 +53,25 @@ static int amdgpu_sched_process_priority_override(struct amdgpu_device *adev,
                                                  int fd,
                                                  enum drm_sched_priority priority)
 {
-       struct file *filp = fget(fd);
+       struct fd f = fdget(fd);
        struct amdgpu_fpriv *fpriv;
        struct amdgpu_ctx *ctx;
        uint32_t id;
        int r;
 
-       if (!filp)
+       if (!f.file)
                return -EINVAL;
 
-       r = amdgpu_file_to_fpriv(filp, &fpriv);
+       r = amdgpu_file_to_fpriv(f.file, &fpriv);
        if (r) {
-               fput(filp);
+               fdput(f);
                return r;
        }
 
        idr_for_each_entry(&fpriv->ctx_mgr.ctx_handles, ctx, id)
                amdgpu_ctx_priority_override(ctx, priority);
 
-       fput(filp);
-
+       fdput(f);
        return 0;
 }
 
@@ -81,30 +80,30 @@ static int amdgpu_sched_context_priority_override(struct amdgpu_device *adev,
                                                  unsigned ctx_id,
                                                  enum drm_sched_priority priority)
 {
-       struct file *filp = fget(fd);
+       struct fd f = fdget(fd);
        struct amdgpu_fpriv *fpriv;
        struct amdgpu_ctx *ctx;
        int r;
 
-       if (!filp)
+       if (!f.file)
                return -EINVAL;
 
-       r = amdgpu_file_to_fpriv(filp, &fpriv);
+       r = amdgpu_file_to_fpriv(f.file, &fpriv);
        if (r) {
-               fput(filp);
+               fdput(f);
                return r;
        }
 
        ctx = amdgpu_ctx_get(fpriv, ctx_id);
 
        if (!ctx) {
-               fput(filp);
+               fdput(f);
                return -EINVAL;
        }
 
        amdgpu_ctx_priority_override(ctx, priority);
        amdgpu_ctx_put(ctx);
-       fput(filp);
+       fdput(f);
 
        return 0;
 }