diff --git a/kmod/src/lock_server.c b/kmod/src/lock_server.c index e9178962..2de5e9e7 100644 --- a/kmod/src/lock_server.c +++ b/kmod/src/lock_server.c @@ -80,9 +80,6 @@ struct lock_server_info { struct dentry *tseq_dentry; struct scoutfs_tseq_tree stats_tseq_tree; struct dentry *stats_tseq_dentry; - - struct scoutfs_alloc *alloc; - struct scoutfs_block_writer *wri; }; #define DECLARE_LOCK_SERVER_INFO(sb, name) \ @@ -815,9 +812,7 @@ static void stats_tseq_show(struct seq_file *m, struct scoutfs_tseq_entry *ent) * Setup the lock server. This is called before networking can deliver * requests. */ -int scoutfs_lock_server_setup(struct super_block *sb, - struct scoutfs_alloc *alloc, - struct scoutfs_block_writer *wri) +int scoutfs_lock_server_setup(struct super_block *sb) { struct scoutfs_sb_info *sbi = SCOUTFS_SB(sb); struct lock_server_info *inf; @@ -831,8 +826,6 @@ int scoutfs_lock_server_setup(struct super_block *sb, inf->locks_root = RB_ROOT; scoutfs_tseq_tree_init(&inf->tseq_tree, lock_server_tseq_show); scoutfs_tseq_tree_init(&inf->stats_tseq_tree, stats_tseq_show); - inf->alloc = alloc; - inf->wri = wri; inf->tseq_dentry = scoutfs_tseq_create("server_locks", sbi->debug_root, &inf->tseq_tree); diff --git a/kmod/src/lock_server.h b/kmod/src/lock_server.h index 60ce31ce..adb76fd7 100644 --- a/kmod/src/lock_server.h +++ b/kmod/src/lock_server.h @@ -11,9 +11,7 @@ int scoutfs_lock_server_response(struct super_block *sb, u64 rid, struct scoutfs_net_lock *nl); int scoutfs_lock_server_farewell(struct super_block *sb, u64 rid); -int scoutfs_lock_server_setup(struct super_block *sb, - struct scoutfs_alloc *alloc, - struct scoutfs_block_writer *wri); +int scoutfs_lock_server_setup(struct super_block *sb); void scoutfs_lock_server_destroy(struct super_block *sb); #endif diff --git a/kmod/src/server.c b/kmod/src/server.c index f15d196a..1b338775 100644 --- a/kmod/src/server.c +++ b/kmod/src/server.c @@ -3887,7 +3887,7 @@ static void scoutfs_server_worker(struct work_struct *work) } scoutfs_server_set_seq_if_greater(sb, max_seq); - ret = scoutfs_lock_server_setup(sb, &server->alloc, &server->wri); + ret = scoutfs_lock_server_setup(sb); if (ret) { scoutfs_err(sb, "server error %d starting lock server", ret); goto shutdown;