[Balls-cvs-act] CVS: linux/include/linux fs.h,1.13,1.14

[Quinn H. <qui...@us...>]

Update of /cvsroot/balls/linux/include/linux
In directory usw-pr-cvs1:/tmp/cvs-serv28956/include/linux

Modified Files:
	fs.h 
Log Message:


Index: fs.h
===================================================================
RCS file: /cvsroot/balls/linux/include/linux/fs.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** fs.h	2001/10/20 06:13:50	1.13
--- fs.h	2001/10/24 23:33:11	1.14
***************
*** 216,220 ****
  	BH_New,		/* 1 if the buffer is new and not yet written out */
  	BH_Async,	/* 1 if the buffer is under end_buffer_io_async I/O */
! 	BH_Wait_IO,	/* 1 if we should throttle on this buffer */
  
  	BH_PrivateStart,/* not a state bit, but the first bit available
--- 216,221 ----
  	BH_New,		/* 1 if the buffer is new and not yet written out */
  	BH_Async,	/* 1 if the buffer is under end_buffer_io_async I/O */
! 	BH_Wait_IO,	/* 1 if we should write out this buffer */
! 	BH_launder,	/* 1 if we should throttle on this buffer */
  
  	BH_PrivateStart,/* not a state bit, but the first bit available
***************
*** 606,609 ****
--- 607,611 ----
  extern void posix_block_lock(struct file_lock *, struct file_lock *);
  extern void posix_unblock_lock(struct file_lock *);
+ extern int posix_locks_deadlock(struct file_lock *, struct file_lock *);
  extern int __get_lease(struct inode *inode, unsigned int flags);
  extern time_t lease_get_mtime(struct inode *);