summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorAl Smith <Al.Smith@aeschi.ch.eu.org>1999-05-02 12:09:17 +0000
committerAl Smith <Al.Smith@aeschi.ch.eu.org>1999-05-02 12:09:17 +0000
commit4a7fdfbd17814fc999257f81256fe34e4bd20bdd (patch)
treee5a8076422239ad80bdbd5213cf151e38bfb12c0 /include
parent9f99c1f15350847e106bbe6bebc99d1d8f24901b (diff)
Final changes for release 1.0 of efs.
Diffstat (limited to 'include')
-rw-r--r--include/linux/efs_fs.h4
-rw-r--r--include/linux/fs.h8
2 files changed, 6 insertions, 6 deletions
diff --git a/include/linux/efs_fs.h b/include/linux/efs_fs.h
index 9facecc42..6ae6f620e 100644
--- a/include/linux/efs_fs.h
+++ b/include/linux/efs_fs.h
@@ -9,7 +9,7 @@
#ifndef __EFS_FS_H__
#define __EFS_FS_H__
-#define EFS_VERSION "0.98d"
+#define EFS_VERSION "1.0"
static const char cprt[] = "EFS: "EFS_VERSION" - (c) 1999 Al Smith <Al.Smith@aeschi.ch.eu.org>";
@@ -58,7 +58,7 @@ extern int efs_statfs(struct super_block *, struct statfs *, int);
extern void efs_read_inode(struct inode *);
extern efs_block_t efs_map_block(struct inode *, efs_block_t);
-extern int efs_lookup(struct inode *, struct dentry *);
+extern struct dentry *efs_lookup(struct inode *, struct dentry *);
extern int efs_bmap(struct inode *, int);
extern int init_efs_fs(void);
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 311409e8b..ff6e28dc5 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -274,13 +274,13 @@ static inline int buffer_protected(struct buffer_head * bh)
#include <linux/sysv_fs_i.h>
#include <linux/affs_fs_i.h>
#include <linux/ufs_fs_i.h>
+#include <linux/efs_fs_i.h>
#include <linux/coda_fs_i.h>
#include <linux/romfs_fs_i.h>
#include <linux/smb_fs_i.h>
#include <linux/hfs_fs_i.h>
#include <linux/adfs_fs_i.h>
#include <linux/qnx4_fs_i.h>
-#include <linux/efs_fs_i.h>
/*
* Attribute flags. These should be or-ed together to figure out what
@@ -386,13 +386,13 @@ struct inode {
struct sysv_inode_info sysv_i;
struct affs_inode_info affs_i;
struct ufs_inode_info ufs_i;
+ struct efs_inode_info efs_i;
struct romfs_inode_info romfs_i;
struct coda_inode_info coda_i;
struct smb_inode_info smbfs_i;
struct hfs_inode_info hfs_i;
struct adfs_inode_info adfs_i;
struct qnx4_inode_info qnx4_i;
- struct efs_inode_info efs_i;
struct socket socket_i;
void *generic_ip;
} u;
@@ -509,8 +509,8 @@ extern int fasync_helper(int, struct file *, int, struct fasync_struct **);
#include <linux/sysv_fs_sb.h>
#include <linux/affs_fs_sb.h>
#include <linux/ufs_fs_sb.h>
-#include <linux/romfs_fs_sb.h>
#include <linux/efs_fs_sb.h>
+#include <linux/romfs_fs_sb.h>
#include <linux/smb_fs_sb.h>
#include <linux/hfs_fs_sb.h>
#include <linux/adfs_fs_sb.h>
@@ -552,8 +552,8 @@ struct super_block {
struct sysv_sb_info sysv_sb;
struct affs_sb_info affs_sb;
struct ufs_sb_info ufs_sb;
- struct romfs_sb_info romfs_sb;
struct efs_sb_info efs_sb;
+ struct romfs_sb_info romfs_sb;
struct smb_sb_info smbfs_sb;
struct hfs_sb_info hfs_sb;
struct adfs_sb_info adfs_sb;