.. | .. |
---|
23 | 23 | #include <linux/uaccess.h> |
---|
24 | 24 | |
---|
25 | 25 | #include <linux/coda.h> |
---|
26 | | -#include <linux/coda_psdev.h> |
---|
| 26 | +#include "coda_psdev.h" |
---|
27 | 27 | #include "coda_linux.h" |
---|
28 | 28 | #include "coda_cache.h" |
---|
29 | 29 | |
---|
.. | .. |
---|
47 | 47 | int type = 0; |
---|
48 | 48 | |
---|
49 | 49 | if (length > CODA_MAXNAMLEN) { |
---|
50 | | - pr_err("name too long: lookup, %s (%*s)\n", |
---|
51 | | - coda_i2s(dir), (int)length, name); |
---|
| 50 | + pr_err("name too long: lookup, %s %zu\n", |
---|
| 51 | + coda_i2s(dir), length); |
---|
52 | 52 | return ERR_PTR(-ENAMETOOLONG); |
---|
53 | 53 | } |
---|
54 | 54 | |
---|
.. | .. |
---|
356 | 356 | ino_t ino; |
---|
357 | 357 | int ret; |
---|
358 | 358 | |
---|
359 | | - cfi = CODA_FTOC(coda_file); |
---|
360 | | - BUG_ON(!cfi || cfi->cfi_magic != CODA_MAGIC); |
---|
| 359 | + cfi = coda_ftoc(coda_file); |
---|
361 | 360 | host_file = cfi->cfi_container; |
---|
362 | 361 | |
---|
363 | 362 | cii = ITOC(file_inode(coda_file)); |
---|
.. | .. |
---|
426 | 425 | struct file *host_file; |
---|
427 | 426 | int ret; |
---|
428 | 427 | |
---|
429 | | - cfi = CODA_FTOC(coda_file); |
---|
430 | | - BUG_ON(!cfi || cfi->cfi_magic != CODA_MAGIC); |
---|
| 428 | + cfi = coda_ftoc(coda_file); |
---|
431 | 429 | host_file = cfi->cfi_container; |
---|
432 | 430 | |
---|
433 | 431 | if (host_file->f_op->iterate || host_file->f_op->iterate_shared) { |
---|