Commit 3c6f3714 authored by Nicolas Dichtel's avatar Nicolas Dichtel Committed by David S. Miller
Browse files

fs/quota: use nla_put_u64_64bit() 



Signed-off-by: default avatarNicolas Dichtel <nicolas.dichtel@6wind.com>
Acked-by: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 08f4cbb8

fs/quota/netlink.c

+7 −5
Original line number Diff line number Diff line
@@ -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);

include/uapi/linux/quota.h

+1 −0
Original line number Diff line number Diff line
@@ -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)