X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=fs%2Fcoda%2Ffile.c;fp=fs%2Fcoda%2Ffile.c;h=30b4630bd735f3025f4e6656d745e3c82d106483;hb=64ba3f394c830ec48a1c31b53dcae312c56f1604;hp=dbfbcfa5b3c064855f377949a9470bd6aab63a2e;hpb=be1e6109ac94a859551f8e1774eb9a8469fe055c;p=linux-2.6.git

diff --git a/fs/coda/file.c b/fs/coda/file.c
index dbfbcfa5b..30b4630bd 100644
--- a/fs/coda/file.c
+++ b/fs/coda/file.c
@@ -24,8 +24,6 @@
 #include <linux/coda_psdev.h>
 #include <linux/coda_proc.h>
 
-#include "coda_int.h"
-
 /* if CODA_STORE fails with EOPNOTSUPP, venus clearly doesn't support
  * CODA_STORE/CODA_RELEASE and we fall back on using the CODA_CLOSE upcall */
 static int use_coda_close;
@@ -136,8 +134,10 @@ int coda_open(struct inode *coda_inode, struct file *coda_file)
 	coda_vfs_stat.open++;
 
 	cfi = kmalloc(sizeof(struct coda_file_info), GFP_KERNEL);
-	if (!cfi)
+	if (!cfi) {
+		unlock_kernel();
 		return -ENOMEM;
+	}
 
 	lock_kernel();
 
@@ -162,7 +162,7 @@ int coda_open(struct inode *coda_inode, struct file *coda_file)
 	return 0;
 }
 
-int coda_flush(struct file *coda_file, fl_owner_t id)
+int coda_flush(struct file *coda_file)
 {
 	unsigned short flags = coda_file->f_flags & ~O_EXCL;
 	unsigned short coda_flags = coda_flags_to_cflags(flags);
@@ -286,7 +286,7 @@ int coda_fsync(struct file *coda_file, struct dentry *coda_dentry, int datasync)
 	return err;
 }
 
-const struct file_operations coda_file_operations = {
+struct file_operations coda_file_operations = {
 	.llseek		= generic_file_llseek,
 	.read		= coda_file_read,
 	.write		= coda_file_write,