From: Sascha Hauer <s.hauer@pengutronix.de> To: linux-fsdevel@vger.kernel.org Cc: linux-mtd@lists.infradead.org, Jan Kara <jack@suse.com>, Richard Weinberger <richard@nod.at>, kernel@pengutronix.de, Sascha Hauer <s.hauer@pengutronix.de> Subject: [PATCH 1/7] quota: Allow to pass mount path to quotactl Date: Wed, 6 Nov 2019 10:15:31 +0100 [thread overview] Message-ID: <20191106091537.32480-2-s.hauer@pengutronix.de> (raw) In-Reply-To: <20191106091537.32480-1-s.hauer@pengutronix.de> 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 <s.hauer@pengutronix.de> --- 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 <linux/types.h> #include <linux/writeback.h> #include <linux/nospec.h> +#include <linux/mount.h> 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
WARNING: multiple messages have this Message-ID (diff)
From: Sascha Hauer <s.hauer@pengutronix.de> To: linux-fsdevel@vger.kernel.org Cc: Richard Weinberger <richard@nod.at>, Sascha Hauer <s.hauer@pengutronix.de>, linux-mtd@lists.infradead.org, kernel@pengutronix.de, Jan Kara <jack@suse.com> Subject: [PATCH 1/7] quota: Allow to pass mount path to quotactl Date: Wed, 6 Nov 2019 10:15:31 +0100 [thread overview] Message-ID: <20191106091537.32480-2-s.hauer@pengutronix.de> (raw) In-Reply-To: <20191106091537.32480-1-s.hauer@pengutronix.de> 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 <s.hauer@pengutronix.de> --- 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 <linux/types.h> #include <linux/writeback.h> #include <linux/nospec.h> +#include <linux/mount.h> 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/
next prev parent reply other threads:[~2019-11-06 9:15 UTC|newest] Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-11-06 9:15 [PATCH v3 0/7] Add quota support to UBIFS Sascha Hauer 2019-11-06 9:15 ` Sascha Hauer 2019-11-06 9:15 ` Sascha Hauer [this message] 2019-11-06 9:15 ` [PATCH 1/7] quota: Allow to pass mount path to quotactl Sascha Hauer 2019-11-06 10:05 ` Jan Kara 2019-11-06 10:05 ` Jan Kara 2019-11-06 10:15 ` Sascha Hauer 2019-11-06 10:15 ` Sascha Hauer 2019-11-06 9:15 ` [PATCH 2/7] ubifs: move checks and preparation into setflags() Sascha Hauer 2019-11-06 9:15 ` Sascha Hauer 2020-01-19 19:56 ` Richard Weinberger 2020-01-19 19:56 ` Richard Weinberger 2019-11-06 9:15 ` [PATCH 3/7] ubifs: Add support for FS_IOC_FS[SG]ETXATTR ioctls Sascha Hauer 2019-11-06 9:15 ` Sascha Hauer 2020-01-19 19:55 ` Richard Weinberger 2020-01-19 19:55 ` Richard Weinberger 2019-11-06 9:15 ` [PATCH 4/7] ubifs: do not ubifs_inode() on potentially NULL pointer Sascha Hauer 2019-11-06 9:15 ` Sascha Hauer 2020-01-19 19:58 ` Richard Weinberger 2020-01-19 19:58 ` Richard Weinberger 2019-11-06 9:15 ` [PATCH 5/7] ubifs: Add support for project id Sascha Hauer 2019-11-06 9:15 ` Sascha Hauer 2020-01-19 20:09 ` Richard Weinberger 2020-01-19 20:09 ` Richard Weinberger 2020-01-24 8:05 ` Sascha Hauer 2020-01-24 8:05 ` Sascha Hauer 2019-11-06 9:15 ` [PATCH 6/7] ubifs: export get_znode Sascha Hauer 2019-11-06 9:15 ` Sascha Hauer 2019-11-06 9:15 ` [PATCH 7/7] ubifs: Add quota support Sascha Hauer 2019-11-06 9:15 ` Sascha Hauer 2019-11-06 10:14 ` Jan Kara 2019-11-06 10:14 ` Jan Kara 2019-11-11 8:57 ` Sascha Hauer 2019-11-11 8:57 ` Sascha Hauer 2019-11-11 16:34 ` Jan Kara 2019-11-11 16:34 ` Jan Kara 2019-11-12 8:59 ` Sascha Hauer 2019-11-12 8:59 ` Sascha Hauer 2019-11-12 9:31 ` Jan Kara 2019-11-12 9:31 ` Jan Kara 2019-11-08 14:47 ` kbuild test robot 2019-11-08 14:47 ` kbuild test robot 2019-11-08 14:47 ` kbuild test robot
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20191106091537.32480-2-s.hauer@pengutronix.de \ --to=s.hauer@pengutronix.de \ --cc=jack@suse.com \ --cc=kernel@pengutronix.de \ --cc=linux-fsdevel@vger.kernel.org \ --cc=linux-mtd@lists.infradead.org \ --cc=richard@nod.at \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.