From: Josef Sipek Signed-off-by: Josef Sipek Signed-off-by: Andrew Morton --- drivers/block/acsi_slm.c | 4 ++-- drivers/block/cciss.c | 2 +- drivers/block/loop.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff -puN drivers/block/acsi_slm.c~struct-path-convert-block_drivers drivers/block/acsi_slm.c --- a/drivers/block/acsi_slm.c~struct-path-convert-block_drivers +++ a/drivers/block/acsi_slm.c @@ -363,7 +363,7 @@ static ssize_t slm_read( struct file *fi loff_t *ppos ) { - struct inode *node = file->f_dentry->d_inode; + struct inode *node = file->f_path.dentry->d_inode; unsigned long page; int length; int end; @@ -618,7 +618,7 @@ static ssize_t slm_write( struct file *f loff_t *ppos ) { - struct inode *node = file->f_dentry->d_inode; + struct inode *node = file->f_path.dentry->d_inode; int device = iminor(node); int n, filled, w, h; diff -puN drivers/block/cciss.c~struct-path-convert-block_drivers drivers/block/cciss.c --- a/drivers/block/cciss.c~struct-path-convert-block_drivers +++ a/drivers/block/cciss.c @@ -535,7 +535,7 @@ static int do_ioctl(struct file *f, unsi { int ret; lock_kernel(); - ret = cciss_ioctl(f->f_dentry->d_inode, f, cmd, arg); + ret = cciss_ioctl(f->f_path.dentry->d_inode, f, cmd, arg); unlock_kernel(); return ret; } diff -puN drivers/block/loop.c~struct-path-convert-block_drivers drivers/block/loop.c --- a/drivers/block/loop.c~struct-path-convert-block_drivers +++ a/drivers/block/loop.c @@ -1000,7 +1000,7 @@ loop_get_status(struct loop_device *lo, 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)); @@ -1287,7 +1287,7 @@ loop_get_status_compat(struct loop_devic 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; _