patch-2.1.78 linux/include/linux/fs.h

Next file: linux/include/linux/genhd.h
Previous file: linux/include/linux/ext2_fs.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.77/linux/include/linux/fs.h linux/include/linux/fs.h
@@ -266,6 +266,7 @@
 #include <linux/ufs_fs_i.h>
 #include <linux/romfs_fs_i.h>
 #include <linux/smb_fs_i.h>
+#include <linux/hfs_fs_i.h>
 
 /*
  * Attribute flags.  These should be or-ed together to figure out what
@@ -366,6 +367,7 @@
 		struct ufs_inode_info		ufs_i;
 		struct romfs_inode_info		romfs_i;
 		struct smb_inode_info		smbfs_i;
+		struct hfs_inode_info		hfs_i;
 		struct socket			socket_i;
 		void				*generic_ip;
 	} u;
@@ -503,6 +505,7 @@
 #include <linux/ufs_fs_sb.h>
 #include <linux/romfs_fs_sb.h>
 #include <linux/smb_fs_sb.h>
+#include <linux/hfs_fs_sb.h>
 
 struct super_block {
 	kdev_t			s_dev;
@@ -538,6 +541,7 @@
 		struct ufs_sb_info	ufs_sb;
 		struct romfs_sb_info	romfs_sb;
 		struct smb_sb_info	smbfs_sb;
+		struct hfs_sb_info	hfs_sb;
 		void			*generic_sbp;
 	} u;
 };
@@ -571,24 +575,25 @@
 	struct file_operations * default_file_ops;
 	int (*create) (struct inode *,struct dentry *,int);
 	int (*lookup) (struct inode *,struct dentry *);
-	int (*link) (struct inode *,struct inode *,struct dentry *);
+	int (*link) (struct dentry *,struct inode *,struct dentry *);
 	int (*unlink) (struct inode *,struct dentry *);
 	int (*symlink) (struct inode *,struct dentry *,const char *);
 	int (*mkdir) (struct inode *,struct dentry *,int);
 	int (*rmdir) (struct inode *,struct dentry *);
 	int (*mknod) (struct inode *,struct dentry *,int,int);
-	int (*rename) (struct inode *,struct dentry *,struct inode *,struct dentry *);
-	int (*readlink) (struct inode *,char *,int);
-	struct dentry * (*follow_link) (struct inode *, struct dentry *);
-	int (*readpage) (struct inode *, struct page *);
-	int (*writepage) (struct inode *, struct page *);
+	int (*rename) (struct inode *, struct dentry *,
+			struct inode *, struct dentry *);
+	int (*readlink) (struct dentry *, char *,int);
+	struct dentry * (*follow_link) (struct dentry *, struct dentry *);
+	int (*readpage) (struct dentry *, struct page *);
+	int (*writepage) (struct dentry *, struct page *);
 	int (*bmap) (struct inode *,int);
 	void (*truncate) (struct inode *);
 	int (*permission) (struct inode *, int);
 	int (*smap) (struct inode *,int);
-	int (*updatepage) (struct inode *, struct page *, const char *,
+	int (*updatepage) (struct dentry *, struct page *, const char *,
 				unsigned long, unsigned int, int);
-	int (*revalidate) (struct inode *);
+	int (*revalidate) (struct dentry *);
 };
 
 struct super_operations {
@@ -596,7 +601,7 @@
 	void (*write_inode) (struct inode *);
 	void (*put_inode) (struct inode *);
 	void (*delete_inode) (struct inode *);
-	int (*notify_change) (struct inode *, struct iattr *);
+	int (*notify_change) (struct dentry *, struct iattr *);
 	void (*put_super) (struct super_block *);
 	void (*write_super) (struct super_block *);
 	int (*statfs) (struct super_block *, struct statfs *, int);
@@ -630,7 +635,7 @@
 
 extern char * getname(const char * filename);
 extern void putname(char * name);
-extern int do_truncate(struct inode *, unsigned long);
+extern int do_truncate(struct dentry *, unsigned long);
 extern int register_blkdev(unsigned int, const char *, struct file_operations *);
 extern int unregister_blkdev(unsigned int major, const char * name);
 extern int blkdev_open(struct inode * inode, struct file * filp);
@@ -710,7 +715,7 @@
 extern int fsync_dev(kdev_t dev);
 extern void sync_supers(kdev_t dev);
 extern int bmap(struct inode * inode,int block);
-extern int notify_change(struct inode *, struct iattr *);
+extern int notify_change(struct dentry *, struct iattr *);
 extern int permission(struct inode * inode,int mask);
 extern int get_write_access(struct inode *inode);
 extern void put_write_access(struct inode *inode);
@@ -800,7 +805,7 @@
 
 extern int brw_page(int, struct page *, kdev_t, int [], int, int);
 
-extern int generic_readpage(struct inode *, struct page *);
+extern int generic_readpage(struct dentry *, struct page *);
 extern int generic_file_mmap(struct file *, struct vm_area_struct *);
 extern ssize_t generic_file_read(struct file *, char *, size_t, loff_t *);
 extern ssize_t generic_file_write(struct file *, const char*, size_t, loff_t*);
@@ -831,7 +836,6 @@
 
 extern int inode_change_ok(struct inode *, struct iattr *);
 extern void inode_setattr(struct inode *, struct iattr *);
-extern int notify_change(struct inode * inode, struct iattr * attr);
 
 /* kludge to get SCSI modules working */
 #include <linux/minix_fs.h>

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov