From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from host.76.145.23.62.rev.coltfrance.com ([62.23.145.76]:55798 "EHLO proxy.6wind.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752112AbcDZIGl (ORCPT ); Tue, 26 Apr 2016 04:06:41 -0400 From: Nicolas Dichtel To: netdev@vger.kernel.org Cc: davem@davemloft.net, sd@queasysnail.net, johannes@sipsolutions.net, kvalo@codeaurora.org, linux-wireless@vger.kernel.org, jack@suse.com, linux-kernel@vger.kernel.org, pshelar@nicira.com, dev@openvswitch.org, jhs@mojatatu.com, philipp.reisner@linbit.com, lars.ellenberg@linbit.com, drbd-dev@lists.linbit.com, Nicolas Dichtel Subject: [PATCH net-next 3/8] fs/quota: use nla_put_u64_64bit() Date: Tue, 26 Apr 2016 10:06:13 +0200 Message-Id: <1461657978-13360-4-git-send-email-nicolas.dichtel@6wind.com> (sfid-20160426_100935_669141_CB4A6ADF) In-Reply-To: <1461657978-13360-1-git-send-email-nicolas.dichtel@6wind.com> References: <1461657978-13360-1-git-send-email-nicolas.dichtel@6wind.com> Sender: linux-wireless-owner@vger.kernel.org List-ID: Signed-off-by: Nicolas Dichtel --- 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 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Nicolas Dichtel Subject: [PATCH net-next 3/8] fs/quota: use nla_put_u64_64bit() Date: Tue, 26 Apr 2016 10:06:13 +0200 Message-ID: <1461657978-13360-4-git-send-email-nicolas.dichtel@6wind.com> References: <1461657978-13360-1-git-send-email-nicolas.dichtel@6wind.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Cc: dev-yBygre7rU0TnMu66kgdUjQ@public.gmane.org, Nicolas Dichtel , sd-y1jBWg8GRStKuXlAQpz2QA@public.gmane.org, linux-wireless-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, jhs-jkUAjuhPggJWk0Htik3J/w@public.gmane.org, lars.ellenberg-63ez5xqkn6DQT0dZR+AlfA@public.gmane.org, jack-IBi9RG/b67k@public.gmane.org, johannes-cdvu00un1VgdHxzADdlk8Q@public.gmane.org, philipp.reisner-63ez5xqkn6DQT0dZR+AlfA@public.gmane.org, davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org, kvalo-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org, drbd-dev-cunTk1MwBs8qoQakbn7OcQ@public.gmane.org To: netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Return-path: In-Reply-To: <1461657978-13360-1-git-send-email-nicolas.dichtel-pdR9zngts4EAvxtiuMwx3w@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces-yBygre7rU0TnMu66kgdUjQ@public.gmane.org Sender: "dev" List-Id: netdev.vger.kernel.org U2lnbmVkLW9mZi1ieTogTmljb2xhcyBEaWNodGVsIDxuaWNvbGFzLmRpY2h0ZWxANndpbmQuY29t PgotLS0KIGZzL3F1b3RhL25ldGxpbmsuYyAgICAgICAgIHwgMTIgKysrKysrKy0tLS0tCiBpbmNs dWRlL3VhcGkvbGludXgvcXVvdGEuaCB8ICAxICsKIDIgZmlsZXMgY2hhbmdlZCwgOCBpbnNlcnRp b25zKCspLCA1IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2ZzL3F1b3RhL25ldGxpbmsuYyBi L2ZzL3F1b3RhL25ldGxpbmsuYwppbmRleCBkMDdhMmY5MWQ4NTguLjhiMjUyNjczZDQ1NCAxMDA2 NDQKLS0tIGEvZnMvcXVvdGEvbmV0bGluay5jCisrKyBiL2ZzL3F1b3RhL25ldGxpbmsuYwpAQCAt NDcsNyArNDcsNyBAQCB2b2lkIHF1b3RhX3NlbmRfd2FybmluZyhzdHJ1Y3Qga3FpZCBxaWQsIGRl dl90IGRldiwKIAl2b2lkICptc2dfaGVhZDsKIAlpbnQgcmV0OwogCWludCBtc2dfc2l6ZSA9IDQg KiBubGFfdG90YWxfc2l6ZShzaXplb2YodTMyKSkgKwotCQkgICAgICAgMiAqIG5sYV90b3RhbF9z aXplKHNpemVvZih1NjQpKTsKKwkJICAgICAgIDIgKiBubGFfdG90YWxfc2l6ZV82NGJpdChzaXpl b2YodTY0KSk7CiAKIAkvKiBXZSBoYXZlIHRvIGFsbG9jYXRlIHVzaW5nIEdGUF9OT0ZTIGFzIHdl IGFyZSBjYWxsZWQgZnJvbSBhCiAJICogZmlsZXN5c3RlbSBwZXJmb3JtaW5nIHdyaXRlIGFuZCB0 aHVzIGZ1cnRoZXIgcmVjdXJzaW9uIGludG8KQEAgLTY4LDggKzY4LDkgQEAgdm9pZCBxdW90YV9z ZW5kX3dhcm5pbmcoc3RydWN0IGtxaWQgcWlkLCBkZXZfdCBkZXYsCiAJcmV0ID0gbmxhX3B1dF91 MzIoc2tiLCBRVU9UQV9OTF9BX1FUWVBFLCBxaWQudHlwZSk7CiAJaWYgKHJldCkKIAkJZ290byBh dHRyX2Vycl9vdXQ7Ci0JcmV0ID0gbmxhX3B1dF91NjQoc2tiLCBRVU9UQV9OTF9BX0VYQ0VTU19J RCwKLQkJCSAgZnJvbV9rcWlkX211bmdlZCgmaW5pdF91c2VyX25zLCBxaWQpKTsKKwlyZXQgPSBu bGFfcHV0X3U2NF82NGJpdChza2IsIFFVT1RBX05MX0FfRVhDRVNTX0lELAorCQkJCWZyb21fa3Fp ZF9tdW5nZWQoJmluaXRfdXNlcl9ucywgcWlkKSwKKwkJCQlRVU9UQV9OTF9BX1BBRCk7CiAJaWYg KHJldCkKIAkJZ290byBhdHRyX2Vycl9vdXQ7CiAJcmV0ID0gbmxhX3B1dF91MzIoc2tiLCBRVU9U QV9OTF9BX1dBUk5JTkcsIHdhcm50eXBlKTsKQEAgLTgxLDggKzgyLDkgQEAgdm9pZCBxdW90YV9z ZW5kX3dhcm5pbmcoc3RydWN0IGtxaWQgcWlkLCBkZXZfdCBkZXYsCiAJcmV0ID0gbmxhX3B1dF91 MzIoc2tiLCBRVU9UQV9OTF9BX0RFVl9NSU5PUiwgTUlOT1IoZGV2KSk7CiAJaWYgKHJldCkKIAkJ Z290byBhdHRyX2Vycl9vdXQ7Ci0JcmV0ID0gbmxhX3B1dF91NjQoc2tiLCBRVU9UQV9OTF9BX0NB VVNFRF9JRCwKLQkJCSAgZnJvbV9rdWlkX211bmdlZCgmaW5pdF91c2VyX25zLCBjdXJyZW50X3Vp ZCgpKSk7CisJcmV0ID0gbmxhX3B1dF91NjRfNjRiaXQoc2tiLCBRVU9UQV9OTF9BX0NBVVNFRF9J RCwKKwkJCQlmcm9tX2t1aWRfbXVuZ2VkKCZpbml0X3VzZXJfbnMsIGN1cnJlbnRfdWlkKCkpLAor CQkJCVFVT1RBX05MX0FfUEFEKTsKIAlpZiAocmV0KQogCQlnb3RvIGF0dHJfZXJyX291dDsKIAln ZW5sbXNnX2VuZChza2IsIG1zZ19oZWFkKTsKZGlmZiAtLWdpdCBhL2luY2x1ZGUvdWFwaS9saW51 eC9xdW90YS5oIGIvaW5jbHVkZS91YXBpL2xpbnV4L3F1b3RhLmgKaW5kZXggMzhiYWRkYjgwN2Y1 Li40ZDI0ODllZjZmMTAgMTAwNjQ0Ci0tLSBhL2luY2x1ZGUvdWFwaS9saW51eC9xdW90YS5oCisr KyBiL2luY2x1ZGUvdWFwaS9saW51eC9xdW90YS5oCkBAIC0xOTEsNiArMTkxLDcgQEAgZW51bSB7 CiAJUVVPVEFfTkxfQV9ERVZfTUFKT1IsCiAJUVVPVEFfTkxfQV9ERVZfTUlOT1IsCiAJUVVPVEFf TkxfQV9DQVVTRURfSUQsCisJUVVPVEFfTkxfQV9QQUQsCiAJX19RVU9UQV9OTF9BX01BWCwKIH07 CiAjZGVmaW5lIFFVT1RBX05MX0FfTUFYIChfX1FVT1RBX05MX0FfTUFYIC0gMSkKLS0gCjIuOC4x CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkZXYgbWFp bGluZyBsaXN0CmRldkBvcGVudnN3aXRjaC5vcmcKaHR0cDovL29wZW52c3dpdGNoLm9yZy9tYWls bWFuL2xpc3RpbmZvL2Rldgo=