Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
LU-8176 libcfs: Add file_dentry() & file_inode() wrapper
[fs/lustre-release.git]
/
lustre
/
llite
/
lloop.c
diff --git
a/lustre/llite/lloop.c
b/lustre/llite/lloop.c
index
b8ae0b5
..
475185a
100644
(file)
--- a/
lustre/llite/lloop.c
+++ b/
lustre/llite/lloop.c
@@
-188,7
+188,7
@@
static int do_bio_lustrebacked(struct lloop_device *lo, struct bio *head)
{
const struct lu_env *env = lo->lo_env;
struct cl_io *io = &lo->lo_io;
- struct dentry *de =
lo->lo_backing_file->f_path.dentry
;
+ struct dentry *de =
file_dentry(lo->lo_backing_file)
;
struct inode *inode = de->d_inode;
struct cl_object *obj = ll_i2info(inode)->lli_clob;
pgoff_t offset;
@@
-680,7
+680,7
@@
static int lo_ioctl(struct block_device *bdev, fmode_t mode,
err = -ENOENT;
break;
}
- inode =
lo->lo_backing_file->f_path.dentry->d_inode
;
+ inode =
file_inode(lo->lo_backing_file)
;
if (inode != NULL && lo->lo_state == LLOOP_BOUND)
fid = ll_i2info(inode)->lli_fid;
else
@@
-735,7
+735,7
@@
static enum llioc_iter lloop_ioctl(struct inode *unused, struct file *file,
mutex_lock(&lloop_mutex);
switch (cmd) {
case LL_IOC_LLOOP_ATTACH: {
- struct inode *inode = file
->f_path.dentry->d_inode
;
+ struct inode *inode = file
_inode(file)
;
struct lloop_device *lo_free = NULL;
int i;
@@
-746,8
+746,7
@@
static enum llioc_iter lloop_ioctl(struct inode *unused, struct file *file,
lo_free = lo;
continue;
}
- if (lo->lo_backing_file->f_path.dentry->d_inode ==
- inode)
+ if (file_inode(lo->lo_backing_file) == inode)
break;
}
if (lo || !lo_free)