mirrors/scoutfs
1
0
Fork 0
mirror of https://github.com/versity/scoutfs.git synced 2026-02-07 11:10:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

scoutfs: remove trade_time message

Browse Source 
This was mostly just a demonstration for how to add messages.  We're
about to add a message that we always send on mount so this becomes
completely redundant.

Signed-off-by: Zach Brown <zab@versity.com>
This commit is contained in:
Zach Brown
2017-05-18 10:51:09 -07:00
parent 8ea414ac68
commit 373def02f0
4 changed files with 1 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
kmod/src/format.h
View File

@@ -426,9 +426,7 @@ struct scoutfs_net_segnos {
} __packed;
enum {
/* sends and receives a struct scoutfs_timeval */
SCOUTFS_NET_TRADE_TIME = 0,
SCOUTFS_NET_ALLOC_INODES,
SCOUTFS_NET_ALLOC_INODES = 0,
SCOUTFS_NET_MANIFEST_RANGE_ENTRIES,
SCOUTFS_NET_ALLOC_SEGNO,
SCOUTFS_NET_RECORD_SEGMENT,

66
kmod/src/net.c
View File

@@ -628,45 +628,12 @@ static struct send_buf *process_alloc_inodes(struct super_block *sb,
return sbuf;
}
/*
* Log the time in the request and reply with our current time.
*/
static struct send_buf *process_trade_time(struct super_block *sb,
void *r, int req_len)
{
struct scoutfs_timespec *req = r;
struct scoutfs_timespec *reply;
struct send_buf *sbuf;
struct timespec64 ts;
if (req_len != sizeof(*req))
return ERR_PTR(-EINVAL);
sbuf = alloc_sbuf(sizeof(struct scoutfs_timespec));
if (!sbuf)
return ERR_PTR(-ENOMEM);
getnstimeofday64(&ts);
trace_printk("req %llu.%u replying %llu.%lu\n",
le64_to_cpu(req->sec), le32_to_cpu(req->nsec),
(u64)ts.tv_sec, ts.tv_nsec);
reply = (void *)sbuf->nh->data;
reply->sec = cpu_to_le64(ts.tv_sec);
reply->nsec = cpu_to_le32(ts.tv_nsec);
sbuf->nh->status = SCOUTFS_NET_STATUS_SUCCESS;
return sbuf;
}
typedef struct send_buf *(*proc_func_t)(struct super_block *sb, void *req,
int req_len);
static proc_func_t type_proc_func(u8 type)
{
static proc_func_t funcs[] = {
[SCOUTFS_NET_TRADE_TIME] = process_trade_time,
[SCOUTFS_NET_ALLOC_INODES] = process_alloc_inodes,
[SCOUTFS_NET_MANIFEST_RANGE_ENTRIES] =
process_manifest_range_entries,
@@ -1583,39 +1550,6 @@ int scoutfs_net_alloc_inodes(struct super_block *sb)
alloc_inodes_reply, NULL);
}
static int trade_time_reply(struct super_block *sb, void *reply, int ret,
void *arg)
{
struct scoutfs_timespec *ts = reply;
if (ret != sizeof(*ts))
return -EINVAL;
trace_printk("reply %llu.%u\n",
le64_to_cpu(ts->sec), le32_to_cpu(ts->nsec));
return 0;
}
int scoutfs_net_trade_time(struct super_block *sb)
{
struct scoutfs_timespec send;
struct timespec64 ts;
int ret;
getnstimeofday64(&ts);
send.sec = cpu_to_le64(ts.tv_sec);
send.nsec = cpu_to_le32(ts.tv_nsec);
ret = add_send_buf(sb, SCOUTFS_NET_TRADE_TIME, &send,
sizeof(send), trade_time_reply, NULL);
trace_printk("sent %llu.%lu ret %d\n",
(u64)ts.tv_sec, ts.tv_nsec, ret);
return ret;
}
static struct sock_info *alloc_sinf(struct super_block *sb)
{
struct sock_info *sinf;

1
kmod/src/net.h
View File

@@ -4,7 +4,6 @@
struct scoutfs_key_buf;
struct scoutfs_segment;
int scoutfs_net_trade_time(struct super_block *sb);
int scoutfs_net_alloc_inodes(struct super_block *sb);
int scoutfs_net_manifest_range_entries(struct super_block *sb,
struct scoutfs_key_buf *start,

2
kmod/src/super.c
View File

@@ -234,8 +234,6 @@ static int scoutfs_fill_super(struct super_block *sb, void *data, int silent)
if (ret)
return ret;
scoutfs_net_trade_time(sb);
inode = scoutfs_iget(sb, SCOUTFS_ROOT_INO);
if (IS_ERR(inode))
return PTR_ERR(inode);