aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2007-10-17 02:26:51 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-17 11:42:51 -0400
commitbcd6d4ecf6868ed57d4daae5d48e52d0752566d2 (patch)
treec683016ae6fa2800070402574490aa6f9ad71867 /include
parent3542ae4c17bb2c86e5658728ff73b3d5ca44532e (diff)
ufs: move non-layout parts of ufs_fs.h to fs/ufs/
Move prototypes and in-core structures to fs/ufs/ similar to what most other filesystems already do. I made little modifications: move also ufs debug macros and mount options constants into fs/ufs/ufs.h, this stuff also private for ufs. Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Evgeniy Dushistov <dushistov@mail.ru> Cc: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include')
-rw-r--r--include/linux/ufs_fs.h126
-rw-r--r--include/linux/ufs_fs_i.h33
-rw-r--r--include/linux/ufs_fs_sb.h37
3 files changed, 0 insertions, 196 deletions
diff --git a/include/linux/ufs_fs.h b/include/linux/ufs_fs.h
index 52730d2c9ad9..10b854d3561f 100644
--- a/include/linux/ufs_fs.h
+++ b/include/linux/ufs_fs.h
@@ -46,11 +46,6 @@ typedef __u32 __bitwise __fs32;
46typedef __u16 __bitwise __fs16; 46typedef __u16 __bitwise __fs16;
47#endif 47#endif
48 48
49#ifdef __KERNEL__
50#include <linux/ufs_fs_i.h>
51#include <linux/ufs_fs_sb.h>
52#endif
53
54#define UFS_BBLOCK 0 49#define UFS_BBLOCK 0
55#define UFS_BBSIZE 8192 50#define UFS_BBSIZE 8192
56#define UFS_SBLOCK 8192 51#define UFS_SBLOCK 8192
@@ -188,29 +183,6 @@ typedef __u16 __bitwise __fs16;
188#define UFS_42INODEFMT -1 183#define UFS_42INODEFMT -1
189#define UFS_44INODEFMT 2 184#define UFS_44INODEFMT 2
190 185
191/* mount options */
192#define UFS_MOUNT_ONERROR 0x0000000F
193#define UFS_MOUNT_ONERROR_PANIC 0x00000001
194#define UFS_MOUNT_ONERROR_LOCK 0x00000002
195#define UFS_MOUNT_ONERROR_UMOUNT 0x00000004
196#define UFS_MOUNT_ONERROR_REPAIR 0x00000008
197
198#define UFS_MOUNT_UFSTYPE 0x0000FFF0
199#define UFS_MOUNT_UFSTYPE_OLD 0x00000010
200#define UFS_MOUNT_UFSTYPE_44BSD 0x00000020
201#define UFS_MOUNT_UFSTYPE_SUN 0x00000040
202#define UFS_MOUNT_UFSTYPE_NEXTSTEP 0x00000080
203#define UFS_MOUNT_UFSTYPE_NEXTSTEP_CD 0x00000100
204#define UFS_MOUNT_UFSTYPE_OPENSTEP 0x00000200
205#define UFS_MOUNT_UFSTYPE_SUNx86 0x00000400
206#define UFS_MOUNT_UFSTYPE_HP 0x00000800
207#define UFS_MOUNT_UFSTYPE_UFS2 0x00001000
208#define UFS_MOUNT_UFSTYPE_SUNOS 0x00002000
209
210#define ufs_clear_opt(o,opt) o &= ~UFS_MOUNT_##opt
211#define ufs_set_opt(o,opt) o |= UFS_MOUNT_##opt
212#define ufs_test_opt(o,opt) ((o) & UFS_MOUNT_##opt)
213
214/* 186/*
215 * MINFREE gives the minimum acceptable percentage of file system 187 * MINFREE gives the minimum acceptable percentage of file system
216 * blocks which may be free. If the freelist drops below this level 188 * blocks which may be free. If the freelist drops below this level
@@ -225,19 +197,6 @@ typedef __u16 __bitwise __fs16;
225 */ 197 */
226#define UFS_MINFREE 5 198#define UFS_MINFREE 5
227#define UFS_DEFAULTOPT UFS_OPTTIME 199#define UFS_DEFAULTOPT UFS_OPTTIME
228
229/*
230 * Debug code
231 */
232#ifdef CONFIG_UFS_DEBUG
233# define UFSD(f, a...) { \
234 printk ("UFSD (%s, %d): %s:", \
235 __FILE__, __LINE__, __FUNCTION__); \
236 printk (f, ## a); \
237 }
238#else
239# define UFSD(f, a...) /**/
240#endif
241 200
242/* 201/*
243 * Turn file system block numbers into disk block addresses. 202 * Turn file system block numbers into disk block addresses.
@@ -991,89 +950,4 @@ struct ufs_super_block_third {
991 __u8 fs_space[1]; 950 __u8 fs_space[1];
992}; 951};
993 952
994#ifdef __KERNEL__
995
996/* balloc.c */
997extern void ufs_free_fragments (struct inode *, u64, unsigned);
998extern void ufs_free_blocks (struct inode *, u64, unsigned);
999extern u64 ufs_new_fragments(struct inode *, void *, u64, u64,
1000 unsigned, int *, struct page *);
1001
1002/* cylinder.c */
1003extern struct ufs_cg_private_info * ufs_load_cylinder (struct super_block *, unsigned);
1004extern void ufs_put_cylinder (struct super_block *, unsigned);
1005
1006/* dir.c */
1007extern const struct inode_operations ufs_dir_inode_operations;
1008extern int ufs_add_link (struct dentry *, struct inode *);
1009extern ino_t ufs_inode_by_name(struct inode *, struct dentry *);
1010extern int ufs_make_empty(struct inode *, struct inode *);
1011extern struct ufs_dir_entry *ufs_find_entry(struct inode *, struct dentry *, struct page **);
1012extern int ufs_delete_entry(struct inode *, struct ufs_dir_entry *, struct page *);
1013extern int ufs_empty_dir (struct inode *);
1014extern struct ufs_dir_entry *ufs_dotdot(struct inode *, struct page **);
1015extern void ufs_set_link(struct inode *dir, struct ufs_dir_entry *de,
1016 struct page *page, struct inode *inode);
1017
1018/* file.c */
1019extern const struct inode_operations ufs_file_inode_operations;
1020extern const struct file_operations ufs_file_operations;
1021
1022extern const struct address_space_operations ufs_aops;
1023
1024/* ialloc.c */
1025extern void ufs_free_inode (struct inode *inode);
1026extern struct inode * ufs_new_inode (struct inode *, int);
1027
1028/* inode.c */
1029extern void ufs_read_inode (struct inode *);
1030extern void ufs_put_inode (struct inode *);
1031extern int ufs_write_inode (struct inode *, int);
1032extern int ufs_sync_inode (struct inode *);
1033extern void ufs_delete_inode (struct inode *);
1034extern struct buffer_head * ufs_bread (struct inode *, unsigned, int, int *);
1035extern int ufs_getfrag_block (struct inode *inode, sector_t fragment, struct buffer_head *bh_result, int create);
1036
1037/* namei.c */
1038extern const struct file_operations ufs_dir_operations;
1039
1040/* super.c */
1041extern void ufs_warning (struct super_block *, const char *, const char *, ...) __attribute__ ((format (printf, 3, 4)));
1042extern void ufs_error (struct super_block *, const char *, const char *, ...) __attribute__ ((format (printf, 3, 4)));
1043extern void ufs_panic (struct super_block *, const char *, const char *, ...) __attribute__ ((format (printf, 3, 4)));
1044
1045/* symlink.c */
1046extern const struct inode_operations ufs_fast_symlink_inode_operations;
1047
1048/* truncate.c */
1049extern int ufs_truncate (struct inode *, loff_t);
1050
1051static inline struct ufs_sb_info *UFS_SB(struct super_block *sb)
1052{
1053 return sb->s_fs_info;
1054}
1055
1056static inline struct ufs_inode_info *UFS_I(struct inode *inode)
1057{
1058 return container_of(inode, struct ufs_inode_info, vfs_inode);
1059}
1060
1061/*
1062 * Give cylinder group number for a file system block.
1063 * Give cylinder group block number for a file system block.
1064 */
1065/* #define ufs_dtog(d) ((d) / uspi->s_fpg) */
1066static inline u64 ufs_dtog(struct ufs_sb_private_info * uspi, u64 b)
1067{
1068 do_div(b, uspi->s_fpg);
1069 return b;
1070}
1071/* #define ufs_dtogd(d) ((d) % uspi->s_fpg) */
1072static inline u32 ufs_dtogd(struct ufs_sb_private_info * uspi, u64 b)
1073{
1074 return do_div(b, uspi->s_fpg);
1075}
1076
1077#endif /* __KERNEL__ */
1078
1079#endif /* __LINUX_UFS_FS_H */ 953#endif /* __LINUX_UFS_FS_H */
diff --git a/include/linux/ufs_fs_i.h b/include/linux/ufs_fs_i.h
deleted file mode 100644
index 6496caa82f9e..000000000000
--- a/include/linux/ufs_fs_i.h
+++ /dev/null
@@ -1,33 +0,0 @@
1/*
2 * linux/include/linux/ufs_fs_i.h
3 *
4 * Copyright (C) 1996
5 * Adrian Rodriguez (adrian@franklins-tower.rutgers.edu)
6 * Laboratory for Computer Science Research Computing Facility
7 * Rutgers, The State University of New Jersey
8 *
9 * NeXTstep support added on February 5th 1998 by
10 * Niels Kristian Bech Jensen <nkbj@image.dk>.
11 */
12
13#ifndef _LINUX_UFS_FS_I_H
14#define _LINUX_UFS_FS_I_H
15
16struct ufs_inode_info {
17 union {
18 __fs32 i_data[15];
19 __u8 i_symlink[4*15];
20 __fs64 u2_i_data[15];
21 } i_u1;
22 __u32 i_flags;
23 __u32 i_shadow;
24 __u32 i_unused1;
25 __u32 i_unused2;
26 __u32 i_oeftflag;
27 __u16 i_osync;
28 __u64 i_lastfrag;
29 __u32 i_dir_start_lookup;
30 struct inode vfs_inode;
31};
32
33#endif /* _LINUX_UFS_FS_I_H */
diff --git a/include/linux/ufs_fs_sb.h b/include/linux/ufs_fs_sb.h
deleted file mode 100644
index e114c93fc578..000000000000
--- a/include/linux/ufs_fs_sb.h
+++ /dev/null
@@ -1,37 +0,0 @@
1/*
2 * linux/include/linux/ufs_fs_sb.h
3 *
4 * Copyright (C) 1996
5 * Adrian Rodriguez (adrian@franklins-tower.rutgers.edu)
6 * Laboratory for Computer Science Research Computing Facility
7 * Rutgers, The State University of New Jersey
8 *
9 * $Id: ufs_fs_sb.h,v 1.8 1998/05/06 12:04:40 jj Exp $
10 *
11 * Write support by Daniel Pirkl <daniel.pirkl@email.cz>
12 */
13
14#ifndef __LINUX_UFS_FS_SB_H
15#define __LINUX_UFS_FS_SB_H
16
17
18#define UFS_MAX_GROUP_LOADED 8
19#define UFS_CGNO_EMPTY ((unsigned)-1)
20
21struct ufs_sb_private_info;
22struct ufs_cg_private_info;
23struct ufs_csum;
24
25struct ufs_sb_info {
26 struct ufs_sb_private_info * s_uspi;
27 struct ufs_csum * s_csp;
28 unsigned s_bytesex;
29 unsigned s_flags;
30 struct buffer_head ** s_ucg;
31 struct ufs_cg_private_info * s_ucpi[UFS_MAX_GROUP_LOADED];
32 unsigned s_cgno[UFS_MAX_GROUP_LOADED];
33 unsigned short s_cg_loaded;
34 unsigned s_mount_opt;
35};
36
37#endif
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-08 07:05:12 -0500