From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 44C20CA9EC5 for ; Wed, 30 Oct 2019 15:28:19 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 10C5920679 for ; Wed, 30 Oct 2019 15:28:19 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="n5gKvAiK" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 10C5920679 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=pengutronix.de Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-mtd-bounces+linux-mtd=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=pGpOOMyYKNsY2LoFw6sOxkZfEqllCBVaDKiE9gxsheU=; b=n5gKvAiKUyz/LD EALyajSpzbN91hPMu9QFg1ziXnF9Fwn+s2bNHmKSyyJ9IrK4MAO+PFdIZfvlEiMSaipyPDN5Iqhb2 6uxMHa1dBs8cgXC9hzIYTjrMIpkySrhGJ6nC9KXlwehMRPuAHZLtm80iVCjS/9iQXyKRKocbm7Z1y xBb98Apz076oNvIokdaClHCbVzpFqiamxEpjxT2dNotT6DV1sVeNKw8uYirv/X9xDfkAlIPj7Co7J 83Tbyhajj11n+V2Yzc472USSCKj1W5sodeF7q4r4gtRY1m+6W4YVzVYv17m5vBWLvR1ONxrC5Io27 o3yo6f0xtk8ayFvAGjog==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1iPptR-0006Vy-65; Wed, 30 Oct 2019 15:28:17 +0000 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1iPpsY-0005iZ-EZ for linux-mtd@lists.infradead.org; Wed, 30 Oct 2019 15:27:23 +0000 Received: from dude.hi.pengutronix.de ([2001:67c:670:100:1d::7]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1iPpsG-0003Y2-Ou; Wed, 30 Oct 2019 16:27:04 +0100 Received: from sha by dude.hi.pengutronix.de with local (Exim 4.92) (envelope-from ) id 1iPpsF-0005nD-TZ; Wed, 30 Oct 2019 16:27:03 +0100 From: Sascha Hauer To: linux-fsdevel@vger.kernel.org Subject: [PATCH 04/10] quota: Allow to pass mount path to quotactl Date: Wed, 30 Oct 2019 16:26:56 +0100 Message-Id: <20191030152702.14269-5-s.hauer@pengutronix.de> X-Mailer: git-send-email 2.24.0.rc1 In-Reply-To: <20191030152702.14269-1-s.hauer@pengutronix.de> References: <20191030152702.14269-1-s.hauer@pengutronix.de> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 2001:67c:670:100:1d::7 X-SA-Exim-Mail-From: sha@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-mtd@lists.infradead.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191030_082722_502990_239F7EAF X-CRM114-Status: GOOD ( 17.87 ) X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Richard Weinberger , Sascha Hauer , linux-mtd@lists.infradead.org, kernel@pengutronix.de, Jan Kara Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-mtd" Errors-To: linux-mtd-bounces+linux-mtd=archiver.kernel.org@lists.infradead.org This patch introduces the Q_PATH flag to the quotactl cmd argument. When given, the path given in the special argument to quotactl will be the mount path where the filesystem is mounted, instead of a path to the block device. This is necessary for filesystems which do not have a block device as backing store. Particularly this is done for upcoming UBIFS support. Signed-off-by: Sascha Hauer --- fs/quota/quota.c | 37 ++++++++++++++++++++++++++++--------- include/uapi/linux/quota.h | 1 + 2 files changed, 29 insertions(+), 9 deletions(-) diff --git a/fs/quota/quota.c b/fs/quota/quota.c index cb13fb76dbee..035cdd1b022b 100644 --- a/fs/quota/quota.c +++ b/fs/quota/quota.c @@ -19,6 +19,7 @@ #include #include #include +#include static int check_quotactl_permission(struct super_block *sb, int type, int cmd, qid_t id) @@ -825,12 +826,16 @@ int kernel_quotactl(unsigned int cmd, const char __user *special, { uint cmds, type; struct super_block *sb = NULL; - struct path path, *pathp = NULL; + struct path path, *pathp = NULL, qpath; int ret; + bool q_path; cmds = cmd >> SUBCMDSHIFT; type = cmd & SUBCMDMASK; + q_path = cmds & Q_PATH; + cmds &= ~Q_PATH; + /* * As a special case Q_SYNC can be called without a specific device. * It will iterate all superblocks that have quota enabled and call @@ -855,19 +860,33 @@ int kernel_quotactl(unsigned int cmd, const char __user *special, pathp = &path; } - sb = quotactl_block(special, cmds); - if (IS_ERR(sb)) { - ret = PTR_ERR(sb); - goto out; + if (q_path) { + ret = user_path_at(AT_FDCWD, special, LOOKUP_FOLLOW|LOOKUP_AUTOMOUNT, + &qpath); + if (ret) + goto out1; + + sb = qpath.mnt->mnt_sb; + } else { + sb = quotactl_block(special, cmds); + if (IS_ERR(sb)) { + ret = PTR_ERR(sb); + goto out; + } } ret = do_quotactl(sb, type, cmds, id, addr, pathp); - if (!quotactl_cmd_onoff(cmds)) - drop_super(sb); - else - drop_super_exclusive(sb); + if (!q_path) { + if (!quotactl_cmd_onoff(cmds)) + drop_super(sb); + else + drop_super_exclusive(sb); + } out: + if (q_path) + path_put(&qpath); +out1: if (pathp && !IS_ERR(pathp)) path_put(pathp); return ret; diff --git a/include/uapi/linux/quota.h b/include/uapi/linux/quota.h index f17c9636a859..e1787c0df601 100644 --- a/include/uapi/linux/quota.h +++ b/include/uapi/linux/quota.h @@ -71,6 +71,7 @@ #define Q_GETQUOTA 0x800007 /* get user quota structure */ #define Q_SETQUOTA 0x800008 /* set user quota structure */ #define Q_GETNEXTQUOTA 0x800009 /* get disk limits and usage >= ID */ +#define Q_PATH 0x400000 /* quotactl special arg contains mount path */ /* Quota format type IDs */ #define QFMT_VFS_OLD 1 -- 2.24.0.rc1 ______________________________________________________ Linux MTD discussion mailing list http://lists.infradead.org/mailman/listinfo/linux-mtd/