CVS: linux/include/linux fs.h,1.3,1.4 zlib_fs.h,1.1.1.1,NONE

Update of /cvsroot/linux-hfsplus/linux/include/linux
In directory sc8-pr-cvs1:/tmp/cvs-serv30627/include/linux

Modified Files:
	fs.h 
Removed Files:
	zlib_fs.h 
Log Message:
Merged 2.4.19 to 2.4.21 changes


Index: fs.h
===================================================================
RCS file: /cvsroot/linux-hfsplus/linux/include/linux/fs.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** fs.h	8 May 2002 03:01:51 -0000	1.3
--- fs.h	29 Apr 2003 06:38:49 -0000	1.4
***************
*** 207,210 ****
--- 207,211 ----
  extern void inode_init(unsigned long);
  extern void mnt_init(unsigned long);
+ extern void files_init(unsigned long mempages);
  
  /* bh state bits */
***************
*** 219,222 ****
--- 220,224 ----
  	BH_Wait_IO,	/* 1 if we should write out this buffer */
  	BH_Launder,	/* 1 if we can throttle on this buffer */
+ 	BH_Attached,	/* 1 if b_inode_buffers is linked into a list */
  	BH_JBD,		/* 1 if it has an attached journal_head */
  
***************
*** 226,229 ****
--- 228,233 ----
  };
  
+ #define MAX_BUF_PER_PAGE (PAGE_CACHE_SIZE / 512)
+ 
  /*
   * Try to keep the most commonly used fields in single cache lines (16
***************
*** 264,268 ****
  	wait_queue_head_t b_wait;
  
- 	struct inode *	     b_inode;
  	struct list_head     b_inode_buffers;	/* doubly linked list of inode dirty buffers */
  };
--- 268,271 ----
***************
*** 395,398 ****
--- 398,402 ----
  #define KERNEL_HAS_O_DIRECT /* this is for modules out of the kernel */
  	int (*direct_IO)(int, struct inode *, struct kiobuf *, unsigned long, int);
+ 	void (*removepage)(struct page *); /* called when page gets removed from the inode */
  };
  
***************
*** 596,599 ****
--- 600,604 ----
  
  	struct fasync_struct *	fl_fasync; /* for lease break notifications */
+ 	unsigned long fl_break_time;	/* for nonblocking lease breaks */
  
  	union {
***************
*** 867,870 ****
--- 872,879 ----
  	int (*setattr) (struct dentry *, struct iattr *);
  	int (*getattr) (struct dentry *, struct iattr *);
+ 	int (*setxattr) (struct dentry *, const char *, void *, size_t, int);
+ 	ssize_t (*getxattr) (struct dentry *, const char *, void *, size_t);
+ 	ssize_t (*listxattr) (struct dentry *, char *, size_t);
+ 	int (*removexattr) (struct dentry *, const char *);
  };
  
***************
*** 876,879 ****
--- 885,891 ----
   */
  struct super_operations {
+    	struct inode *(*alloc_inode)(struct super_block *sb);
+ 	void (*destroy_inode)(struct inode *);
+ 
  	void (*read_inode) (struct inode *);
    
***************
*** 891,894 ****
--- 903,907 ----
  	void (*put_super) (struct super_block *);
  	void (*write_super) (struct super_block *);
+ 	int (*sync_fs) (struct super_block *);
  	void (*write_super_lockfs) (struct super_block *);
  	void (*unlockfs) (struct super_block *);
***************
*** 998,1002 ****
  extern int may_umount(struct vfsmount *);
  extern long do_mount(char *, char *, char *, unsigned long, void *);
- extern void umount_tree(struct vfsmount *);
  
  #define kern_umount mntput
--- 1011,1014 ----
***************
*** 1054,1058 ****
  static inline int get_lease(struct inode *inode, unsigned int mode)
  {
! 	if (inode->i_flock && (inode->i_flock->fl_flags & FL_LEASE))
  		return __get_lease(inode, mode);
  	return 0;
--- 1066,1070 ----
  static inline int get_lease(struct inode *inode, unsigned int mode)
  {
! 	if (inode->i_flock)
  		return __get_lease(inode, mode);
  	return 0;
***************
*** 1168,1174 ****
  extern void FASTCALL(__mark_buffer_dirty(struct buffer_head *bh));
  extern void FASTCALL(mark_buffer_dirty(struct buffer_head *bh));
- extern void FASTCALL(buffer_insert_inode_data_queue(struct buffer_head *, struct inode *));
  
! #define atomic_set_buffer_dirty(bh) test_and_set_bit(BH_Dirty, &(bh)->b_state)
  
  static inline void mark_buffer_async(struct buffer_head * bh, int on)
--- 1180,1200 ----
  extern void FASTCALL(__mark_buffer_dirty(struct buffer_head *bh));
  extern void FASTCALL(mark_buffer_dirty(struct buffer_head *bh));
  
! extern void FASTCALL(buffer_insert_list(struct buffer_head *, struct list_head *));
! 
! static inline void buffer_insert_inode_queue(struct buffer_head *bh, struct inode *inode)
! {
! 	buffer_insert_list(bh, &inode->i_dirty_buffers);
! }
! 
! static inline void buffer_insert_inode_data_queue(struct buffer_head *bh, struct inode *inode)
! {
! 	buffer_insert_list(bh, &inode->i_dirty_data_buffers);
! }
! 
! static inline int atomic_set_buffer_dirty(struct buffer_head *bh)
! {
! 	return test_and_set_bit(BH_Dirty, &bh->b_state);
! }
  
  static inline void mark_buffer_async(struct buffer_head * bh, int on)
***************
*** 1180,1183 ****
--- 1206,1224 ----
  }
  
+ static inline void set_buffer_attached(struct buffer_head *bh)
+ {
+ 	set_bit(BH_Attached, &bh->b_state);
+ }
+ 
+ static inline void clear_buffer_attached(struct buffer_head *bh)
+ {
+ 	clear_bit(BH_Attached, &bh->b_state);
+ }
+ 
+ static inline int buffer_attached(struct buffer_head *bh)
+ {
+ 	return test_bit(BH_Attached, &bh->b_state);
+ }
+ 
  /*
   * If an error happens during the make_request, this function
***************
*** 1195,1199 ****
  }
  
- extern void buffer_insert_inode_queue(struct buffer_head *, struct inode *);
  static inline void mark_buffer_dirty_inode(struct buffer_head *bh, struct inode *inode)
  {
--- 1236,1239 ----
***************
*** 1223,1234 ****
  extern int fsync_no_super(kdev_t);
  extern void sync_inodes_sb(struct super_block *);
! extern int osync_inode_buffers(struct inode *);
! extern int osync_inode_data_buffers(struct inode *);
! extern int fsync_inode_buffers(struct inode *);
! extern int fsync_inode_data_buffers(struct inode *);
  extern int inode_has_buffers(struct inode *);
  extern int filemap_fdatasync(struct address_space *);
  extern int filemap_fdatawait(struct address_space *);
! extern void sync_supers(kdev_t);
  extern int bmap(struct inode *, int);
  extern int notify_change(struct dentry *, struct iattr *);
--- 1263,1279 ----
  extern int fsync_no_super(kdev_t);
  extern void sync_inodes_sb(struct super_block *);
! extern int fsync_buffers_list(struct list_head *);
! static inline int fsync_inode_buffers(struct inode *inode)
! {
! 	return fsync_buffers_list(&inode->i_dirty_buffers);
! }
! static inline int fsync_inode_data_buffers(struct inode *inode)
! {
! 	return fsync_buffers_list(&inode->i_dirty_data_buffers);
! }
  extern int inode_has_buffers(struct inode *);
  extern int filemap_fdatasync(struct address_space *);
  extern int filemap_fdatawait(struct address_space *);
! extern void sync_supers(kdev_t dev, int wait);
  extern int bmap(struct inode *, int);
  extern int notify_change(struct dentry *, struct iattr *);
***************
*** 1322,1325 ****
--- 1367,1371 ----
  extern int FASTCALL(path_init(const char *, unsigned, struct nameidata *));
  extern int FASTCALL(path_walk(const char *, struct nameidata *));
+ extern int FASTCALL(path_lookup(const char *, unsigned, struct nameidata *));
  extern int FASTCALL(link_path_walk(const char *, struct nameidata *));
  extern void path_release(struct nameidata *);
***************
*** 1331,1334 ****
--- 1377,1381 ----
  #define user_path_walk_link(name,nd) __user_walk(name, LOOKUP_POSITIVE, nd)
  
+ extern void inode_init_once(struct inode *);
  extern void iput(struct inode *);
  extern void force_delete(struct inode *);
***************
*** 1344,1359 ****
  
  extern void clear_inode(struct inode *);
! extern struct inode * get_empty_inode(void);
! 
! static inline struct inode * new_inode(struct super_block *sb)
! {
! 	struct inode *inode = get_empty_inode();
! 	if (inode) {
! 		inode->i_sb = sb;
! 		inode->i_dev = sb->s_dev;
! 		inode->i_blkbits = sb->s_blocksize_bits;
! 	}
! 	return inode;
! }
  extern void remove_suid(struct inode *inode);
  
--- 1391,1395 ----
  
  extern void clear_inode(struct inode *);
! extern struct inode *new_inode(struct super_block *sb);
  extern void remove_suid(struct inode *inode);
  
***************
*** 1380,1383 ****
--- 1416,1421 ----
  }
  extern int set_blocksize(kdev_t, int);
+ extern int sb_set_blocksize(struct super_block *, int);
+ extern int sb_min_blocksize(struct super_block *, int);
  extern struct buffer_head * bread(kdev_t, int, int);
  static inline struct buffer_head * sb_bread(struct super_block *sb, int block)
***************
*** 1442,1446 ****
--- 1480,1489 ----
  
  extern int vfs_readdir(struct file *, filldir_t, void *);
+ extern int dcache_dir_open(struct inode *, struct file *);
+ extern int dcache_dir_close(struct inode *, struct file *);
+ extern loff_t dcache_dir_lseek(struct file *, loff_t, int);
+ extern int dcache_dir_fsync(struct file *, struct dentry *, int);
  extern int dcache_readdir(struct file *, void *, filldir_t);
+ extern struct file_operations dcache_dir_ops;
  
  extern struct file_system_type *get_fs_type(const char *name);

--- zlib_fs.h DELETED ---



-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf