patch-2.4.0-test3 linux/fs/smbfs/file.c

Next file: linux/fs/smbfs/inode.c
Previous file: linux/fs/smbfs/dir.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.0-test2/linux/fs/smbfs/file.c linux/fs/smbfs/file.c
@@ -27,7 +27,7 @@
 /* #define pr_debug printk */
 
 static int
-smb_fsync(struct file *file, struct dentry * dentry)
+smb_fsync(struct file *file, struct dentry * dentry, int datasync)
 {
 #ifdef SMBFS_DEBUG_VERBOSE
 printk("smb_fsync: sync file %s/%s\n", 
@@ -214,7 +214,7 @@
 	if (status)
 	{
 #ifdef SMBFS_PARANOIA
-printk("smb_file_read: %s/%s validation failed, error=%d\n",
+printk("smb_file_read: %s/%s validation failed, error=%Zd\n",
 dentry->d_parent->d_name.name, dentry->d_name.name, status);
 #endif
 		goto out;
@@ -308,7 +308,7 @@
 	if (result)
 	{
 #ifdef SMBFS_PARANOIA
-printk("smb_file_write: %s/%s validation failed, error=%d\n",
+printk("smb_file_write: %s/%s validation failed, error=%Zd\n",
 dentry->d_parent->d_name.name, dentry->d_name.name, result);
 #endif
 			goto out;
@@ -334,7 +334,9 @@
 static int
 smb_file_open(struct inode *inode, struct file * file)
 {
+	lock_kernel();
 	inode->u.smbfs_i.openers++;
+	unlock_kernel();
 	return 0;
 }
 

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)