fist-2.3.99-pre9.diff

Solaris操作系统下的过滤驱动程序, C源码程序.

diff -ruN linux-2.3.99-pre9-vanilla/fs/exec.c linux-2.3.99-pre9-fist/fs/exec.c
--- linux-2.3.99-pre9-vanilla/fs/exec.c	Sun May 21 14:38:47 2000
+++ linux-2.3.99-pre9-fist/fs/exec.c	Tue May 23 19:30:47 2000
@@ -334,7 +334,7 @@
 			file = ERR_PTR(err);
 			if (!err) {
 				lock_kernel();
-				file = dentry_open(nd.dentry, nd.mnt, O_RDONLY);
+				file = dentry_open(nd.dentry, nd.mnt, FMODE_READ, O_RDONLY);
 				unlock_kernel();
 out:
 				return file;
diff -ruN linux-2.3.99-pre9-vanilla/fs/open.c linux-2.3.99-pre9-fist/fs/open.c
--- linux-2.3.99-pre9-vanilla/fs/open.c	Mon May  8 16:31:40 2000
+++ linux-2.3.99-pre9-fist/fs/open.c	Tue May 23 19:30:47 2000
@@ -599,12 +599,12 @@
 }
 
 /*
- * Note that while the flag value (low two bits) for sys_open means:
+ * Note that while the flags value (low two bits) for sys_open means:
  *	00 - read-only
  *	01 - write-only
  *	10 - read-write
  *	11 - special
- * it is changed into
+ * when it is copied into open_flags, it is changed into
  *	00 - no permissions needed
  *	01 - read-permission
  *	10 - write-permission
@@ -614,23 +614,24 @@
  */
 struct file *filp_open(const char * filename, int flags, int mode)
 {
-	int namei_flags, error;
+	int namei_flags, open_flags, error;
 	struct nameidata nd;
 
 	namei_flags = flags;
-	if ((namei_flags+1) & O_ACCMODE)
+	open_flags = ((flags + 1) & O_ACCMODE);
+	if (open_flags)
 		namei_flags++;
 	if (namei_flags & O_TRUNC)
 		namei_flags |= 2;
 
 	error = open_namei(filename, namei_flags, mode, &nd);
 	if (!error)
-		return dentry_open(nd.dentry, nd.mnt, flags);
+		return dentry_open(nd.dentry, nd.mnt, open_flags, flags);
 
 	return ERR_PTR(error);
 }
 
-struct file *dentry_open(struct dentry *dentry, struct vfsmount *mnt, int flags)
+struct file *dentry_open(struct dentry *dentry, struct vfsmount *mnt, int mode, int flags)
 {
 	struct file * f;
 	struct inode *inode;
@@ -641,7 +642,7 @@
 	if (!f)
 		goto cleanup_dentry;
 	f->f_flags = flags;
-	f->f_mode = (flags+1) & O_ACCMODE;
+	f->f_mode = mode;
 	inode = dentry->d_inode;
 	if (f->f_mode & FMODE_WRITE) {
 		error = get_write_access(inode);
diff -ruN linux-2.3.99-pre9-vanilla/include/linux/fs.h linux-2.3.99-pre9-fist/include/linux/fs.h
--- linux-2.3.99-pre9-vanilla/include/linux/fs.h	Tue May 23 17:18:48 2000
+++ linux-2.3.99-pre9-fist/include/linux/fs.h	Tue May 23 19:48:52 2000
@@ -858,7 +858,7 @@
 extern void put_unused_fd(unsigned int);                          /* locked inside */
 
 extern struct file *filp_open(const char *, int, int);
-extern struct file * dentry_open(struct dentry *, struct vfsmount *, int);
+extern struct file * dentry_open(struct dentry *, struct vfsmount *, int, int);
 extern int filp_close(struct file *, fl_owner_t id);
 extern char * getname(const char *);
 #define __getname()	((char *) __get_free_page(GFP_KERNEL))
diff -ruN linux-2.3.99-pre9-vanilla/include/linux/mm.h linux-2.3.99-pre9-fist/include/linux/mm.h
--- linux-2.3.99-pre9-vanilla/include/linux/mm.h	Tue May 23 17:18:49 2000
+++ linux-2.3.99-pre9-fist/include/linux/mm.h	Tue May 23 19:48:54 2000
@@ -546,6 +546,21 @@
 #define vmlist_modify_lock(mm)		vmlist_access_lock(mm)
 #define vmlist_modify_unlock(mm)	vmlist_access_unlock(mm)
 
+/*
+ * Common MM functions for inclusion in the VFS
+ * or in other stackable file systems.  Some of these
+ * functions were in linux/mm/ C files.
+ *
+ */
+static inline int sync_page(struct page *page)
+{
+	struct address_space *mapping = page->mapping;
+
+	if (mapping && mapping->a_ops && mapping->a_ops->sync_page)
+		return mapping->a_ops->sync_page(page);
+	return 0;
+}
+
 #endif /* __KERNEL__ */
 
 #endif
diff -ruN linux-2.3.99-pre9-vanilla/ipc/shm.c linux-2.3.99-pre9-fist/ipc/shm.c
--- linux-2.3.99-pre9-vanilla/ipc/shm.c	Sat May 20 13:55:30 2000
+++ linux-2.3.99-pre9-fist/ipc/shm.c	Tue May 23 19:30:47 2000
@@ -1191,7 +1191,7 @@
 	err = permission(dentry->d_inode, acc_mode);
 	if (err)
 		goto bad_file1;
-	file = dentry_open(dentry, shm_fs_type.kern_mnt, o_flags);
+	file = dentry_open(dentry, shm_fs_type.kern_mnt, prot, o_flags);
 	err = PTR_ERR(file);
 	if (IS_ERR (file))
 		goto bad_file1;
diff -ruN linux-2.3.99-pre9-vanilla/mm/filemap.c linux-2.3.99-pre9-fist/mm/filemap.c
--- linux-2.3.99-pre9-vanilla/mm/filemap.c	Mon May 22 12:50:55 2000
+++ linux-2.3.99-pre9-fist/mm/filemap.c	Tue May 23 19:30:47 2000
@@ -78,15 +78,6 @@
 	atomic_dec(&page_cache_size);
 }
 
-static inline int sync_page(struct page *page)
-{
-	struct address_space *mapping = page->mapping;
-
-	if (mapping && mapping->a_ops && mapping->a_ops->sync_page)
-		return mapping->a_ops->sync_page(page);
-	return 0;
-}
-
 /*
  * Remove a page from the page cache and free it. Caller has to make
  * sure the page is locked and that nobody else uses it - or that usage