svn commit: linux-cifs-client r79 - in branches/linux-converged-for-old-kernels/fs/cifs: .

[sfrench at samba.org]

Author: sfrench
Date: 2006-08-22 17:23:48 +0000 (Tue, 22 Aug 2006)
New Revision: 79

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=linux-cifs-client&rev=79

Log:
more cifs 2.4 kernel merges

Modified:
   branches/linux-converged-for-old-kernels/fs/cifs/cifsfs.c
   branches/linux-converged-for-old-kernels/fs/cifs/cifsfs.h
   branches/linux-converged-for-old-kernels/fs/cifs/file.c


Changeset:
Modified: branches/linux-converged-for-old-kernels/fs/cifs/cifsfs.c
===================================================================
--- branches/linux-converged-for-old-kernels/fs/cifs/cifsfs.c	2006-08-22 16:37:23 UTC (rev 78)
+++ branches/linux-converged-for-old-kernels/fs/cifs/cifsfs.c	2006-08-22 17:23:48 UTC (rev 79)
@@ -181,7 +181,6 @@
 }
 #endif
 
-
 static int
 cifs_statfs(struct super_block *sb, struct kstatfs *buf)
 {

Modified: branches/linux-converged-for-old-kernels/fs/cifs/cifsfs.h
===================================================================
--- branches/linux-converged-for-old-kernels/fs/cifs/cifsfs.h	2006-08-22 16:37:23 UTC (rev 78)
+++ branches/linux-converged-for-old-kernels/fs/cifs/cifsfs.h	2006-08-22 17:23:48 UTC (rev 79)
@@ -61,8 +61,8 @@
 #endif
 #endif
 
-extern struct address_space_operations cifs_addr_ops;
-extern struct address_space_operations cifs_addr_ops_smallbuf;
+extern const struct address_space_operations cifs_addr_ops;
+extern const struct address_space_operations cifs_addr_ops_smallbuf;
 
 /* Functions related to super block operations */
 extern struct super_operations cifs_super_ops;
@@ -97,10 +97,10 @@
 extern struct inode_operations cifs_symlink_inode_ops;
 
 /* Functions related to files and directories */
-extern struct file_operations cifs_file_ops;
-extern struct file_operations cifs_file_direct_ops; /* if directio mount */
-extern struct file_operations cifs_file_nobrl_ops;
-extern struct file_operations cifs_file_direct_nobrl_ops; /* if directio mount */
+extern const struct file_operations cifs_file_ops;
+extern const struct file_operations cifs_file_direct_ops; /* if directio mount */
+extern const struct file_operations cifs_file_nobrl_ops;
+extern const struct file_operations cifs_file_direct_nobrl_ops; /* if directio mount */
 extern int cifs_open(struct inode *inode, struct file *file);
 extern int cifs_close(struct inode *inode, struct file *file);
 extern int cifs_closedir(struct inode *inode, struct file *file);
@@ -112,7 +112,7 @@
 extern int cifs_fsync(struct file *, struct dentry *, int);
 extern int cifs_flush(struct file *);
 extern int cifs_file_mmap(struct file * , struct vm_area_struct *);
-extern struct file_operations cifs_dir_ops;
+extern const struct file_operations cifs_dir_ops;
 extern int cifs_dir_open(struct inode *inode, struct file *file);
 extern int cifs_readdir(struct file *file, void *direntry, filldir_t filldir);
 extern int cifs_dir_notify(struct file *, unsigned long arg);

Modified: branches/linux-converged-for-old-kernels/fs/cifs/file.c
===================================================================
--- branches/linux-converged-for-old-kernels/fs/cifs/file.c	2006-08-22 16:37:23 UTC (rev 78)
+++ branches/linux-converged-for-old-kernels/fs/cifs/file.c	2006-08-22 17:23:48 UTC (rev 79)
@@ -341,7 +341,7 @@
 	return rc;
 }
 
-/* Try to reaquire byte range locks that were released when session */
+/* Try to reacquire byte range locks that were released when session */
 /* to server was lost */
 static int cifs_relock_file(struct cifsFileInfo *cifsFile)
 {
@@ -2035,7 +2035,7 @@
 	return 0;
 }
 
-struct address_space_operations cifs_addr_ops = {
+const struct address_space_operations cifs_addr_ops = {
 	.readpage = cifs_readpage,
 #if LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0)
 	.readpages = cifs_readpages,
@@ -2058,7 +2058,7 @@
  * contain the header plus one complete page of data.  Otherwise, we need
  * to leave cifs_readpages out of the address space operations.
  */
-struct address_space_operations cifs_addr_ops_smallbuf = {
+const struct address_space_operations cifs_addr_ops_smallbuf = {
 	.readpage = cifs_readpage,
 	.writepage = cifs_writepage,
 #if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 14)