From patchwork Thu Oct 29 11:01:41 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rasmus Villemoes X-Patchwork-Id: 7518151 Return-Path: X-Original-To: patchwork-linux-fsdevel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 9AD3E9F37F for ; Thu, 29 Oct 2015 11:02:28 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A150720A31 for ; Thu, 29 Oct 2015 11:02:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B1FCD20A28 for ; Thu, 29 Oct 2015 11:02:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756078AbbJ2LCN (ORCPT ); Thu, 29 Oct 2015 07:02:13 -0400 Received: from mail-lf0-f52.google.com ([209.85.215.52]:36787 "EHLO mail-lf0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755493AbbJ2LCM (ORCPT ); Thu, 29 Oct 2015 07:02:12 -0400 Received: by lffz202 with SMTP id z202so16756870lff.3 for ; Thu, 29 Oct 2015 04:02:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rasmusvillemoes.dk; s=google; h=from:to:cc:subject:date:message-id; bh=i9UGnnImNxiqo0X2yY0lWUH5NdQmdvv6Wn5jaLPFGco=; b=dm1kl2Oy6Mq87R9O/Uc6q5gn1DY3JXtbjOUy4YQAFyTviGoQe0ktmTJ8ENB73QnL5k uXZqXoXV9RJI82dma1bOxIkEnhprW0RJ/RFH8eYl4xTZzIAZnZ8Uhybii+wgtk1DF5Dj UnkWIGKOi1kiMtoYWgRtRGPIQAxSun/STyxtI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=i9UGnnImNxiqo0X2yY0lWUH5NdQmdvv6Wn5jaLPFGco=; b=Ipjw0mIi9aXBg98TKUDJby2+kHaEhURaRJ7vlgYoSBSEWgnSYH9fSyN/EGKknN8/U5 UZggxPTLHOShYt0dl+RNH0rv4Ujw1ir+5p8QgJaUdldohWWNgUWcyOqefiEI3mq01Y80 8z81Jd/GDLvK2dbE1yaX0RtRBeOXsHtw0dgE0WZSKp0j1agnl3/+tSRj/GU9tp48V0Du anUjYh+hW8pqjMdKoUoiREoc2OpGVsdCghRUXtG/rM/CrBhyU0KmZhvQEvVHMYrvupIY C8yv9plUIzj8sUjU97GeocCnAuC9VeiLpGPRrP884tf24MhUV/QyjvlaYettkR7kcGJ2 5qJQ== X-Gm-Message-State: ALoCoQkhbQje0M75cgMTm0xrafleLc2OPi1HOEg5mmUbjJN3fjfNLGahtzbYcw4SIMXWIDuoiIV1 X-Received: by 10.25.19.216 with SMTP id 85mr421098lft.68.1446116530714; Thu, 29 Oct 2015 04:02:10 -0700 (PDT) Received: from garcia.imf.au.dk ([130.225.20.51]) by smtp.gmail.com with ESMTPSA id pm6sm209005lbc.1.2015.10.29.04.02.09 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 29 Oct 2015 04:02:10 -0700 (PDT) From: Rasmus Villemoes To: Alexander Viro Cc: Rasmus Villemoes , linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] fs/file.c: __const_max is actually __const_min :-) Date: Thu, 29 Oct 2015 12:01:41 +0100 Message-Id: <1446116501-25512-1-git-send-email-linux@rasmusvillemoes.dk> X-Mailer: git-send-email 2.6.1 Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- 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)