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
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
fs
/
debugfs
/
file.c
diff --git
a/fs/debugfs/file.c
b/fs/debugfs/file.c
index
66a5054
..
35c9995
100644
(file)
--- a/
fs/debugfs/file.c
+++ b/
fs/debugfs/file.c
@@
-13,7
+13,6
@@
*
*/
*
*/
-#include <linux/config.h>
#include <linux/module.h>
#include <linux/fs.h>
#include <linux/pagemap.h>
#include <linux/module.h>
#include <linux/fs.h>
#include <linux/pagemap.h>
@@
-33,8
+32,8
@@
static ssize_t default_write_file(struct file *file, const char __user *buf,
static int default_open(struct inode *inode, struct file *file)
{
static int default_open(struct inode *inode, struct file *file)
{
- if (inode->
u.generic_ip
)
- file->private_data = inode->
u.generic_ip
;
+ if (inode->
i_private
)
+ file->private_data = inode->
i_private
;
return 0;
}
return 0;
}