From 70e08a38b2ded7518678bb1f2a89862b0fa5cc1f Mon Sep 17 00:00:00 2001 From: Christoph Hellwig Date: Mon, 20 May 2002 21:39:34 -0700 Subject: [PATCH] bfs header move around + warning fix (Patch has been ACKed by the bfs maintainer) Now that bfs no more is included in the big unions in fs.h it makes sense to move the contents of bfs_fs_i.h and bfs_fs_sb.h to a bfs-private location. I've created fs/bfs/bfs.h for that, also merging in bfs_defs.h. In addition I've changed si_imap to an unsigned long pointer as the bitops now use that type explicitly. --- include/linux/bfs_fs.h | 25 ------------------------- include/linux/bfs_fs_i.h | 21 --------------------- include/linux/bfs_fs_sb.h | 25 ------------------------- 3 files changed, 71 deletions(-) delete mode 100644 include/linux/bfs_fs_i.h delete mode 100644 include/linux/bfs_fs_sb.h (limited to 'include/linux') diff --git a/include/linux/bfs_fs.h b/include/linux/bfs_fs.h index 0c6349eec459..f7f0913cd110 100644 --- a/include/linux/bfs_fs.h +++ b/include/linux/bfs_fs.h @@ -6,9 +6,6 @@ #ifndef _LINUX_BFS_FS_H #define _LINUX_BFS_FS_H -#include -#include - #define BFS_BSIZE_BITS 9 #define BFS_BSIZE (1<s_from != -1) && (bfs_sb->s_to != -1) && !(sb->s_flags & MS_RDONLY)) -#ifdef __KERNEL__ - -/* file.c */ -extern struct inode_operations bfs_file_inops; -extern struct file_operations bfs_file_operations; -extern struct address_space_operations bfs_aops; - -/* dir.c */ -extern struct inode_operations bfs_dir_inops; -extern struct file_operations bfs_dir_operations; - -static inline struct bfs_sb_info *BFS_SB(struct super_block *sb) -{ - return sb->u.generic_sbp; -} - -static inline struct bfs_inode_info *BFS_I(struct inode *inode) -{ - return list_entry(inode, struct bfs_inode_info, vfs_inode); -} - -#endif /* __KERNEL__ */ #endif /* _LINUX_BFS_FS_H */ diff --git a/include/linux/bfs_fs_i.h b/include/linux/bfs_fs_i.h deleted file mode 100644 index 5a85f1dc143f..000000000000 --- a/include/linux/bfs_fs_i.h +++ /dev/null @@ -1,21 +0,0 @@ -/* - * include/linux/bfs_fs_i.h - * Copyright (C) 1999 Tigran Aivazian - */ - -#ifndef _LINUX_BFS_FS_I -#define _LINUX_BFS_FS_I - -#include - -/* - * BFS file system in-core inode info - */ -struct bfs_inode_info { - unsigned long i_dsk_ino; /* inode number from the disk, can be 0 */ - unsigned long i_sblock; - unsigned long i_eblock; - struct inode vfs_inode; -}; - -#endif /* _LINUX_BFS_FS_I */ diff --git a/include/linux/bfs_fs_sb.h b/include/linux/bfs_fs_sb.h deleted file mode 100644 index efdc30ec7241..000000000000 --- a/include/linux/bfs_fs_sb.h +++ /dev/null @@ -1,25 +0,0 @@ -/* - * include/linux/bfs_fs_sb.h - * Copyright (C) 1999 Tigran Aivazian - */ - -#ifndef _LINUX_BFS_FS_SB -#define _LINUX_BFS_FS_SB - -/* - * BFS file system in-core superblock info - */ -struct bfs_sb_info { - unsigned long si_blocks; - unsigned long si_freeb; - unsigned long si_freei; - unsigned long si_lf_ioff; - unsigned long si_lf_sblk; - unsigned long si_lf_eblk; - unsigned long si_lasti; - char * si_imap; - struct buffer_head * si_sbh; /* buffer header w/superblock */ - struct bfs_super_block * si_bfs_sb; /* superblock in si_sbh->b_data */ -}; - -#endif /* _LINUX_BFS_FS_SB */ -- cgit v1.2.3