From: Andrew Morton - use magic.h - 80 cols Cc: Davide Libenzi Signed-off-by: Andrew Morton --- fs/anon_inodes.c | 20 +++----------------- include/linux/magic.h | 1 + 2 files changed, 4 insertions(+), 17 deletions(-) diff -puN fs/anon_inodes.c~add-an-anonymous-inode-source-tidy fs/anon_inodes.c --- a/fs/anon_inodes.c~add-an-anonymous-inode-source-tidy +++ a/fs/anon_inodes.c @@ -9,6 +9,7 @@ #include #include #include +#include #include #include #include @@ -17,18 +18,11 @@ #include - - -#define AINOFS_MAGIC 0x09041934 - - static int ainofs_delete_dentry(struct dentry *dentry); static struct inode *aino_getinode(void); static struct inode *aino_mkinode(void); static int ainofs_get_sb(struct file_system_type *fs_type, int flags, - const char *dev_name, void *data, struct vfsmount *mnt); - - + const char *dev_name, void *data, struct vfsmount *mnt); static struct vfsmount *aino_mnt __read_mostly; static struct inode *aino_inode; @@ -43,7 +37,6 @@ static struct dentry_operations ainofs_d }; - int aino_getfd(int *pfd, struct inode **pinode, struct file **pfile, char const *name, const struct file_operations *fops, void *priv) { @@ -113,7 +106,6 @@ eexit_1: return error; } - static int ainofs_delete_dentry(struct dentry *dentry) { /* @@ -124,13 +116,11 @@ static int ainofs_delete_dentry(struct d return 1; } - static struct inode *aino_getinode(void) { return igrab(aino_inode); } - /* * A single inode exist for all aino files. On the contrary of pipes, * aino inodes has no per-instance data associated, so we can avoid @@ -163,17 +153,14 @@ eexit_1: return ERR_PTR(error); } - static int ainofs_get_sb(struct file_system_type *fs_type, int flags, - const char *dev_name, void *data, struct vfsmount *mnt) + const char *dev_name, void *data, struct vfsmount *mnt) { return get_sb_pseudo(fs_type, "aino:", NULL, AINOFS_MAGIC, mnt); } - static int __init aino_init(void) { - if (register_filesystem(&aino_fs_type)) goto epanic; @@ -191,7 +178,6 @@ epanic: panic("aino_init() failed\n"); } - static void __exit aino_exit(void) { iput(aino_inode); diff -puN include/linux/magic.h~add-an-anonymous-inode-source-tidy include/linux/magic.h --- a/include/linux/magic.h~add-an-anonymous-inode-source-tidy +++ a/include/linux/magic.h @@ -39,5 +39,6 @@ #define SMB_SUPER_MAGIC 0x517B #define USBDEVICE_SUPER_MAGIC 0x9fa2 +#define AINOFS_MAGIC 0x09041934 #endif /* __LINUX_MAGIC_H__ */ _