|
@@ -566,7 +566,7 @@ static int
|
|
|
jffs_readdir(struct file *filp, void *dirent, filldir_t filldir)
|
|
|
{
|
|
|
struct jffs_file *f;
|
|
|
- struct dentry *dentry = filp->f_dentry;
|
|
|
+ struct dentry *dentry = filp->f_path.dentry;
|
|
|
struct inode *inode = dentry->d_inode;
|
|
|
struct jffs_control *c = (struct jffs_control *)inode->i_sb->s_fs_info;
|
|
|
int j;
|
|
@@ -1372,7 +1372,7 @@ jffs_file_write(struct file *filp, const char *buf, size_t count,
|
|
|
struct jffs_control *c;
|
|
|
struct jffs_file *f;
|
|
|
struct jffs_node *node;
|
|
|
- struct dentry *dentry = filp->f_dentry;
|
|
|
+ struct dentry *dentry = filp->f_path.dentry;
|
|
|
struct inode *inode = dentry->d_inode;
|
|
|
int recoverable = 0;
|
|
|
size_t written = 0;
|
|
@@ -1380,7 +1380,7 @@ jffs_file_write(struct file *filp, const char *buf, size_t count,
|
|
|
loff_t pos = *ppos;
|
|
|
int err;
|
|
|
|
|
|
- inode = filp->f_dentry->d_inode;
|
|
|
+ inode = filp->f_path.dentry->d_inode;
|
|
|
|
|
|
D2(printk("***jffs_file_write(): inode: 0x%p (ino: %lu), "
|
|
|
"filp: 0x%p, buf: 0x%p, count: %d\n",
|