git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
fs
/
coda
/
file.c
diff --git
a/fs/coda/file.c
b/fs/coda/file.c
index
7c26424
..
dbfbcfa
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);
coda_vfs_stat.open++;
cfi = kmalloc(sizeof(struct coda_file_info), GFP_KERNEL);
- if (!cfi) {
- unlock_kernel();
+ if (!cfi)
return -ENOMEM;
return -ENOMEM;
- }
lock_kernel();
lock_kernel();
@@
-164,7
+162,7
@@
int coda_open(struct inode *coda_inode, struct file *coda_file)
return 0;
}
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);
{
unsigned short flags = coda_file->f_flags & ~O_EXCL;
unsigned short coda_flags = coda_flags_to_cflags(flags);