diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2013-09-22 16:27:52 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2013-10-24 23:34:54 -0400 |
commit | 72c2d53192004845cbc19cd8a30b3212a9288140 (patch) | |
tree | 31fcd924438f03d5aa09d13ffd813fb153da37c3 /fs/coda | |
parent | 22bd002ee76aa7d7a3393f39d977f6c106153c60 (diff) |
file->f_op is never NULL...
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/coda')
-rw-r--r-- | fs/coda/dir.c | 3 | ||||
-rw-r--r-- | fs/coda/file.c | 6 |
2 files changed, 3 insertions, 6 deletions
diff --git a/fs/coda/dir.c b/fs/coda/dir.c index 190effc6a6fa..8c8d469c9283 100644 --- a/fs/coda/dir.c +++ b/fs/coda/dir.c | |||
@@ -387,9 +387,6 @@ static int coda_readdir(struct file *coda_file, struct dir_context *ctx) | |||
387 | BUG_ON(!cfi || cfi->cfi_magic != CODA_MAGIC); | 387 | BUG_ON(!cfi || cfi->cfi_magic != CODA_MAGIC); |
388 | host_file = cfi->cfi_container; | 388 | host_file = cfi->cfi_container; |
389 | 389 | ||
390 | if (!host_file->f_op) | ||
391 | return -ENOTDIR; | ||
392 | |||
393 | if (host_file->f_op->iterate) { | 390 | if (host_file->f_op->iterate) { |
394 | struct inode *host_inode = file_inode(host_file); | 391 | struct inode *host_inode = file_inode(host_file); |
395 | mutex_lock(&host_inode->i_mutex); | 392 | mutex_lock(&host_inode->i_mutex); |
diff --git a/fs/coda/file.c b/fs/coda/file.c index 380b798f8443..9e83b7790212 100644 --- a/fs/coda/file.c +++ b/fs/coda/file.c | |||
@@ -36,7 +36,7 @@ coda_file_read(struct file *coda_file, char __user *buf, size_t count, loff_t *p | |||
36 | BUG_ON(!cfi || cfi->cfi_magic != CODA_MAGIC); | 36 | BUG_ON(!cfi || cfi->cfi_magic != CODA_MAGIC); |
37 | host_file = cfi->cfi_container; | 37 | host_file = cfi->cfi_container; |
38 | 38 | ||
39 | if (!host_file->f_op || !host_file->f_op->read) | 39 | if (!host_file->f_op->read) |
40 | return -EINVAL; | 40 | return -EINVAL; |
41 | 41 | ||
42 | return host_file->f_op->read(host_file, buf, count, ppos); | 42 | return host_file->f_op->read(host_file, buf, count, ppos); |
@@ -75,7 +75,7 @@ coda_file_write(struct file *coda_file, const char __user *buf, size_t count, lo | |||
75 | BUG_ON(!cfi || cfi->cfi_magic != CODA_MAGIC); | 75 | BUG_ON(!cfi || cfi->cfi_magic != CODA_MAGIC); |
76 | host_file = cfi->cfi_container; | 76 | host_file = cfi->cfi_container; |
77 | 77 | ||
78 | if (!host_file->f_op || !host_file->f_op->write) | 78 | if (!host_file->f_op->write) |
79 | return -EINVAL; | 79 | return -EINVAL; |
80 | 80 | ||
81 | host_inode = file_inode(host_file); | 81 | host_inode = file_inode(host_file); |
@@ -105,7 +105,7 @@ coda_file_mmap(struct file *coda_file, struct vm_area_struct *vma) | |||
105 | BUG_ON(!cfi || cfi->cfi_magic != CODA_MAGIC); | 105 | BUG_ON(!cfi || cfi->cfi_magic != CODA_MAGIC); |
106 | host_file = cfi->cfi_container; | 106 | host_file = cfi->cfi_container; |
107 | 107 | ||
108 | if (!host_file->f_op || !host_file->f_op->mmap) | 108 | if (!host_file->f_op->mmap) |
109 | return -ENODEV; | 109 | return -ENODEV; |
110 | 110 | ||
111 | coda_inode = file_inode(coda_file); | 111 | coda_inode = file_inode(coda_file); |