Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1387209
| From | Nicolas Dichtel <nicolas.dichtel@6wind.com> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH net-next 3/8] fs/quota: use nla_put_u64_64bit() |
| Date | 2016-04-26 10:10 +0200 |
| Message-ID | <rs6ee-41c-21@gated-at.bofh.it> (permalink) |
| References | <rs6ed-41c-7@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
---
fs/quota/netlink.c | 12 +++++++-----
include/uapi/linux/quota.h | 1 +
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/fs/quota/netlink.c b/fs/quota/netlink.c
index d07a2f91d858..8b252673d454 100644
--- a/fs/quota/netlink.c
+++ b/fs/quota/netlink.c
@@ -47,7 +47,7 @@ void quota_send_warning(struct kqid qid, dev_t dev,
void *msg_head;
int ret;
int msg_size = 4 * nla_total_size(sizeof(u32)) +
- 2 * nla_total_size(sizeof(u64));
+ 2 * nla_total_size_64bit(sizeof(u64));
/* We have to allocate using GFP_NOFS as we are called from a
* filesystem performing write and thus further recursion into
@@ -68,8 +68,9 @@ void quota_send_warning(struct kqid qid, dev_t dev,
ret = nla_put_u32(skb, QUOTA_NL_A_QTYPE, qid.type);
if (ret)
goto attr_err_out;
- ret = nla_put_u64(skb, QUOTA_NL_A_EXCESS_ID,
- from_kqid_munged(&init_user_ns, qid));
+ ret = nla_put_u64_64bit(skb, QUOTA_NL_A_EXCESS_ID,
+ from_kqid_munged(&init_user_ns, qid),
+ QUOTA_NL_A_PAD);
if (ret)
goto attr_err_out;
ret = nla_put_u32(skb, QUOTA_NL_A_WARNING, warntype);
@@ -81,8 +82,9 @@ void quota_send_warning(struct kqid qid, dev_t dev,
ret = nla_put_u32(skb, QUOTA_NL_A_DEV_MINOR, MINOR(dev));
if (ret)
goto attr_err_out;
- ret = nla_put_u64(skb, QUOTA_NL_A_CAUSED_ID,
- from_kuid_munged(&init_user_ns, current_uid()));
+ ret = nla_put_u64_64bit(skb, QUOTA_NL_A_CAUSED_ID,
+ from_kuid_munged(&init_user_ns, current_uid()),
+ QUOTA_NL_A_PAD);
if (ret)
goto attr_err_out;
genlmsg_end(skb, msg_head);
diff --git a/include/uapi/linux/quota.h b/include/uapi/linux/quota.h
index 38baddb807f5..4d2489ef6f10 100644
--- a/include/uapi/linux/quota.h
+++ b/include/uapi/linux/quota.h
@@ -191,6 +191,7 @@ enum {
QUOTA_NL_A_DEV_MAJOR,
QUOTA_NL_A_DEV_MINOR,
QUOTA_NL_A_CAUSED_ID,
+ QUOTA_NL_A_PAD,
__QUOTA_NL_A_MAX,
};
#define QUOTA_NL_A_MAX (__QUOTA_NL_A_MAX - 1)
--
2.8.1
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH net-next 0/8] netlink: align attributes when needed (patchset #3) Nicolas Dichtel <nicolas.dichtel@6wind.com> - 2016-04-26 10:10 +0200
[PATCH net-next 1/8] macsec: use nla_put_u64_64bit() Nicolas Dichtel <nicolas.dichtel@6wind.com> - 2016-04-26 10:10 +0200
[PATCH net-next 3/8] fs/quota: use nla_put_u64_64bit() Nicolas Dichtel <nicolas.dichtel@6wind.com> - 2016-04-26 10:10 +0200
Re: [PATCH net-next 3/8] fs/quota: use nla_put_u64_64bit() Jan Kara <jack@suse.cz> - 2016-04-26 13:10 +0200
Re: [PATCH net-next 3/8] fs/quota: use nla_put_u64_64bit() Jan Kara <jack@suse.cz> - 2016-04-26 14:40 +0200
Re: [PATCH net-next 3/8] fs/quota: use nla_put_u64_64bit() Nicolas Dichtel <nicolas.dichtel@6wind.com> - 2016-04-26 14:40 +0200
Re: [PATCH net-next 3/8] fs/quota: use nla_put_u64_64bit() David Miller <davem@davemloft.net> - 2016-04-26 18:30 +0200
[PATCH net-next 5/8] ovs: align nlattr properly when needed Nicolas Dichtel <nicolas.dichtel@6wind.com> - 2016-04-26 10:10 +0200
[PATCH net-next 8/8] sched: align nlattr properly when needed Nicolas Dichtel <nicolas.dichtel@6wind.com> - 2016-04-26 10:10 +0200
[PATCH net-next 7/8] neigh: align nlattr properly when needed Nicolas Dichtel <nicolas.dichtel@6wind.com> - 2016-04-26 10:10 +0200
[PATCH net-next 2/8] drivers/wireless: use nla_put_u64_64bit() Nicolas Dichtel <nicolas.dichtel@6wind.com> - 2016-04-26 10:20 +0200
[PATCH net-next 4/8] sock_diag: align nlattr properly when needed Nicolas Dichtel <nicolas.dichtel@6wind.com> - 2016-04-26 10:20 +0200
Re: [PATCH net-next 0/8] netlink: align attributes when needed (patchset #3) Lars Ellenberg <lars.ellenberg@linbit.com> - 2016-04-26 14:00 +0200
Re: [Drbd-dev] [PATCH net-next 0/8] netlink: align attributes when needed (patchset #3) Lars Ellenberg <lars.ellenberg@linbit.com> - 2016-04-26 14:20 +0200
Re: [PATCH net-next 0/8] netlink: align attributes when needed (patchset #3) David Miller <davem@davemloft.net> - 2016-04-26 18:30 +0200
Re: [PATCH net-next 0/8] netlink: align attributes when needed (patchset #3) David Miller <davem@davemloft.net> - 2016-04-26 18:10 +0200
csiph-web