git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
fs
/
proc
/
generic.c
diff --git
a/fs/proc/generic.c
b/fs/proc/generic.c
index
153bc26
..
c60d453
100644
(file)
--- a/
fs/proc/generic.c
+++ b/
fs/proc/generic.c
@@
-53,7
+53,7
@@
static ssize_t
proc_file_read(struct file *file, char __user *buf, size_t nbytes,
loff_t *ppos)
{
proc_file_read(struct file *file, char __user *buf, size_t nbytes,
loff_t *ppos)
{
- struct inode * inode = file->f_dentry->d_inode;
+ struct inode * inode = file->f_
path.
dentry->d_inode;
char *page;
ssize_t retval=0;
int eof=0;
char *page;
ssize_t retval=0;
int eof=0;
@@
-204,7
+204,7
@@
static ssize_t
proc_file_write(struct file *file, const char __user *buffer,
size_t count, loff_t *ppos)
{
proc_file_write(struct file *file, const char __user *buffer,
size_t count, loff_t *ppos)
{
- struct inode *inode = file->f_dentry->d_inode;
+ struct inode *inode = file->f_
path.
dentry->d_inode;
struct proc_dir_entry * dp;
dp = PDE(inode);
struct proc_dir_entry * dp;
dp = PDE(inode);
@@
-405,7
+405,7
@@
struct dentry *proc_lookup(struct inode * dir, struct dentry *dentry, struct nam
error = -EINVAL;
inode = proc_get_inode(dir->i_sb, ino, de);
/* generic proc entries belong to the host */
error = -EINVAL;
inode = proc_get_inode(dir->i_sb, ino, de);
/* generic proc entries belong to the host */
- inode->i_
xid
= 0;
+ inode->i_
tag
= 0;
spin_lock(&proc_subdir_lock);
break;
}
spin_lock(&proc_subdir_lock);
break;
}
@@
-437,7
+437,7
@@
int proc_readdir(struct file * filp,
struct proc_dir_entry * de;
unsigned int ino;
int i;
struct proc_dir_entry * de;
unsigned int ino;
int i;
- struct inode *inode = filp->f_dentry->d_inode;
+ struct inode *inode = filp->f_
path.
dentry->d_inode;
int ret = 0;
lock_kernel();
int ret = 0;
lock_kernel();
@@
-458,7
+458,7
@@
int proc_readdir(struct file * filp,
/* fall through */
case 1:
if (filldir(dirent, "..", 2, i,
/* fall through */
case 1:
if (filldir(dirent, "..", 2, i,
- parent_ino(filp->f_dentry),
+ parent_ino(filp->f_
path.
dentry),
DT_DIR) < 0)
goto out;
i++;
DT_DIR) < 0)
goto out;
i++;
@@
-566,7
+566,7
@@
static void proc_kill_inodes(struct proc_dir_entry *de)
file_list_lock();
list_for_each(p, &sb->s_files) {
struct file * filp = list_entry(p, struct file, f_u.fu_list);
file_list_lock();
list_for_each(p, &sb->s_files) {
struct file * filp = list_entry(p, struct file, f_u.fu_list);
- struct dentry * dentry = filp->f_dentry;
+ struct dentry * dentry = filp->f_
path.
dentry;
struct inode * inode;
const struct file_operations *fops;
struct inode * inode;
const struct file_operations *fops;