aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--fs/ocfs2/aops.c4
-rw-r--r--fs/ocfs2/dir.c2
-rw-r--r--fs/ocfs2/dlm/dlmfs.c4
-rw-r--r--fs/ocfs2/file.c34
4 files changed, 22 insertions, 22 deletions
diff --git a/fs/ocfs2/aops.c b/fs/ocfs2/aops.c
index 2f7268e81520..ef6cd30108a9 100644
--- a/fs/ocfs2/aops.c
+++ b/fs/ocfs2/aops.c
@@ -595,7 +595,7 @@ static void ocfs2_dio_end_io(struct kiocb *iocb,
595 ssize_t bytes, 595 ssize_t bytes,
596 void *private) 596 void *private)
597{ 597{
598 struct inode *inode = iocb->ki_filp->f_dentry->d_inode; 598 struct inode *inode = iocb->ki_filp->f_path.dentry->d_inode;
599 599
600 /* this io's submitter should not have unlocked this before we could */ 600 /* this io's submitter should not have unlocked this before we could */
601 BUG_ON(!ocfs2_iocb_is_rw_locked(iocb)); 601 BUG_ON(!ocfs2_iocb_is_rw_locked(iocb));
@@ -611,7 +611,7 @@ static ssize_t ocfs2_direct_IO(int rw,
611 unsigned long nr_segs) 611 unsigned long nr_segs)
612{ 612{
613 struct file *file = iocb->ki_filp; 613 struct file *file = iocb->ki_filp;
614 struct inode *inode = file->f_dentry->d_inode->i_mapping->host; 614 struct inode *inode = file->f_path.dentry->d_inode->i_mapping->host;
615 int ret; 615 int ret;
616 616
617 mlog_entry_void(); 617 mlog_entry_void();
diff --git a/fs/ocfs2/dir.c b/fs/ocfs2/dir.c
index baad2aa27c14..66821e178167 100644
--- a/fs/ocfs2/dir.c
+++ b/fs/ocfs2/dir.c
@@ -79,7 +79,7 @@ int ocfs2_readdir(struct file * filp, void * dirent, filldir_t filldir)
79 struct buffer_head * bh, * tmp; 79 struct buffer_head * bh, * tmp;
80 struct ocfs2_dir_entry * de; 80 struct ocfs2_dir_entry * de;
81 int err; 81 int err;
82 struct inode *inode = filp->f_dentry->d_inode; 82 struct inode *inode = filp->f_path.dentry->d_inode;
83 struct super_block * sb = inode->i_sb; 83 struct super_block * sb = inode->i_sb;
84 unsigned int ra_sectors = 16; 84 unsigned int ra_sectors = 16;
85 int lock_level = 0; 85 int lock_level = 0;
diff --git a/fs/ocfs2/dlm/dlmfs.c b/fs/ocfs2/dlm/dlmfs.c
index 941acf14e61f..b7f0ba97a1a2 100644
--- a/fs/ocfs2/dlm/dlmfs.c
+++ b/fs/ocfs2/dlm/dlmfs.c
@@ -176,7 +176,7 @@ static ssize_t dlmfs_file_read(struct file *filp,
176 int bytes_left; 176 int bytes_left;
177 ssize_t readlen; 177 ssize_t readlen;
178 char *lvb_buf; 178 char *lvb_buf;
179 struct inode *inode = filp->f_dentry->d_inode; 179 struct inode *inode = filp->f_path.dentry->d_inode;
180 180
181 mlog(0, "inode %lu, count = %zu, *ppos = %llu\n", 181 mlog(0, "inode %lu, count = %zu, *ppos = %llu\n",
182 inode->i_ino, count, *ppos); 182 inode->i_ino, count, *ppos);
@@ -220,7 +220,7 @@ static ssize_t dlmfs_file_write(struct file *filp,
220 int bytes_left; 220 int bytes_left;
221 ssize_t writelen; 221 ssize_t writelen;
222 char *lvb_buf; 222 char *lvb_buf;
223 struct inode *inode = filp->f_dentry->d_inode; 223 struct inode *inode = filp->f_path.dentry->d_inode;
224 224
225 mlog(0, "inode %lu, count = %zu, *ppos = %llu\n", 225 mlog(0, "inode %lu, count = %zu, *ppos = %llu\n",
226 inode->i_ino, count, *ppos); 226 inode->i_ino, count, *ppos);
diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c
index 8786b3c490aa..e9a82ad95c1e 100644
--- a/fs/ocfs2/file.c
+++ b/fs/ocfs2/file.c
@@ -68,7 +68,7 @@ static int ocfs2_file_open(struct inode *inode, struct file *file)
68 struct ocfs2_inode_info *oi = OCFS2_I(inode); 68 struct ocfs2_inode_info *oi = OCFS2_I(inode);
69 69
70 mlog_entry("(0x%p, 0x%p, '%.*s')\n", inode, file, 70 mlog_entry("(0x%p, 0x%p, '%.*s')\n", inode, file,
71 file->f_dentry->d_name.len, file->f_dentry->d_name.name); 71 file->f_path.dentry->d_name.len, file->f_path.dentry->d_name.name);
72 72
73 spin_lock(&oi->ip_lock); 73 spin_lock(&oi->ip_lock);
74 74
@@ -98,8 +98,8 @@ static int ocfs2_file_release(struct inode *inode, struct file *file)
98 struct ocfs2_inode_info *oi = OCFS2_I(inode); 98 struct ocfs2_inode_info *oi = OCFS2_I(inode);
99 99
100 mlog_entry("(0x%p, 0x%p, '%.*s')\n", inode, file, 100 mlog_entry("(0x%p, 0x%p, '%.*s')\n", inode, file,
101 file->f_dentry->d_name.len, 101 file->f_path.dentry->d_name.len,
102 file->f_dentry->d_name.name); 102 file->f_path.dentry->d_name.name);
103 103
104 spin_lock(&oi->ip_lock); 104 spin_lock(&oi->ip_lock);
105 if (!--oi->ip_open_count) 105 if (!--oi->ip_open_count)
@@ -1131,13 +1131,13 @@ static ssize_t ocfs2_file_aio_write(struct kiocb *iocb,
1131{ 1131{
1132 int ret, rw_level, have_alloc_sem = 0; 1132 int ret, rw_level, have_alloc_sem = 0;
1133 struct file *filp = iocb->ki_filp; 1133 struct file *filp = iocb->ki_filp;
1134 struct inode *inode = filp->f_dentry->d_inode; 1134 struct inode *inode = filp->f_path.dentry->d_inode;
1135 int appending = filp->f_flags & O_APPEND ? 1 : 0; 1135 int appending = filp->f_flags & O_APPEND ? 1 : 0;
1136 1136
1137 mlog_entry("(0x%p, %u, '%.*s')\n", filp, 1137 mlog_entry("(0x%p, %u, '%.*s')\n", filp,
1138 (unsigned int)nr_segs, 1138 (unsigned int)nr_segs,
1139 filp->f_dentry->d_name.len, 1139 filp->f_path.dentry->d_name.len,
1140 filp->f_dentry->d_name.name); 1140 filp->f_path.dentry->d_name.name);
1141 1141
1142 /* happy write of zero bytes */ 1142 /* happy write of zero bytes */
1143 if (iocb->ki_left == 0) 1143 if (iocb->ki_left == 0)
@@ -1159,7 +1159,7 @@ static ssize_t ocfs2_file_aio_write(struct kiocb *iocb,
1159 goto out; 1159 goto out;
1160 } 1160 }
1161 1161
1162 ret = ocfs2_prepare_inode_for_write(filp->f_dentry, &iocb->ki_pos, 1162 ret = ocfs2_prepare_inode_for_write(filp->f_path.dentry, &iocb->ki_pos,
1163 iocb->ki_left, appending); 1163 iocb->ki_left, appending);
1164 if (ret < 0) { 1164 if (ret < 0) {
1165 mlog_errno(ret); 1165 mlog_errno(ret);
@@ -1207,12 +1207,12 @@ static ssize_t ocfs2_file_splice_write(struct pipe_inode_info *pipe,
1207 unsigned int flags) 1207 unsigned int flags)
1208{ 1208{
1209 int ret; 1209 int ret;
1210 struct inode *inode = out->f_dentry->d_inode; 1210 struct inode *inode = out->f_path.dentry->d_inode;
1211 1211
1212 mlog_entry("(0x%p, 0x%p, %u, '%.*s')\n", out, pipe, 1212 mlog_entry("(0x%p, 0x%p, %u, '%.*s')\n", out, pipe,
1213 (unsigned int)len, 1213 (unsigned int)len,
1214 out->f_dentry->d_name.len, 1214 out->f_path.dentry->d_name.len,
1215 out->f_dentry->d_name.name); 1215 out->f_path.dentry->d_name.name);
1216 1216
1217 inode_double_lock(inode, pipe->inode); 1217 inode_double_lock(inode, pipe->inode);
1218 1218
@@ -1222,7 +1222,7 @@ static ssize_t ocfs2_file_splice_write(struct pipe_inode_info *pipe,
1222 goto out; 1222 goto out;
1223 } 1223 }
1224 1224
1225 ret = ocfs2_prepare_inode_for_write(out->f_dentry, ppos, len, 0); 1225 ret = ocfs2_prepare_inode_for_write(out->f_path.dentry, ppos, len, 0);
1226 if (ret < 0) { 1226 if (ret < 0) {
1227 mlog_errno(ret); 1227 mlog_errno(ret);
1228 goto out_unlock; 1228 goto out_unlock;
@@ -1247,12 +1247,12 @@ static ssize_t ocfs2_file_splice_read(struct file *in,
1247 unsigned int flags) 1247 unsigned int flags)
1248{ 1248{
1249 int ret = 0; 1249 int ret = 0;
1250 struct inode *inode = in->f_dentry->d_inode; 1250 struct inode *inode = in->f_path.dentry->d_inode;
1251 1251
1252 mlog_entry("(0x%p, 0x%p, %u, '%.*s')\n", in, pipe, 1252 mlog_entry("(0x%p, 0x%p, %u, '%.*s')\n", in, pipe,
1253 (unsigned int)len, 1253 (unsigned int)len,
1254 in->f_dentry->d_name.len, 1254 in->f_path.dentry->d_name.len,
1255 in->f_dentry->d_name.name); 1255 in->f_path.dentry->d_name.name);
1256 1256
1257 /* 1257 /*
1258 * See the comment in ocfs2_file_aio_read() 1258 * See the comment in ocfs2_file_aio_read()
@@ -1278,12 +1278,12 @@ static ssize_t ocfs2_file_aio_read(struct kiocb *iocb,
1278{ 1278{
1279 int ret = 0, rw_level = -1, have_alloc_sem = 0, lock_level = 0; 1279 int ret = 0, rw_level = -1, have_alloc_sem = 0, lock_level = 0;
1280 struct file *filp = iocb->ki_filp; 1280 struct file *filp = iocb->ki_filp;
1281 struct inode *inode = filp->f_dentry->d_inode; 1281 struct inode *inode = filp->f_path.dentry->d_inode;
1282 1282
1283 mlog_entry("(0x%p, %u, '%.*s')\n", filp, 1283 mlog_entry("(0x%p, %u, '%.*s')\n", filp,
1284 (unsigned int)nr_segs, 1284 (unsigned int)nr_segs,
1285 filp->f_dentry->d_name.len, 1285 filp->f_path.dentry->d_name.len,
1286 filp->f_dentry->d_name.name); 1286 filp->f_path.dentry->d_name.name);
1287 1287
1288 if (!inode) { 1288 if (!inode) {
1289 ret = -EINVAL; 1289 ret = -EINVAL;