Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
NFSD: Rename a function parameter
Clean up: A function parameter called "rqstp" typically refers to an
object of type "struct svc_rqst", so it's confusing when such an
parameter refers to a different struct type with field names that are
very similar to svc_rqst.
Reviewed-by: Jeff Layton <jlayton@kernel.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
+14
-14
+14
-14
fs/nfsd/nfsctl.c
+14
-14
fs/nfsd/nfsctl.c
···
1436
1436
1437
1437
static int nfsd_genl_rpc_status_compose_msg(struct sk_buff *skb,
1438
1438
struct netlink_callback *cb,
1439
-
struct nfsd_genl_rqstp *rqstp)
1439
+
struct nfsd_genl_rqstp *genl_rqstp)
1440
1440
{
1441
1441
void *hdr;
1442
1442
u32 i;
···
1446
1446
if (!hdr)
1447
1447
return -ENOBUFS;
1448
1448
1449
-
if (nla_put_be32(skb, NFSD_A_RPC_STATUS_XID, rqstp->rq_xid) ||
1450
-
nla_put_u32(skb, NFSD_A_RPC_STATUS_FLAGS, rqstp->rq_flags) ||
1451
-
nla_put_u32(skb, NFSD_A_RPC_STATUS_PROG, rqstp->rq_prog) ||
1452
-
nla_put_u32(skb, NFSD_A_RPC_STATUS_PROC, rqstp->rq_proc) ||
1453
-
nla_put_u8(skb, NFSD_A_RPC_STATUS_VERSION, rqstp->rq_vers) ||
1449
+
if (nla_put_be32(skb, NFSD_A_RPC_STATUS_XID, genl_rqstp->rq_xid) ||
1450
+
nla_put_u32(skb, NFSD_A_RPC_STATUS_FLAGS, genl_rqstp->rq_flags) ||
1451
+
nla_put_u32(skb, NFSD_A_RPC_STATUS_PROG, genl_rqstp->rq_prog) ||
1452
+
nla_put_u32(skb, NFSD_A_RPC_STATUS_PROC, genl_rqstp->rq_proc) ||
1453
+
nla_put_u8(skb, NFSD_A_RPC_STATUS_VERSION, genl_rqstp->rq_vers) ||
1454
1454
nla_put_s64(skb, NFSD_A_RPC_STATUS_SERVICE_TIME,
1455
-
ktime_to_us(rqstp->rq_stime),
1455
+
ktime_to_us(genl_rqstp->rq_stime),
1456
1456
NFSD_A_RPC_STATUS_PAD))
1457
1457
return -ENOBUFS;
1458
1458
1459
-
switch (rqstp->rq_saddr.sa_family) {
1459
+
switch (genl_rqstp->rq_saddr.sa_family) {
1460
1460
case AF_INET: {
1461
1461
const struct sockaddr_in *s_in, *d_in;
1462
1462
1463
-
s_in = (const struct sockaddr_in *)&rqstp->rq_saddr;
1464
-
d_in = (const struct sockaddr_in *)&rqstp->rq_daddr;
1463
+
s_in = (const struct sockaddr_in *)&genl_rqstp->rq_saddr;
1464
+
d_in = (const struct sockaddr_in *)&genl_rqstp->rq_daddr;
1465
1465
if (nla_put_in_addr(skb, NFSD_A_RPC_STATUS_SADDR4,
1466
1466
s_in->sin_addr.s_addr) ||
1467
1467
nla_put_in_addr(skb, NFSD_A_RPC_STATUS_DADDR4,
···
1476
1476
case AF_INET6: {
1477
1477
const struct sockaddr_in6 *s_in, *d_in;
1478
1478
1479
-
s_in = (const struct sockaddr_in6 *)&rqstp->rq_saddr;
1480
-
d_in = (const struct sockaddr_in6 *)&rqstp->rq_daddr;
1479
+
s_in = (const struct sockaddr_in6 *)&genl_rqstp->rq_saddr;
1480
+
d_in = (const struct sockaddr_in6 *)&genl_rqstp->rq_daddr;
1481
1481
if (nla_put_in6_addr(skb, NFSD_A_RPC_STATUS_SADDR6,
1482
1482
&s_in->sin6_addr) ||
1483
1483
nla_put_in6_addr(skb, NFSD_A_RPC_STATUS_DADDR6,
···
1491
1491
}
1492
1492
}
1493
1493
1494
-
for (i = 0; i < rqstp->rq_opcnt; i++)
1494
+
for (i = 0; i < genl_rqstp->rq_opcnt; i++)
1495
1495
if (nla_put_u32(skb, NFSD_A_RPC_STATUS_COMPOUND_OPS,
1496
-
rqstp->rq_opnum[i]))
1496
+
genl_rqstp->rq_opnum[i]))
1497
1497
return -ENOBUFS;
1498
1498
1499
1499
genlmsg_end(skb, hdr);