[PATCH] struct path: convert block_drivers
Signed-off-by: Josef Sipek <jsipek@fsl.cs.sunysb.edu> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
c5a20b6c26
commit
6c648be6f4
|
@ -363,7 +363,7 @@ static ssize_t slm_read( struct file *file, char *buf, size_t count,
|
|||
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 *file, const char *buf, size_t count,
|
|||
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;
|
||||
|
||||
|
|
|
@ -535,7 +535,7 @@ static int do_ioctl(struct file *f, unsigned cmd, unsigned long arg)
|
|||
{
|
||||
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;
|
||||
}
|
||||
|
|
|
@ -1000,7 +1000,7 @@ loop_get_status(struct loop_device *lo, struct loop_info64 *info)
|
|||
|
||||
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_device *lo,
|
|||
|
||||
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;
|
||||
|
||||
|
|
Loading…
Reference in a new issue