projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
and changed files
[powerpc.git]
/
fs
/
file_table.c
diff --git
a/fs/file_table.c
b/fs/file_table.c
index
24f25a0
..
d17fd69
100644
(file)
--- a/
fs/file_table.c
+++ b/
fs/file_table.c
@@
-10,7
+10,6
@@
#include <linux/file.h>
#include <linux/init.h>
#include <linux/module.h>
#include <linux/file.h>
#include <linux/init.h>
#include <linux/module.h>
-#include <linux/smp_lock.h>
#include <linux/fs.h>
#include <linux/security.h>
#include <linux/eventpoll.h>
#include <linux/fs.h>
#include <linux/security.h>
#include <linux/eventpoll.h>
@@
-152,8
+151,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();
@@
-176,8
+175,8
@@
void fastcall __fput(struct file *file)
put_write_access(inode);
put_pid(file->f_owner.pid);
file_kill(file);
put_write_access(inode);
put_pid(file->f_owner.pid);
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);
@@
-271,7
+270,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)