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
/
file_table.c
diff --git
a/fs/file_table.c
b/fs/file_table.c
index
4a90726
..
6e8d15f
100644
(file)
--- a/
fs/file_table.c
+++ b/
fs/file_table.c
@@
-156,8
+156,8
@@
EXPORT_SYMBOL(fput);
*/
void fastcall __fput(struct file *file)
{
*/
void fastcall __fput(struct file *file)
{
- struct dentry *dentry = file->f_dentry;
- struct vfsmount *mnt = file->f_
vfs
mnt;
+ struct dentry *dentry = file->f_
path.
dentry;
+ struct vfsmount *mnt = file->f_
path.
mnt;
struct inode *inode = dentry->d_inode;
might_sleep();
struct inode *inode = dentry->d_inode;
might_sleep();
@@
-178,11
+178,12
@@
void fastcall __fput(struct file *file)
fops_put(file->f_op);
if (file->f_mode & FMODE_WRITE)
put_write_access(inode);
fops_put(file->f_op);
if (file->f_mode & FMODE_WRITE)
put_write_access(inode);
+ put_pid(file->f_owner.pid);
vx_files_dec(file);
file->f_xid = 0;
file_kill(file);
vx_files_dec(file);
file->f_xid = 0;
file_kill(file);
- file->f_dentry = NULL;
- file->f_
vfs
mnt = NULL;
+ file->f_
path.
dentry = NULL;
+ file->f_
path.
mnt = NULL;
file_free(file);
dput(dentry);
mntput(mnt);
file_free(file);
dput(dentry);
mntput(mnt);
@@
-279,7
+280,7
@@
int fs_may_remount_ro(struct super_block *sb)
file_list_lock();
list_for_each(p, &sb->s_files) {
struct file *file = list_entry(p, struct file, f_u.fu_list);
file_list_lock();
list_for_each(p, &sb->s_files) {
struct file *file = list_entry(p, struct file, f_u.fu_list);
- struct inode *inode = file->f_dentry->d_inode;
+ struct inode *inode = file->f_
path.
dentry->d_inode;
/* File with pending delete? */
if (inode->i_nlink == 0)
/* File with pending delete? */
if (inode->i_nlink == 0)