2015-10-29 9:01 GMT-02:00 Rasmus Villemoes <linux@xxxxxxxxxxxxxxxxxx>: > 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@xxxxxxxxxxxxxxxxxx> > --- > fs/file.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/fs/file.c b/fs/file.c > index 6c672ad329e9..b2d74f6001eb 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) Confused code or no ? Albino -- To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html