diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1998-03-18 17:17:51 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1998-03-18 17:17:51 +0000 |
| commit | f1382dc4850bb459d24a81c6cb0ef93ea7bd4a79 (patch) | |
| tree | 225271a3d5dcd4e9dea5ee393556abd754c964b1 /fs/hfs/hfs.h | |
| parent | 135b00fc2e90e605ac2a96b20b0ebd93851a3f89 (diff) | |
o Merge with Linux 2.1.90.
o Divide L1 cache sizes by 1024 before printing, makes the numbers a
bit more credible ...
Diffstat (limited to 'fs/hfs/hfs.h')
| -rw-r--r-- | fs/hfs/hfs.h | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/fs/hfs/hfs.h b/fs/hfs/hfs.h index ccc2f0cae..9112a6db8 100644 --- a/fs/hfs/hfs.h +++ b/fs/hfs/hfs.h @@ -11,10 +11,10 @@ #define _HFS_H #include <linux/hfs_sysdep.h> -#include <linux/hfs_fs.h> #define HFS_NEW(X) ((X) = hfs_malloc(sizeof(*(X)))) -#define HFS_DELETE(X) { hfs_free((X), sizeof(*(X))); (X) = NULL; } +#define HFS_DELETE(X) do { hfs_free((X), sizeof(*(X))); (X) = NULL; } \ + while (0) /* offsets to various blocks */ #define HFS_DD_BLK 0 /* Driver Descriptor block */ @@ -337,13 +337,12 @@ struct hfs_file { * This structure holds information about a * file or directory in an HFS filesystem. * - * 'wait' must remain 1st and 'next' 2nd since we do some pointer arithmetic. + * 'wait' must remain 1st and 'hash' 2nd since we do some pointer arithmetic. */ struct hfs_cat_entry { hfs_wait_queue wait; struct list_head hash; struct list_head list; - struct list_head dirty; struct hfs_mdb *mdb; hfs_sysentry sys_entry; struct hfs_cat_key key; @@ -366,7 +365,6 @@ struct hfs_cat_entry { #define HFS_KEYDIRTY 2 #define HFS_LOCK 4 #define HFS_DELETED 8 -#define HFS_SUPERBLK 16 /* * struct hfs_bnode_ref @@ -486,14 +484,11 @@ extern void hfs_mdb_put(struct hfs_mdb *, int); extern int hfs_part_find(hfs_sysmdb, int, int, hfs_s32 *, hfs_s32 *); /* string.c */ -extern unsigned int hfs_strhash(const struct hfs_name *); +extern unsigned long hfs_strhash(const struct hfs_name *); extern int hfs_strcmp(const struct hfs_name *, const struct hfs_name *); extern int hfs_streq(const struct hfs_name *, const struct hfs_name *); extern void hfs_tolower(unsigned char *, int); -/* sysdep.c */ -extern void hfs_cat_prune(struct hfs_cat_entry *); - extern __inline__ struct dentry *hfs_lookup_dentry(const char *name, const int len, struct dentry *base) |