[lc-checkins] CVS: linux/fs/ncpfs dir.c,1.4,1.5

[Rodrigo S. de C. <rc...@us...>]

Update of /cvsroot/linuxcompressed/linux/fs/ncpfs
In directory sc8-pr-cvs1:/tmp/cvs-serv25395/fs/ncpfs

Modified Files:
	dir.c 
Log Message:
o Port code to 2.4.20

Bug fix (?)
o Changes checks in vswap.c to avoid oopses. It will BUG()
instead. Some of the checks were done after the value had been
accessed.

Note
o Virtual swap addresses are temporarily disabled, due to debugging
sessions related to the use of swap files instead of swap partitions.



Index: dir.c
===================================================================
RCS file: /cvsroot/linuxcompressed/linux/fs/ncpfs/dir.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** dir.c	5 Jul 2002 15:21:49 -0000	1.4
--- dir.c	19 May 2003 01:38:46 -0000	1.5
***************
*** 76,80 ****
  static int ncp_delete_dentry(struct dentry *);
  
! struct dentry_operations ncp_dentry_operations =
  {
  	d_revalidate:	ncp_lookup_validate,
--- 76,80 ----
  static int ncp_delete_dentry(struct dentry *);
  
! static struct dentry_operations ncp_dentry_operations =
  {
  	d_revalidate:	ncp_lookup_validate,
***************
*** 84,87 ****
--- 84,94 ----
  };
  
+ struct dentry_operations ncp_root_dentry_operations =
+ {
+ 	d_hash:		ncp_hash_dentry,
+ 	d_compare:	ncp_compare_dentry,
+ 	d_delete:	ncp_delete_dentry,
+ };
+ 
  
  /*
***************
*** 844,848 ****
  	    (server->m.flags & NCP_MOUNT_EXTRAS) && 
  	    (mode & S_IXUGO))
! 		attributes |= aSYSTEM;
  	
  	result = ncp_open_create_file_or_subdir(server, dir, __name,
--- 851,855 ----
  	    (server->m.flags & NCP_MOUNT_EXTRAS) && 
  	    (mode & S_IXUGO))
! 		attributes |= aSYSTEM | aSHARED;
  	
  	result = ncp_open_create_file_or_subdir(server, dir, __name,