VisionFive2 Linux kernel

author: Al Viro <viro@zeniv.linux.org.uk> 2012-08-12 17:27:30 -0400 committer: Al Viro <viro@zeniv.linux.org.uk> 2012-09-26 21:08:53 -0400 commit: dcfadfa4ec5a12404a99ad6426871a6b03a62b37 parent: f33ff9927f42045116d738ee47ff7bc59f739bd7

Commit Summary:

new helper: __alloc_fd()

Diffstat:

1 file changed, 8 insertions, 4 deletions

diff --git a/fs/file.c b/fs/file.c
index 08922af4a62c..a3a0705f8f51 100644
--- a/fs/file.c
+++ b/fs/file.c
@@ -420,11 +420,10 @@ struct files_struct init_files = {
 /*
  * allocate a file descriptor, mark it busy.
  */
-int alloc_fd(unsigned start, unsigned flags)
+int __alloc_fd(struct files_struct *files,
+	       unsigned start, unsigned end, unsigned flags)
 {
-	struct files_struct *files = current->files;
 	unsigned int fd;
-	unsigned end = rlimit(RLIMIT_NOFILE);
 	int error;
 	struct fdtable *fdt;
 
@@ -479,8 +478,13 @@ out:
 	return error;
 }
 
+int alloc_fd(unsigned start, unsigned flags)
+{
+	return __alloc_fd(current->files, start, rlimit(RLIMIT_NOFILE), flags);
+}
+
 int get_unused_fd_flags(unsigned flags)
 {
-	return alloc_fd(0, flags);
+	return __alloc_fd(current->files, 0, rlimit(RLIMIT_NOFILE), flags);
 }
 EXPORT_SYMBOL(get_unused_fd_flags);