Merge tag 'xfs-5.11-merge-4' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux

[linux-2.6-microblaze.git] / fs / file.c

diff --git a/fs/file.c b/fs/file.c
index 947ac6d..8434e0a 100644 (file)
--- a/fs/file.c
+++ b/fs/file.c
@@ -411,19 +411,6 @@ static struct fdtable *close_files(struct files_struct * files)
        return fdt;
 }
 
-struct files_struct *get_files_struct(struct task_struct *task)
-{
-       struct files_struct *files;
-
-       task_lock(task);
-       files = task->files;
-       if (files)
-               atomic_inc(&files->count);
-       task_unlock(task);
-
-       return files;
-}
-
 void put_files_struct(struct files_struct *files)
 {
        if (atomic_dec_and_test(&files->count)) {
@@ -642,6 +629,35 @@ int close_fd(unsigned fd)
 }
 EXPORT_SYMBOL(close_fd); /* for ksys_close() */
 
+static inline void __range_cloexec(struct files_struct *cur_fds,
+                                  unsigned int fd, unsigned int max_fd)
+{
+       struct fdtable *fdt;
+
+       if (fd > max_fd)
+               return;
+
+       spin_lock(&cur_fds->file_lock);
+       fdt = files_fdtable(cur_fds);
+       bitmap_set(fdt->close_on_exec, fd, max_fd - fd + 1);
+       spin_unlock(&cur_fds->file_lock);
+}
+
+static inline void __range_close(struct files_struct *cur_fds, unsigned int fd,
+                                unsigned int max_fd)
+{
+       while (fd <= max_fd) {
+               struct file *file;
+
+               file = pick_file(cur_fds, fd++);
+               if (!file)
+                       continue;
+
+               filp_close(file, cur_fds);
+               cond_resched();
+       }
+}
+
 /**
  * __close_range() - Close all file descriptors in a given range.
  *
@@ -657,7 +673,7 @@ int __close_range(unsigned fd, unsigned max_fd, unsigned int flags)
        struct task_struct *me = current;
        struct files_struct *cur_fds = me->files, *fds = NULL;
 
-       if (flags & ~CLOSE_RANGE_UNSHARE)
+       if (flags & ~(CLOSE_RANGE_UNSHARE | CLOSE_RANGE_CLOEXEC))
                return -EINVAL;
 
        if (fd > max_fd)
@@ -695,16 +711,11 @@ int __close_range(unsigned fd, unsigned max_fd, unsigned int flags)
        }
 
        max_fd = min(max_fd, cur_max);
-       while (fd <= max_fd) {
-               struct file *file;
-
-               file = pick_file(cur_fds, fd++);
-               if (!file)
-                       continue;
 
-               filp_close(file, cur_fds);
-               cond_resched();
-       }
+       if (flags & CLOSE_RANGE_CLOEXEC)
+               __range_cloexec(cur_fds, fd, max_fd);
+       else
+               __range_close(cur_fds, fd, max_fd);
 
        if (fds) {
                /*