mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 10:49:33 +00:00
[PATCH] struct path: convert v4l
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
33cb899400
commit
723731b2ee
3 changed files with 4 additions and 4 deletions
|
@ -118,7 +118,7 @@ static int native_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
|
|||
ret = file->f_op->unlocked_ioctl(file, cmd, arg);
|
||||
else if (file->f_op->ioctl) {
|
||||
lock_kernel();
|
||||
ret = file->f_op->ioctl(file->f_dentry->d_inode, file, cmd, arg);
|
||||
ret = file->f_op->ioctl(file->f_path.dentry->d_inode, file, cmd, arg);
|
||||
unlock_kernel();
|
||||
}
|
||||
|
||||
|
|
|
@ -105,7 +105,7 @@ static DEFINE_MUTEX(videodev_lock);
|
|||
|
||||
struct video_device* video_devdata(struct file *file)
|
||||
{
|
||||
return video_device[iminor(file->f_dentry->d_inode)];
|
||||
return video_device[iminor(file->f_path.dentry->d_inode)];
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
@ -144,7 +144,7 @@ static int zoran_open(struct inode *inode, struct file *file)
|
|||
static ssize_t zoran_write(struct file *file, const char __user *buffer,
|
||||
size_t count, loff_t *ppos)
|
||||
{
|
||||
struct zoran *zr = PDE(file->f_dentry->d_inode)->data;
|
||||
struct zoran *zr = PDE(file->f_path.dentry->d_inode)->data;
|
||||
char *string, *sp;
|
||||
char *line, *ldelim, *varname, *svar, *tdelim;
|
||||
|
||||
|
@ -165,7 +165,7 @@ static ssize_t zoran_write(struct file *file, const char __user *buffer,
|
|||
}
|
||||
string[count] = 0;
|
||||
dprintk(4, KERN_INFO "%s: write_proc: name=%s count=%zu zr=%p\n",
|
||||
ZR_DEVNAME(zr), file->f_dentry->d_name.name, count, zr);
|
||||
ZR_DEVNAME(zr), file->f_path.dentry->d_name.name, count, zr);
|
||||
ldelim = " \t\n";
|
||||
tdelim = "=";
|
||||
line = strpbrk(sp, ldelim);
|
||||
|
|
Loading…
Reference in a new issue