projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Pull thinkpad into release branch
[powerpc.git]
/
drivers
/
block
/
loop.c
diff --git
a/drivers/block/loop.c
b/drivers/block/loop.c
index
beab6d2
..
6b5b642
100644
(file)
--- a/
drivers/block/loop.c
+++ b/
drivers/block/loop.c
@@
-1000,7
+1000,7
@@
loop_get_status(struct loop_device *lo, struct loop_info64 *info)
if (lo->lo_state != Lo_bound)
return -ENXIO;
if (lo->lo_state != Lo_bound)
return -ENXIO;
- error = vfs_getattr(file->f_
vfsmnt, file->f_
dentry, &stat);
+ error = vfs_getattr(file->f_
path.mnt, file->f_path.
dentry, &stat);
if (error)
return error;
memset(info, 0, sizeof(*info));
if (error)
return error;
memset(info, 0, sizeof(*info));
@@
-1287,7
+1287,7
@@
loop_get_status_compat(struct loop_device *lo,
static long lo_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
{
static long lo_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
{
- struct inode *inode = file->f_dentry->d_inode;
+ struct inode *inode = file->f_
path.
dentry->d_inode;
struct loop_device *lo = inode->i_bdev->bd_disk->private_data;
int err;
struct loop_device *lo = inode->i_bdev->bd_disk->private_data;
int err;