diff --git a/[refs] b/[refs] index 565e5c940647..dd4f2a5618db 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3ae192080cb4d007792d13522efa98ebe7f15475 +refs/heads/master: 6ecbc4e1a395062a8e99e4f5fe328f6ba166d9c8 diff --git a/trunk/fs/coda/file.c b/trunk/fs/coda/file.c index cc66c681bd11..dbfbcfa5b3c0 100644 --- a/trunk/fs/coda/file.c +++ b/trunk/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();