[PATCH] sysfs: change uses of f_{dentry, vfsmnt} to use f_path
Change all the uses of f_{dentry,vfsmnt} to f_path.{dentry,mnt} in the sysfs filesystem code. Signed-off-by: Josef "Jeff" Sipek <jsipek@cs.sunysb.edu> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
committed by
Linus Torvalds
parent
0f7fc9e4d0
commit
f427f5d5d6
@@ -35,7 +35,7 @@ static ssize_t
|
||||
read(struct file * file, char __user * userbuf, size_t count, loff_t * off)
|
||||
{
|
||||
char *buffer = file->private_data;
|
||||
struct dentry *dentry = file->f_dentry;
|
||||
struct dentry *dentry = file->f_path.dentry;
|
||||
int size = dentry->d_inode->i_size;
|
||||
loff_t offs = *off;
|
||||
int ret;
|
||||
@@ -81,7 +81,7 @@ static ssize_t write(struct file * file, const char __user * userbuf,
|
||||
size_t count, loff_t * off)
|
||||
{
|
||||
char *buffer = file->private_data;
|
||||
struct dentry *dentry = file->f_dentry;
|
||||
struct dentry *dentry = file->f_path.dentry;
|
||||
int size = dentry->d_inode->i_size;
|
||||
loff_t offs = *off;
|
||||
|
||||
@@ -105,7 +105,7 @@ static ssize_t write(struct file * file, const char __user * userbuf,
|
||||
|
||||
static int mmap(struct file *file, struct vm_area_struct *vma)
|
||||
{
|
||||
struct dentry *dentry = file->f_dentry;
|
||||
struct dentry *dentry = file->f_path.dentry;
|
||||
struct bin_attribute *attr = to_bin_attr(dentry);
|
||||
struct kobject *kobj = to_kobj(dentry->d_parent);
|
||||
|
||||
@@ -117,8 +117,8 @@ static int mmap(struct file *file, struct vm_area_struct *vma)
|
||||
|
||||
static int open(struct inode * inode, struct file * file)
|
||||
{
|
||||
struct kobject *kobj = sysfs_get_kobject(file->f_dentry->d_parent);
|
||||
struct bin_attribute * attr = to_bin_attr(file->f_dentry);
|
||||
struct kobject *kobj = sysfs_get_kobject(file->f_path.dentry->d_parent);
|
||||
struct bin_attribute * attr = to_bin_attr(file->f_path.dentry);
|
||||
int error = -EINVAL;
|
||||
|
||||
if (!kobj || !attr)
|
||||
@@ -153,8 +153,8 @@ static int open(struct inode * inode, struct file * file)
|
||||
|
||||
static int release(struct inode * inode, struct file * file)
|
||||
{
|
||||
struct kobject * kobj = to_kobj(file->f_dentry->d_parent);
|
||||
struct bin_attribute * attr = to_bin_attr(file->f_dentry);
|
||||
struct kobject * kobj = to_kobj(file->f_path.dentry->d_parent);
|
||||
struct bin_attribute * attr = to_bin_attr(file->f_path.dentry);
|
||||
u8 * buffer = file->private_data;
|
||||
|
||||
if (kobj)
|
||||
|
Reference in New Issue
Block a user