projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'block-5.6-20200320' of git://git.kernel.dk/linux-block
[linux-2.6-microblaze.git]
/
fs
/
file.c
diff --git
a/fs/file.c
b/fs/file.c
index
a364e1a
..
c8a4e4c
100644
(file)
--- a/
fs/file.c
+++ b/
fs/file.c
@@
-540,9
+540,14
@@
static int alloc_fd(unsigned start, unsigned flags)
return __alloc_fd(current->files, start, rlimit(RLIMIT_NOFILE), flags);
}
return __alloc_fd(current->files, start, rlimit(RLIMIT_NOFILE), flags);
}
+int __get_unused_fd_flags(unsigned flags, unsigned long nofile)
+{
+ return __alloc_fd(current->files, 0, nofile, flags);
+}
+
int get_unused_fd_flags(unsigned flags)
{
int get_unused_fd_flags(unsigned flags)
{
- return __
alloc_fd(current->files, 0, rlimit(RLIMIT_NOFILE), flags
);
+ return __
get_unused_fd_flags(flags, rlimit(RLIMIT_NOFILE)
);
}
EXPORT_SYMBOL(get_unused_fd_flags);
}
EXPORT_SYMBOL(get_unused_fd_flags);