Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-26 12:52:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

[PATCH] struct path: convert hppfs

Browse Source 
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:
Josef Sipek 2006-12-08 02:37:07 -08:00 committed by Linus Torvalds
parent 575800b3cc
commit 471b17e7ed
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
fs/hppfs/hppfs_kern.c
View File

@ -221,7 +221,7 @@ static ssize_t read_proc(struct file *file, char __user *buf, ssize_t count,
ssize_t (*read)(struct file *, char __user *, size_t, loff_t *); ssize_t (*read)(struct file *, char __user *, size_t, loff_t *);
ssize_t n; ssize_t n;
read = file->f_dentry->d_inode->i_fop->read; read = file->f_path.dentry->d_inode->i_fop->read;
if(!is_user) if(!is_user)
set_fs(KERNEL_DS); set_fs(KERNEL_DS);
@ -320,7 +320,7 @@ static ssize_t hppfs_write(struct file *file, const char __user *buf, size_t len
ssize_t (*write)(struct file *, const char __user *, size_t, loff_t *); ssize_t (*write)(struct file *, const char __user *, size_t, loff_t *);
int err; int err;
write = proc_file->f_dentry->d_inode->i_fop->write; write = proc_file->f_path.dentry->d_inode->i_fop->write;
proc_file->f_pos = file->f_pos; proc_file->f_pos = file->f_pos;
err = (*write)(proc_file, buf, len, &proc_file->f_pos); err = (*write)(proc_file, buf, len, &proc_file->f_pos);
@ -464,7 +464,7 @@ static int hppfs_open(struct inode *inode, struct file *file)
if(data == NULL) if(data == NULL)
goto out; goto out;
host_file = dentry_name(file->f_dentry, strlen("/rw")); host_file = dentry_name(file->f_path.dentry, strlen("/rw"));
if(host_file == NULL) if(host_file == NULL)
goto out_free2; goto out_free2;
@ -547,7 +547,7 @@ static loff_t hppfs_llseek(struct file *file, loff_t off, int where)
loff_t (*llseek)(struct file *, loff_t, int); loff_t (*llseek)(struct file *, loff_t, int);
loff_t ret; loff_t ret;
llseek = proc_file->f_dentry->d_inode->i_fop->llseek; llseek = proc_file->f_path.dentry->d_inode->i_fop->llseek;
if(llseek != NULL){ if(llseek != NULL){
ret = (*llseek)(proc_file, off, where); ret = (*llseek)(proc_file, off, where);
if(ret < 0) if(ret < 0)
@ -591,10 +591,10 @@ static int hppfs_readdir(struct file *file, void *ent, filldir_t filldir)
struct hppfs_dirent dirent = ((struct hppfs_dirent) struct hppfs_dirent dirent = ((struct hppfs_dirent)
{ .vfs_dirent = ent, { .vfs_dirent = ent,
.filldir = filldir, .filldir = filldir,
.dentry = file->f_dentry } ); .dentry = file->f_path.dentry } );
int err; int err;
readdir = proc_file->f_dentry->d_inode->i_fop->readdir; readdir = proc_file->f_path.dentry->d_inode->i_fop->readdir;
proc_file->f_pos = file->f_pos; proc_file->f_pos = file->f_pos;
err = (*readdir)(proc_file, &dirent, hppfs_filldir); err = (*readdir)(proc_file, &dirent, hppfs_filldir);