summaryrefslogtreecommitdiff
path: root/fs/file.c
diff options
context:
space:
mode:
authorRasmus Villemoes <linux@rasmusvillemoes.dk>2015-10-29 14:01:41 +0300
committerAl Viro <viro@zeniv.linux.org.uk>2015-12-07 05:17:11 +0300
commit752343be63d90c84d275f046e43371febe217863 (patch)
tree9f15c7f9a05e0c54d871d211a7edc71ae4c7cbb3 /fs/file.c
parent474fe9f7f551b151222db07a968b15bf05ffe4c4 (diff)
downloadlinux-752343be63d90c84d275f046e43371febe217863.tar.xz
fs/file.c: __const_max is actually __const_min :-)
7f4b36f9bb930 "get rid of files_defer_init()" inexplicably changed a min() to a __const_max() - but the __const_max macro actually gives the minimum... So no functional change, just less confusing naming. Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/file.c')
-rw-r--r--fs/file.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/file.c b/fs/file.c
index 39f8f15921da..1aed0add16a2 100644
--- a/fs/file.c
+++ b/fs/file.c
@@ -25,9 +25,9 @@
int sysctl_nr_open __read_mostly = 1024*1024;
int sysctl_nr_open_min = BITS_PER_LONG;
-/* our max() is unusable in constant expressions ;-/ */
-#define __const_max(x, y) ((x) < (y) ? (x) : (y))
-int sysctl_nr_open_max = __const_max(INT_MAX, ~(size_t)0/sizeof(void *)) &
+/* our min() is unusable in constant expressions ;-/ */
+#define __const_min(x, y) ((x) < (y) ? (x) : (y))
+int sysctl_nr_open_max = __const_min(INT_MAX, ~(size_t)0/sizeof(void *)) &
-BITS_PER_LONG;
static void *alloc_fdmem(size_t size)