bfs header move around + warning fix
PATCH 1/1 bfs header move around + warning fix
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 changes si_imap to and unsigned long pointer as the bitops now use that type explicitly.
fs/bfs/bfs_defs.h deleted +0 -3
@@ -1,3 +0,0 @@ -#define printf(format, args...) \ - printk(KERN_ERR "BFS-fs: %s(): " format, __FUNCTION__, ## args) -
fs/bfs/bfs.h new file +60 -0
60 lines not on this page · raw message
fs/bfs/dir.c +2 -3
@@ -6,10 +6,9 @@#include <linux/time.h> #include <linux/string.h> -#include <linux/bfs_fs.h> +#include <linux/fs.h> #include <linux/smp_lock.h> - -#include "bfs_defs.h" +#include "bfs.h" #undef DEBUG
fs/bfs/file.c +2 -2
@@ -5,9 +5,9 @@*/ #include <linux/fs.h> -#include <linux/bfs_fs.h> +#include <linux/fs.h> #include <linux/smp_lock.h> -#include "bfs_defs.h" +#include "bfs.h" #undef DEBUG
fs/bfs/inode.c +2 -4
@@ -9,12 +9,10 @@#include <linux/mm.h> #include <linux/slab.h> #include <linux/init.h> -#include <linux/bfs_fs.h> +#include <linux/fs.h> #include <linux/smp_lock.h> -#include <asm/uaccess.h> - -#include "bfs_defs.h" +#include "bfs.h" MODULE_AUTHOR ("Tigran A. Aivazian <[email protected]>" );MODULE_DESCRIPTION ("SCO UnixWare BFS filesystem for Linux" );
include/linux/bfs_fs.h +0 -25
@@ -6,9 +6,6 @@#ifndef _LINUX_BFS_FS_H#define _LINUX_BFS_FS_H -#include <linux/bfs_fs_i.h> -#include <linux/bfs_fs_sb.h> -#define BFS_BSIZE_BITS 9#define BFS_BSIZE (1<<BFS_BSIZE_BITS)
@@ -79,26 +76,4 @@#define BFS_UNCLEAN (bfs_sb, sb) \ ((bfs_sb->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 */
include/linux/bfs_fs_i.h deleted +0 -21
@@ -1,21 +0,0 @@ -/* -* include/linux/bfs_fs_i.h -* Copyright (C) 1999 Tigran Aivazian <[email protected]> -*/ - -#ifndef _LINUX_BFS_FS_I -#define _LINUX_BFS_FS_I - -#include <linux/fs.h> - -/* -* 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 */
include/linux/bfs_fs_sb.h deleted +0 -25
@@ -1,25 +0,0 @@ -/* -* include/linux/bfs_fs_sb.h -* Copyright (C) 1999 Tigran Aivazian <[email protected]> -*/ - -#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 */