aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosef "Jeff" Sipek <jsipek@cs.sunysb.edu>2006-12-08 05:36:46 -0500
committerLinus Torvalds <torvalds@woody.osdl.org>2006-12-08 11:28:43 -0500
commit81ed19b076f518e793283ccbd004fd0888877201 (patch)
tree1496e2023850824f0ef812cb377170bebffae47c
parent010596cc311131421c7be3a73ee7174bda16d322 (diff)
[PATCH] autofs: change uses of f_{dentry, vfsmnt} to use f_path
Change all the uses of f_{dentry,vfsmnt} to f_path.{dentry,mnt} in the autofs filesystem. Signed-off-by: Josef "Jeff" Sipek <jsipek@cs.sunysb.edu> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--fs/autofs/root.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/autofs/root.c b/fs/autofs/root.c
index 368a1c33a3c..e698c51d2b0 100644
--- a/fs/autofs/root.c
+++ b/fs/autofs/root.c
@@ -45,7 +45,7 @@ static int autofs_root_readdir(struct file *filp, void *dirent, filldir_t filldi
45 struct autofs_dir_ent *ent = NULL; 45 struct autofs_dir_ent *ent = NULL;
46 struct autofs_dirhash *dirhash; 46 struct autofs_dirhash *dirhash;
47 struct autofs_sb_info *sbi; 47 struct autofs_sb_info *sbi;
48 struct inode * inode = filp->f_dentry->d_inode; 48 struct inode * inode = filp->f_path.dentry->d_inode;
49 off_t onr, nr; 49 off_t onr, nr;
50 50
51 lock_kernel(); 51 lock_kernel();
@@ -557,7 +557,7 @@ static int autofs_root_ioctl(struct inode *inode, struct file *filp,
557 case AUTOFS_IOC_SETTIMEOUT: 557 case AUTOFS_IOC_SETTIMEOUT:
558 return autofs_get_set_timeout(sbi, argp); 558 return autofs_get_set_timeout(sbi, argp);
559 case AUTOFS_IOC_EXPIRE: 559 case AUTOFS_IOC_EXPIRE:
560 return autofs_expire_run(inode->i_sb, sbi, filp->f_vfsmnt, 560 return autofs_expire_run(inode->i_sb, sbi, filp->f_path.mnt,
561 argp); 561 argp);
562 default: 562 default:
563 return -ENOSYS; 563 return -ENOSYS;