Skip to content

L
linux
Commit a14bf037 authored by Alexander Viro's avatar Alexander Viro Committed by Linus Torvalds
Browse files
Options

[PATCH] minixfs cleanups (1/4) 

Move minix-private stuff to fs/minix/minix.h.
parent d2d6a4f8
Hide whitespace changes
Inline Side-by-side
Showing with 98 additions and 119 deletions
fs/minix/bitmap.c
View file @ a14bf037
......@@ -11,8 +11,7 @@
/* bitmap.c contains the code that handles the inode and block bitmaps */
#include <linux/fs.h>
#include <linux/minix_fs.h>
#include "minix.h"
#include <linux/locks.h>
#include <asm/bitops.h>
......
fs/minix/dir.c
View file @ a14bf037
......@@ -6,9 +6,7 @@
* minix directory handling functions
*/
#include <linux/fs.h>
#include <linux/minix_fs.h>
#include <linux/pagemap.h>
#include "minix.h"
typedef struct minix_dir_entry minix_dirent;
......
fs/minix/file.c
View file @ a14bf037
......@@ -6,8 +6,7 @@
* minix regular file handling primitives
*/
#include <linux/fs.h>
#include <linux/minix_fs.h>
#include "minix.h"
/*
* We have mostly NULLs here: the current defaults are OK for
......
fs/minix/inode.c
View file @ a14bf037
......@@ -11,8 +11,7 @@
#include <linux/module.h>
#include <linux/fs.h>
#include <linux/minix_fs.h>
#include "minix.h"
#include <linux/slab.h>
#include <linux/locks.h>
#include <linux/init.h>
......
fs/minix/itree_v1.c
View file @ a14bf037
#include <linux/fs.h>
#include <linux/minix_fs.h>
#include "minix.h"
#include <linux/locks.h>
#include <linux/smp_lock.h>
......
fs/minix/itree_v2.c
View file @ a14bf037
#include <linux/fs.h>
#include <linux/minix_fs.h>
#include "minix.h"
#include <linux/locks.h>
#include <linux/smp_lock.h>
......
fs/minix/minix.h 0 → 100644
View file @ a14bf037
#include <linux/fs.h>
#include <linux/pagemap.h>
#include <linux/minix_fs.h>
/*
* change the define below to 0 if you want names > info->s_namelen chars to be
* truncated. Else they will be disallowed (ENAMETOOLONG).
*/
#define NO_TRUNCATE 1
#define INODE_VERSION(inode) minix_sb(inode->i_sb)->s_version
#define MINIX_V1 0x0001 /* original minix fs */
#define MINIX_V2 0x0002 /* minix V2 fs */
/*
* minix fs inode data in memory
*/
struct minix_inode_info {
union {
__u16 i1_data[16];
__u32 i2_data[16];
} u;
struct inode vfs_inode;
};
/*
* minix super-block data in memory
*/
struct minix_sb_info {
unsigned long s_ninodes;
unsigned long s_nzones;
unsigned long s_imap_blocks;
unsigned long s_zmap_blocks;
unsigned long s_firstdatazone;
unsigned long s_log_zone_size;
unsigned long s_max_size;
int s_dirsize;
int s_namelen;
int s_link_max;
struct buffer_head ** s_imap;
struct buffer_head ** s_zmap;
struct buffer_head * s_sbh;
struct minix_super_block * s_ms;
unsigned short s_mount_state;
unsigned short s_version;
};
extern struct minix_inode * minix_V1_raw_inode(struct super_block *, ino_t, struct buffer_head **);
extern struct minix2_inode * minix_V2_raw_inode(struct super_block *, ino_t, struct buffer_head **);
extern struct inode * minix_new_inode(const struct inode * dir, int * error);
extern void minix_free_inode(struct inode * inode);
extern unsigned long minix_count_free_inodes(struct super_block *sb);
extern int minix_new_block(struct inode * inode);
extern void minix_free_block(struct inode * inode, int block);
extern unsigned long minix_count_free_blocks(struct super_block *sb);
extern void V1_minix_truncate(struct inode *);
extern void V2_minix_truncate(struct inode *);
extern void minix_truncate(struct inode *);
extern int minix_sync_inode(struct inode *);
extern void minix_set_inode(struct inode *, dev_t);
extern int V1_minix_get_block(struct inode *, long, struct buffer_head *, int);
extern int V2_minix_get_block(struct inode *, long, struct buffer_head *, int);
extern struct minix_dir_entry *minix_find_entry(struct dentry*, struct page**);
extern int minix_add_link(struct dentry*, struct inode*);
extern int minix_delete_entry(struct minix_dir_entry*, struct page*);
extern int minix_make_empty(struct inode*, struct inode*);
extern int minix_empty_dir(struct inode*);
extern void minix_set_link(struct minix_dir_entry*, struct page*, struct inode*);
extern struct minix_dir_entry *minix_dotdot(struct inode*, struct page**);
extern ino_t minix_inode_by_name(struct dentry*);
extern int minix_sync_file(struct file *, struct dentry *, int);
extern struct inode_operations minix_file_inode_operations;
extern struct inode_operations minix_dir_inode_operations;
extern struct file_operations minix_file_operations;
extern struct file_operations minix_dir_operations;
extern struct dentry_operations minix_dentry_operations;
static inline struct minix_sb_info *minix_sb(struct super_block *sb)
{
return sb->u.generic_sbp;
}
static inline struct minix_inode_info *minix_i(struct inode *inode)
{
return list_entry(inode, struct minix_inode_info, vfs_inode);
}
fs/minix/namei.c
View file @ a14bf037
......@@ -4,9 +4,7 @@
* Copyright (C) 1991, 1992 Linus Torvalds
*/
#include <linux/fs.h>
#include <linux/minix_fs.h>
#include <linux/pagemap.h>
#include "minix.h"
static inline void inc_count(struct inode *inode)
{
......
include/linux/minix_fs.h
View file @ a14bf037
......@@ -29,11 +29,6 @@
#define MINIX_INODES_PER_BLOCK ((BLOCK_SIZE)/(sizeof (struct minix_inode)))
#define MINIX2_INODES_PER_BLOCK ((BLOCK_SIZE)/(sizeof (struct minix2_inode)))
#define MINIX_V1 0x0001 /* original minix fs */
#define MINIX_V2 0x0002 /* minix V2 fs */
#define INODE_VERSION(inode) minix_sb(inode->i_sb)->s_version
/*
* This is the original minix inode layout on disk.
* Note the 8-bit gid and atime and ctime.
......@@ -87,61 +82,4 @@ struct minix_dir_entry {
char name[0];
};
#ifdef __KERNEL__
#include <linux/minix_fs_i.h>
#include <linux/minix_fs_sb.h>
/*
* change the define below to 0 if you want names > info->s_namelen chars to be
* truncated. Else they will be disallowed (ENAMETOOLONG).
*/
#define NO_TRUNCATE 1
extern struct minix_inode * minix_V1_raw_inode(struct super_block *, ino_t, struct buffer_head **);
extern struct minix2_inode * minix_V2_raw_inode(struct super_block *, ino_t, struct buffer_head **);
extern struct inode * minix_new_inode(const struct inode * dir, int * error);
extern void minix_free_inode(struct inode * inode);
extern unsigned long minix_count_free_inodes(struct super_block *sb);
extern int minix_new_block(struct inode * inode);
extern void minix_free_block(struct inode * inode, int block);
extern unsigned long minix_count_free_blocks(struct super_block *sb);
extern void V1_minix_truncate(struct inode *);
extern void V2_minix_truncate(struct inode *);
extern void minix_truncate(struct inode *);
extern int minix_sync_inode(struct inode *);
extern void minix_set_inode(struct inode *, dev_t);
extern int V1_minix_get_block(struct inode *, long, struct buffer_head *, int);
extern int V2_minix_get_block(struct inode *, long, struct buffer_head *, int);
extern struct minix_dir_entry *minix_find_entry(struct dentry*, struct page**);
extern int minix_add_link(struct dentry*, struct inode*);
extern int minix_delete_entry(struct minix_dir_entry*, struct page*);
extern int minix_make_empty(struct inode*, struct inode*);
extern int minix_empty_dir(struct inode*);
extern void minix_set_link(struct minix_dir_entry*, struct page*, struct inode*);
extern struct minix_dir_entry *minix_dotdot(struct inode*, struct page**);
extern ino_t minix_inode_by_name(struct dentry*);
extern int minix_sync_file(struct file *, struct dentry *, int);
extern struct inode_operations minix_file_inode_operations;
extern struct inode_operations minix_dir_inode_operations;
extern struct file_operations minix_file_operations;
extern struct file_operations minix_dir_operations;
extern struct dentry_operations minix_dentry_operations;
static inline struct minix_sb_info *minix_sb(struct super_block *sb)
{
return sb->u.generic_sbp;
}
static inline struct minix_inode_info *minix_i(struct inode *inode)
{
return list_entry(inode, struct minix_inode_info, vfs_inode);
}
#endif /* __KERNEL__ */
#endif
include/linux/minix_fs_i.h deleted 100644 → 0
View file @ d2d6a4f8
#ifndef _MINIX_FS_I
#define _MINIX_FS_I
/*
* minix fs inode data in memory
*/
struct minix_inode_info {
union {
__u16 i1_data[16];
__u32 i2_data[16];
} u;
struct inode vfs_inode;
};
#endif
include/linux/minix_fs_sb.h deleted 100644 → 0
View file @ d2d6a4f8
#ifndef _MINIX_FS_SB
#define _MINIX_FS_SB
/*
* minix super-block data in memory
*/
struct minix_sb_info {
unsigned long s_ninodes;
unsigned long s_nzones;
unsigned long s_imap_blocks;
unsigned long s_zmap_blocks;
unsigned long s_firstdatazone;
unsigned long s_log_zone_size;
unsigned long s_max_size;
int s_dirsize;
int s_namelen;
int s_link_max;
struct buffer_head ** s_imap;
struct buffer_head ** s_zmap;
struct buffer_head * s_sbh;
struct minix_super_block * s_ms;
unsigned short s_mount_state;
unsigned short s_version;
};
#endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7