aboutsummaryrefslogtreecommitdiffstats
path: root/fs/coda/file.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/coda/file.c')
-rw-r--r--fs/coda/file.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/fs/coda/file.c b/fs/coda/file.c
index dbfbcfa5b3c0..5ef2b609ec7d 100644
--- a/fs/coda/file.c
+++ b/fs/coda/file.c
@@ -66,7 +66,7 @@ coda_file_sendfile(struct file *coda_file, loff_t *ppos, size_t count,
66static ssize_t 66static ssize_t
67coda_file_write(struct file *coda_file, const char __user *buf, size_t count, loff_t *ppos) 67coda_file_write(struct file *coda_file, const char __user *buf, size_t count, loff_t *ppos)
68{ 68{
69 struct inode *host_inode, *coda_inode = coda_file->f_dentry->d_inode; 69 struct inode *host_inode, *coda_inode = coda_file->f_path.dentry->d_inode;
70 struct coda_file_info *cfi; 70 struct coda_file_info *cfi;
71 struct file *host_file; 71 struct file *host_file;
72 ssize_t ret; 72 ssize_t ret;
@@ -78,7 +78,7 @@ coda_file_write(struct file *coda_file, const char __user *buf, size_t count, lo
78 if (!host_file->f_op || !host_file->f_op->write) 78 if (!host_file->f_op || !host_file->f_op->write)
79 return -EINVAL; 79 return -EINVAL;
80 80
81 host_inode = host_file->f_dentry->d_inode; 81 host_inode = host_file->f_path.dentry->d_inode;
82 mutex_lock(&coda_inode->i_mutex); 82 mutex_lock(&coda_inode->i_mutex);
83 83
84 ret = host_file->f_op->write(host_file, buf, count, ppos); 84 ret = host_file->f_op->write(host_file, buf, count, ppos);
@@ -106,8 +106,8 @@ coda_file_mmap(struct file *coda_file, struct vm_area_struct *vma)
106 if (!host_file->f_op || !host_file->f_op->mmap) 106 if (!host_file->f_op || !host_file->f_op->mmap)
107 return -ENODEV; 107 return -ENODEV;
108 108
109 coda_inode = coda_file->f_dentry->d_inode; 109 coda_inode = coda_file->f_path.dentry->d_inode;
110 host_inode = host_file->f_dentry->d_inode; 110 host_inode = host_file->f_path.dentry->d_inode;
111 coda_file->f_mapping = host_file->f_mapping; 111 coda_file->f_mapping = host_file->f_mapping;
112 if (coda_inode->i_mapping == &coda_inode->i_data) 112 if (coda_inode->i_mapping == &coda_inode->i_data)
113 coda_inode->i_mapping = host_inode->i_mapping; 113 coda_inode->i_mapping = host_inode->i_mapping;
@@ -190,7 +190,7 @@ int coda_flush(struct file *coda_file, fl_owner_t id)
190 cfi = CODA_FTOC(coda_file); 190 cfi = CODA_FTOC(coda_file);
191 BUG_ON(!cfi || cfi->cfi_magic != CODA_MAGIC); 191 BUG_ON(!cfi || cfi->cfi_magic != CODA_MAGIC);
192 192
193 coda_inode = coda_file->f_dentry->d_inode; 193 coda_inode = coda_file->f_path.dentry->d_inode;
194 194
195 err = venus_store(coda_inode->i_sb, coda_i2f(coda_inode), coda_flags, 195 err = venus_store(coda_inode->i_sb, coda_i2f(coda_inode), coda_flags,
196 coda_file->f_uid); 196 coda_file->f_uid);
@@ -233,7 +233,7 @@ int coda_release(struct inode *coda_inode, struct file *coda_file)
233 err = venus_close(coda_inode->i_sb, coda_i2f(coda_inode), 233 err = venus_close(coda_inode->i_sb, coda_i2f(coda_inode),
234 coda_flags, coda_file->f_uid); 234 coda_flags, coda_file->f_uid);
235 235
236 host_inode = cfi->cfi_container->f_dentry->d_inode; 236 host_inode = cfi->cfi_container->f_path.dentry->d_inode;
237 cii = ITOC(coda_inode); 237 cii = ITOC(coda_inode);
238 238
239 /* did we mmap this file? */ 239 /* did we mmap this file? */
@@ -270,7 +270,7 @@ int coda_fsync(struct file *coda_file, struct dentry *coda_dentry, int datasync)
270 coda_vfs_stat.fsync++; 270 coda_vfs_stat.fsync++;
271 271
272 if (host_file->f_op && host_file->f_op->fsync) { 272 if (host_file->f_op && host_file->f_op->fsync) {
273 host_dentry = host_file->f_dentry; 273 host_dentry = host_file->f_path.dentry;
274 host_inode = host_dentry->d_inode; 274 host_inode = host_dentry->d_inode;
275 mutex_lock(&host_inode->i_mutex); 275 mutex_lock(&host_inode->i_mutex);
276 err = host_file->f_op->fsync(host_file, host_dentry, datasync); 276 err = host_file->f_op->fsync(host_file, host_dentry, datasync);