From 6ddcbbd59f0a04eee2b163930fc86d74dd2434ec Mon Sep 17 00:00:00 2001 From: Nathan Benavides-Luu Date: Mon, 1 Apr 2024 12:57:03 -0400 Subject: S5 Fixes (#6) * S5 Fixes * Remove #ifdef OLD * Fix comments for s5_get_disk_block * Add info for newp return parameter * Add stencil comment to s5_file_block_to_disk_block * Remove ifdefno --------- Co-authored-by: Ayma-n --- kernel/include/fs/s5fs/s5fs_subr.h | 6 ------ kernel/include/mm/mobj.h | 4 ---- 2 files changed, 10 deletions(-) (limited to 'kernel/include') diff --git a/kernel/include/fs/s5fs/s5fs_subr.h b/kernel/include/fs/s5fs/s5fs_subr.h index ff4c570..df2c835 100644 --- a/kernel/include/fs/s5fs/s5fs_subr.h +++ b/kernel/include/fs/s5fs/s5fs_subr.h @@ -44,10 +44,4 @@ void s5_remove_blocks(struct s5_node *vnode); /* Converts a vnode_t* to the s5fs_t* (s5fs file system) struct */ #define VNODE_TO_S5FS(vn) ((s5fs_t *)((vn)->vn_fs->fs_i)) -#ifdef OLD -/* Converts an s5fs_t* to its memory object (the memory object of the block device) */ -#define S5FS_TO_VMOBJ(s5fs) (&(s5fs)->s5f_bdev->bd_mobj) -#endif - - pframe_t *s5_cache_and_clear_block(mobj_t *mo, long block, long loc); diff --git a/kernel/include/mm/mobj.h b/kernel/include/mm/mobj.h index bca1b38..800f689 100644 --- a/kernel/include/mm/mobj.h +++ b/kernel/include/mm/mobj.h @@ -14,11 +14,7 @@ typedef enum MOBJ_VNODE = 1, MOBJ_SHADOW, MOBJ_ANON, -#ifdef OLD - MOBJ_BLOCKDEV, -#else MOBJ_FS, -#endif } mobj_type_t; typedef struct mobj_ops -- cgit v1.2.3-70-g09d2