hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fs/quota: use nla_put_u64_64bit() 

Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Acked-by: Jan Kara <jack@suse.cz>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Nicolas Dichtel 2016-04-26 10:06:13 +02:00 committed by David S. Miller
parent 08f4cbb8f2
commit 3c6f3714d6
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
fs/quota/netlink.c
View File

@ -47,7 +47,7 @@ void quota_send_warning(struct kqid qid, dev_t dev,
void *msg_head; void *msg_head;
int ret; int ret;
int msg_size = 4 * nla_total_size(sizeof(u32)) + 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 /* We have to allocate using GFP_NOFS as we are called from a
* filesystem performing write and thus further recursion into * 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); ret = nla_put_u32(skb, QUOTA_NL_A_QTYPE, qid.type);
if (ret) if (ret)
goto attr_err_out; goto attr_err_out;
ret = nla_put_u64(skb, QUOTA_NL_A_EXCESS_ID, ret = nla_put_u64_64bit(skb, QUOTA_NL_A_EXCESS_ID,
from_kqid_munged(&init_user_ns, qid)); from_kqid_munged(&init_user_ns, qid),
QUOTA_NL_A_PAD);
if (ret) if (ret)
goto attr_err_out; goto attr_err_out;
ret = nla_put_u32(skb, QUOTA_NL_A_WARNING, warntype); 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)); ret = nla_put_u32(skb, QUOTA_NL_A_DEV_MINOR, MINOR(dev));
if (ret) if (ret)
goto attr_err_out; goto attr_err_out;
ret = nla_put_u64(skb, QUOTA_NL_A_CAUSED_ID, ret = nla_put_u64_64bit(skb, QUOTA_NL_A_CAUSED_ID,
from_kuid_munged(&init_user_ns, current_uid())); from_kuid_munged(&init_user_ns, current_uid()),
QUOTA_NL_A_PAD);
if (ret) if (ret)
goto attr_err_out; goto attr_err_out;
genlmsg_end(skb, msg_head); genlmsg_end(skb, msg_head);

1
include/uapi/linux/quota.h
View File

@ -191,6 +191,7 @@ enum {
QUOTA_NL_A_DEV_MAJOR, QUOTA_NL_A_DEV_MAJOR,
QUOTA_NL_A_DEV_MINOR, QUOTA_NL_A_DEV_MINOR,
QUOTA_NL_A_CAUSED_ID, QUOTA_NL_A_CAUSED_ID,
QUOTA_NL_A_PAD,
__QUOTA_NL_A_MAX, __QUOTA_NL_A_MAX,
}; };
#define QUOTA_NL_A_MAX (__QUOTA_NL_A_MAX - 1) #define QUOTA_NL_A_MAX (__QUOTA_NL_A_MAX - 1)