aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosef Sipek <jsipek@fsl.cs.sunysb.edu>2006-12-08 05:37:15 -0500
committerLinus Torvalds <torvalds@woody.osdl.org>2006-12-08 11:28:46 -0500
commit4d832d460e13dd9c2cc93739ac0fd75bd8645e93 (patch)
tree42ecd1d4448f73da99e2f3348a913aae0cbc2e12
parentd1f229744ece0b7aa7ce89ecd1fb598b90305d5b (diff)
[PATCH] struct path: convert jffs
Signed-off-by: Josef Sipek <jsipek@fsl.cs.sunysb.edu> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--fs/jffs/inode-v23.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/jffs/inode-v23.c b/fs/jffs/inode-v23.c
index 9f15bce92022..7b40c69f44eb 100644
--- a/fs/jffs/inode-v23.c
+++ b/fs/jffs/inode-v23.c
@@ -566,7 +566,7 @@ static int
566jffs_readdir(struct file *filp, void *dirent, filldir_t filldir) 566jffs_readdir(struct file *filp, void *dirent, filldir_t filldir)
567{ 567{
568 struct jffs_file *f; 568 struct jffs_file *f;
569 struct dentry *dentry = filp->f_dentry; 569 struct dentry *dentry = filp->f_path.dentry;
570 struct inode *inode = dentry->d_inode; 570 struct inode *inode = dentry->d_inode;
571 struct jffs_control *c = (struct jffs_control *)inode->i_sb->s_fs_info; 571 struct jffs_control *c = (struct jffs_control *)inode->i_sb->s_fs_info;
572 int j; 572 int j;
@@ -1372,7 +1372,7 @@ jffs_file_write(struct file *filp, const char *buf, size_t count,
1372 struct jffs_control *c; 1372 struct jffs_control *c;
1373 struct jffs_file *f; 1373 struct jffs_file *f;
1374 struct jffs_node *node; 1374 struct jffs_node *node;
1375 struct dentry *dentry = filp->f_dentry; 1375 struct dentry *dentry = filp->f_path.dentry;
1376 struct inode *inode = dentry->d_inode; 1376 struct inode *inode = dentry->d_inode;
1377 int recoverable = 0; 1377 int recoverable = 0;
1378 size_t written = 0; 1378 size_t written = 0;
@@ -1380,7 +1380,7 @@ jffs_file_write(struct file *filp, const char *buf, size_t count,
1380 loff_t pos = *ppos; 1380 loff_t pos = *ppos;
1381 int err; 1381 int err;
1382 1382
1383 inode = filp->f_dentry->d_inode; 1383 inode = filp->f_path.dentry->d_inode;
1384 1384
1385 D2(printk("***jffs_file_write(): inode: 0x%p (ino: %lu), " 1385 D2(printk("***jffs_file_write(): inode: 0x%p (ino: %lu), "
1386 "filp: 0x%p, buf: 0x%p, count: %d\n", 1386 "filp: 0x%p, buf: 0x%p, count: %d\n",