diff options
| author | Dave Jones <davej@redhat.com> | 2006-09-05 17:20:21 -0400 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2006-09-05 17:20:21 -0400 |
| commit | 115b384cf87249d76adb0b21aca11ee22128927d (patch) | |
| tree | f39a2a54863e9d82d1196906f92c82ab5991c6af /fs/coda | |
| parent | 8eb7925f93af75e66a240d148efdec212f95bcb7 (diff) | |
| parent | c336923b668fdcf0312efbec3b44895d713f4d81 (diff) | |
Merge ../linus
Diffstat (limited to 'fs/coda')
| -rw-r--r-- | fs/coda/file.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/fs/coda/file.c b/fs/coda/file.c index cc66c681bd11..dbfbcfa5b3c0 100644 --- 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) | |||
| 136 | coda_vfs_stat.open++; | 136 | coda_vfs_stat.open++; |
| 137 | 137 | ||
| 138 | cfi = kmalloc(sizeof(struct coda_file_info), GFP_KERNEL); | 138 | cfi = kmalloc(sizeof(struct coda_file_info), GFP_KERNEL); |
| 139 | if (!cfi) { | 139 | if (!cfi) |
| 140 | unlock_kernel(); | ||
| 141 | return -ENOMEM; | 140 | return -ENOMEM; |
| 142 | } | ||
| 143 | 141 | ||
| 144 | lock_kernel(); | 142 | lock_kernel(); |
| 145 | 143 | ||