* [PATCH 1/1] fs/quota: kernel-doc warning fixes
@ 2014-07-04 19:44 Fabian Frederick
2014-07-14 10:10 ` Jan Kara
0 siblings, 1 reply; 2+ messages in thread
From: Fabian Frederick @ 2014-07-04 19:44 UTC (permalink / raw)
To: linux-kernel; +Cc: Fabian Frederick, Jan Kara, Andrew Morton
type and id were removed and qid added to quota_send_warning in commit
431f19744d15
("userns: Convert quota netlink aka quota_send_warning")
Cc: Jan Kara <jack@suse.cz>
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Fabian Frederick <fabf@skynet.be>
---
fs/quota/kqid.c | 2 +-
fs/quota/netlink.c | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/fs/quota/kqid.c b/fs/quota/kqid.c
index 2f97b0e..ebc5e62 100644
--- a/fs/quota/kqid.c
+++ b/fs/quota/kqid.c
@@ -55,7 +55,7 @@ EXPORT_SYMBOL(qid_lt);
/**
* from_kqid - Create a qid from a kqid user-namespace pair.
* @targ: The user namespace we want a qid in.
- * @kuid: The kernel internal quota identifier to start with.
+ * @kqid: The kernel internal quota identifier to start with.
*
* Map @kqid into the user-namespace specified by @targ and
* return the resulting qid.
diff --git a/fs/quota/netlink.c b/fs/quota/netlink.c
index 72d2917..bb2869f 100644
--- a/fs/quota/netlink.c
+++ b/fs/quota/netlink.c
@@ -32,8 +32,7 @@ static struct genl_family quota_genl_family = {
/**
* quota_send_warning - Send warning to userspace about exceeded quota
- * @type: The quota type: USRQQUOTA, GRPQUOTA,...
- * @id: The user or group id of the quota that was exceeded
+ * @qid: The kernel internal quota identifier.
* @dev: The device on which the fs is mounted (sb->s_dev)
* @warntype: The type of the warning: QUOTA_NL_...
*
--
1.9.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH 1/1] fs/quota: kernel-doc warning fixes
2014-07-04 19:44 [PATCH 1/1] fs/quota: kernel-doc warning fixes Fabian Frederick
@ 2014-07-14 10:10 ` Jan Kara
0 siblings, 0 replies; 2+ messages in thread
From: Jan Kara @ 2014-07-14 10:10 UTC (permalink / raw)
To: Fabian Frederick; +Cc: linux-kernel, Jan Kara, Andrew Morton
On Fri 04-07-14 21:44:25, Fabian Frederick wrote:
> type and id were removed and qid added to quota_send_warning in commit
>
> 431f19744d15
> ("userns: Convert quota netlink aka quota_send_warning")
>
> Cc: Jan Kara <jack@suse.cz>
> Cc: Andrew Morton <akpm@linux-foundation.org>
> Signed-off-by: Fabian Frederick <fabf@skynet.be>
Thanks, I've merged the patch into my tree.
Honza
> ---
> fs/quota/kqid.c | 2 +-
> fs/quota/netlink.c | 3 +--
> 2 files changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/fs/quota/kqid.c b/fs/quota/kqid.c
> index 2f97b0e..ebc5e62 100644
> --- a/fs/quota/kqid.c
> +++ b/fs/quota/kqid.c
> @@ -55,7 +55,7 @@ EXPORT_SYMBOL(qid_lt);
> /**
> * from_kqid - Create a qid from a kqid user-namespace pair.
> * @targ: The user namespace we want a qid in.
> - * @kuid: The kernel internal quota identifier to start with.
> + * @kqid: The kernel internal quota identifier to start with.
> *
> * Map @kqid into the user-namespace specified by @targ and
> * return the resulting qid.
> diff --git a/fs/quota/netlink.c b/fs/quota/netlink.c
> index 72d2917..bb2869f 100644
> --- a/fs/quota/netlink.c
> +++ b/fs/quota/netlink.c
> @@ -32,8 +32,7 @@ static struct genl_family quota_genl_family = {
>
> /**
> * quota_send_warning - Send warning to userspace about exceeded quota
> - * @type: The quota type: USRQQUOTA, GRPQUOTA,...
> - * @id: The user or group id of the quota that was exceeded
> + * @qid: The kernel internal quota identifier.
> * @dev: The device on which the fs is mounted (sb->s_dev)
> * @warntype: The type of the warning: QUOTA_NL_...
> *
> --
> 1.9.1
>
--
Jan Kara <jack@suse.cz>
SUSE Labs, CR
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-07-14 10:10 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-07-04 19:44 [PATCH 1/1] fs/quota: kernel-doc warning fixes Fabian Frederick
2014-07-14 10:10 ` Jan Kara
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.