Commit cbc8594c authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] Move the special_file() definition

From: <ffrederick@prov-liege.be>

The special_file() macro is being duplicated in JFS.  Move it to fs.h.
parent 7a6fbd69
...@@ -65,9 +65,6 @@ void jfs_read_inode(struct inode *inode) ...@@ -65,9 +65,6 @@ void jfs_read_inode(struct inode *inode)
} }
} }
/* 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 * Workhorse of both fsync & write_inode
*/ */
......
...@@ -20,8 +20,7 @@ ...@@ -20,8 +20,7 @@
#include <linux/mount.h> #include <linux/mount.h>
#include <linux/vfs.h> #include <linux/vfs.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <linux/fs.h>
#define special_file(m) (S_ISCHR(m)||S_ISBLK(m)||S_ISFIFO(m)||S_ISSOCK(m))
int vfs_statfs(struct super_block *sb, struct kstatfs *buf) int vfs_statfs(struct super_block *sb, struct kstatfs *buf)
{ {
......
...@@ -1317,6 +1317,8 @@ static inline void do_generic_file_read(struct file * filp, loff_t *ppos, ...@@ -1317,6 +1317,8 @@ static inline void do_generic_file_read(struct file * filp, loff_t *ppos,
extern struct file_operations generic_ro_fops; 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_readlink(struct dentry *, char __user *, int, const char *);
extern int vfs_follow_link(struct nameidata *, const char *); extern int vfs_follow_link(struct nameidata *, const char *);
extern int page_readlink(struct dentry *, char __user *, int); extern int page_readlink(struct dentry *, char __user *, int);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment