diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-05-12 21:05:59 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-05-12 21:05:59 +0000 |
| commit | ba2dacab305c598cd4c34a604f8e276bf5bab5ff (patch) | |
| tree | 78670a0139bf4d5ace617b29b7eba82bbc74d602 /fs/autofs/root.c | |
| parent | b77bf69998121e689c5e86cc5630d39a0a9ee6ca (diff) | |
Merge with Linux 2.3.99-pre7 and various other bits.
Diffstat (limited to 'fs/autofs/root.c')
| -rw-r--r-- | fs/autofs/root.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/autofs/root.c b/fs/autofs/root.c index baa8cd6bf..63ac3db2a 100644 --- a/fs/autofs/root.c +++ b/fs/autofs/root.c @@ -432,6 +432,7 @@ static inline int autofs_get_protover(int *p) /* Perform an expiry operation */ static inline int autofs_expire_run(struct super_block *sb, struct autofs_sb_info *sbi, + struct vfsmount *mnt, struct autofs_packet_expire *pkt_p) { struct autofs_dir_ent *ent; @@ -443,7 +444,7 @@ static inline int autofs_expire_run(struct super_block *sb, pkt.hdr.type = autofs_ptype_expire; if ( !sbi->exp_timeout || - !(ent = autofs_expire(sb,sbi)) ) + !(ent = autofs_expire(sb,sbi,mnt)) ) return -EAGAIN; pkt.len = ent->len; @@ -487,7 +488,7 @@ static int autofs_root_ioctl(struct inode *inode, struct file *filp, case AUTOFS_IOC_SETTIMEOUT: return autofs_get_set_timeout(sbi,(unsigned long *)arg); case AUTOFS_IOC_EXPIRE: - return autofs_expire_run(inode->i_sb,sbi, + return autofs_expire_run(inode->i_sb, sbi, filp->f_vfsmnt, (struct autofs_packet_expire *)arg); default: return -ENOSYS; |