[PATCH]2.6 test1 mm2 special_file move

[PATCH]2.6 test1 mm2 special_file move

[ffrederick]

Andrew,

            Here's special_file macro move.It was used twice in both vfs & jfs with same definition.

Regards,
Fabian

            diff -Naur orig/fs/jfs/inode.c edited/fs/jfs/inode.c
--- orig/fs/jfs/inode.c	2003-07-14 05:28:52.000000000 +0200
+++ edited/fs/jfs/inode.c	2003-07-27 22:42:03.000000000 +0200
@@ -65,9 +65,6 @@
 	}
 }
 
-/* This define is from fs/open.c */
-#define special_file(m) (S_ISCHR(m)||S_ISBLK(m)||S_ISFIFO(m)||S_ISSOCK(m))
-
 /*
  * Workhorse of both fsync & write_inode
  */
diff -Naur orig/fs/open.c edited/fs/open.c
--- orig/fs/open.c	2003-07-14 05:29:30.000000000 +0200
+++ edited/fs/open.c	2003-07-27 22:41:49.000000000 +0200
@@ -20,8 +20,7 @@
 #include <linux/mount.h>
 #include <linux/vfs.h>
 #include <asm/uaccess.h>
-
-#define special_file(m) (S_ISCHR(m)||S_ISBLK(m)||S_ISFIFO(m)||S_ISSOCK(m))
+#include <linux/fs.h>
 
 int vfs_statfs(struct super_block *sb, struct kstatfs *buf)
 {
diff -Naur orig/include/linux/fs.h edited/include/linux/fs.h
--- orig/include/linux/fs.h	2003-07-23 15:59:42.000000000 +0200
+++ edited/include/linux/fs.h	2003-07-27 22:41:46.000000000 +0200
@@ -1320,6 +1320,8 @@
 
 extern struct file_operations generic_ro_fops;
 
+#define special_file(m) (S_ISCHR(m)||S_ISBLK(m)||S_ISFIFO(m)||S_ISSOCK(m))
+
 extern int vfs_readlink(struct dentry *, char __user *, int, const char *);
 extern int vfs_follow_link(struct nameidata *, const char *);
 extern int page_readlink(struct dentry *, char __user *, int);


___________________________________