[NETFILTER]: nf_conntrack: EXPORT_SYMBOL cleanup

[linux-2.6-omap-h63xx.git] / fs / coda / file.c

diff --git a/fs/coda/file.c b/fs/coda/file.c
index 7c2642431fa5baa7bef2aa4cb0514b01615d5d0b..dbfbcfa5b3c064855f377949a9470bd6aab63a2e 100644 (file)
--- a/fs/coda/file.c
+++ b/fs/coda/file.c
@@ -136,10 +136,8 @@ 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) {
-               unlock_kernel();
+       if (!cfi)
                return -ENOMEM;
-       }
 
        lock_kernel();
 
@@ -164,7 +162,7 @@ int coda_open(struct inode *coda_inode, struct file *coda_file)
        return 0;
 }
 
-int coda_flush(struct file *coda_file)
+int coda_flush(struct file *coda_file, fl_owner_t id)
 {
        unsigned short flags = coda_file->f_flags & ~O_EXCL;
        unsigned short coda_flags = coda_flags_to_cflags(flags);