Merge tag 'net-next-6.4' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev...

[platform/kernel/linux-rpi.git] / kernel / cgroup / cgroup.c

diff --git a/kernel/cgroup/cgroup.c b/kernel/cgroup/cgroup.c
index 8a5294f..ae51816 100644 (file)
--- a/kernel/cgroup/cgroup.c
+++ b/kernel/cgroup/cgroup.c
@@ -6866,14 +6866,12 @@ EXPORT_SYMBOL_GPL(cgroup_get_from_path);
 struct cgroup *cgroup_v1v2_get_from_fd(int fd)
 {
        struct cgroup *cgrp;
-       struct file *f;
-
-       f = fget_raw(fd);
-       if (!f)
+       struct fd f = fdget_raw(fd);
+       if (!f.file)
                return ERR_PTR(-EBADF);
 
-       cgrp = cgroup_v1v2_get_from_file(f);
-       fput(f);
+       cgrp = cgroup_v1v2_get_from_file(f.file);
+       fdput(f);
        return cgrp;
 }