a537055395
This patch fixes two problems. First, the comparison of entries in the waitq.c was incorrect. Second, the NFY_NONE check was incorrect. The test of whether the dentry is mounted if ineffective, for example, if an expire fails then we could wait forever on a non existant expire. The bug was identified by Jeff Moyer. The patch changes autofs4 to wait on expires only as this is all that's needed. If there is no existing wait when autofs4_wait is call with a type of NFY_NONE it delays until either a wait appears or the the expire flag is cleared. Signed-off-by: Ian Kent <raven@themaw.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
235 lines
6.1 KiB
C
235 lines
6.1 KiB
C
/* -*- c -*- ------------------------------------------------------------- *
|
|
*
|
|
* linux/fs/autofs/autofs_i.h
|
|
*
|
|
* Copyright 1997-1998 Transmeta Corporation - All Rights Reserved
|
|
* Copyright 2005-2006 Ian Kent <raven@themaw.net>
|
|
*
|
|
* This file is part of the Linux kernel and is made available under
|
|
* the terms of the GNU General Public License, version 2, or at your
|
|
* option, any later version, incorporated herein by reference.
|
|
*
|
|
* ----------------------------------------------------------------------- */
|
|
|
|
/* Internal header file for autofs */
|
|
|
|
#include <linux/auto_fs4.h>
|
|
#include <linux/mutex.h>
|
|
#include <linux/list.h>
|
|
|
|
/* This is the range of ioctl() numbers we claim as ours */
|
|
#define AUTOFS_IOC_FIRST AUTOFS_IOC_READY
|
|
#define AUTOFS_IOC_COUNT 32
|
|
|
|
#include <linux/kernel.h>
|
|
#include <linux/slab.h>
|
|
#include <linux/time.h>
|
|
#include <linux/string.h>
|
|
#include <linux/wait.h>
|
|
#include <linux/sched.h>
|
|
#include <linux/mount.h>
|
|
#include <linux/namei.h>
|
|
#include <asm/current.h>
|
|
#include <asm/uaccess.h>
|
|
|
|
/* #define DEBUG */
|
|
|
|
#ifdef DEBUG
|
|
#define DPRINTK(fmt,args...) do { printk(KERN_DEBUG "pid %d: %s: " fmt "\n" , current->pid , __FUNCTION__ , ##args); } while(0)
|
|
#else
|
|
#define DPRINTK(fmt,args...) do {} while(0)
|
|
#endif
|
|
|
|
#define AUTOFS_SUPER_MAGIC 0x0187
|
|
|
|
/* Unified info structure. This is pointed to by both the dentry and
|
|
inode structures. Each file in the filesystem has an instance of this
|
|
structure. It holds a reference to the dentry, so dentries are never
|
|
flushed while the file exists. All name lookups are dealt with at the
|
|
dentry level, although the filesystem can interfere in the validation
|
|
process. Readdir is implemented by traversing the dentry lists. */
|
|
struct autofs_info {
|
|
struct dentry *dentry;
|
|
struct inode *inode;
|
|
|
|
int flags;
|
|
|
|
struct autofs_sb_info *sbi;
|
|
unsigned long last_used;
|
|
atomic_t count;
|
|
|
|
mode_t mode;
|
|
size_t size;
|
|
|
|
void (*free)(struct autofs_info *);
|
|
union {
|
|
const char *symlink;
|
|
} u;
|
|
};
|
|
|
|
#define AUTOFS_INF_EXPIRING (1<<0) /* dentry is in the process of expiring */
|
|
|
|
struct autofs_wait_queue {
|
|
wait_queue_head_t queue;
|
|
struct autofs_wait_queue *next;
|
|
autofs_wqt_t wait_queue_token;
|
|
/* We use the following to see what we are waiting for */
|
|
unsigned int hash;
|
|
unsigned int len;
|
|
char *name;
|
|
u32 dev;
|
|
u64 ino;
|
|
uid_t uid;
|
|
gid_t gid;
|
|
pid_t pid;
|
|
pid_t tgid;
|
|
/* This is for status reporting upon return */
|
|
int status;
|
|
atomic_t wait_ctr;
|
|
};
|
|
|
|
#define AUTOFS_SBI_MAGIC 0x6d4a556d
|
|
|
|
#define AUTOFS_TYPE_INDIRECT 0x0001
|
|
#define AUTOFS_TYPE_DIRECT 0x0002
|
|
#define AUTOFS_TYPE_OFFSET 0x0004
|
|
|
|
struct autofs_sb_info {
|
|
u32 magic;
|
|
struct dentry *root;
|
|
int pipefd;
|
|
struct file *pipe;
|
|
pid_t oz_pgrp;
|
|
int catatonic;
|
|
int version;
|
|
int sub_version;
|
|
int min_proto;
|
|
int max_proto;
|
|
unsigned long exp_timeout;
|
|
unsigned int type;
|
|
int reghost_enabled;
|
|
int needs_reghost;
|
|
struct super_block *sb;
|
|
struct mutex wq_mutex;
|
|
spinlock_t fs_lock;
|
|
struct autofs_wait_queue *queues; /* Wait queue pointer */
|
|
};
|
|
|
|
static inline struct autofs_sb_info *autofs4_sbi(struct super_block *sb)
|
|
{
|
|
return (struct autofs_sb_info *)(sb->s_fs_info);
|
|
}
|
|
|
|
static inline struct autofs_info *autofs4_dentry_ino(struct dentry *dentry)
|
|
{
|
|
return (struct autofs_info *)(dentry->d_fsdata);
|
|
}
|
|
|
|
/* autofs4_oz_mode(): do we see the man behind the curtain? (The
|
|
processes which do manipulations for us in user space sees the raw
|
|
filesystem without "magic".) */
|
|
|
|
static inline int autofs4_oz_mode(struct autofs_sb_info *sbi) {
|
|
return sbi->catatonic || process_group(current) == sbi->oz_pgrp;
|
|
}
|
|
|
|
/* Does a dentry have some pending activity? */
|
|
static inline int autofs4_ispending(struct dentry *dentry)
|
|
{
|
|
struct autofs_info *inf = autofs4_dentry_ino(dentry);
|
|
int pending = 0;
|
|
|
|
if (dentry->d_flags & DCACHE_AUTOFS_PENDING)
|
|
return 1;
|
|
|
|
if (inf) {
|
|
spin_lock(&inf->sbi->fs_lock);
|
|
pending = inf->flags & AUTOFS_INF_EXPIRING;
|
|
spin_unlock(&inf->sbi->fs_lock);
|
|
}
|
|
|
|
return pending;
|
|
}
|
|
|
|
static inline void autofs4_copy_atime(struct file *src, struct file *dst)
|
|
{
|
|
dst->f_dentry->d_inode->i_atime = src->f_dentry->d_inode->i_atime;
|
|
return;
|
|
}
|
|
|
|
struct inode *autofs4_get_inode(struct super_block *, struct autofs_info *);
|
|
void autofs4_free_ino(struct autofs_info *);
|
|
|
|
/* Expiration */
|
|
int is_autofs4_dentry(struct dentry *);
|
|
int autofs4_expire_run(struct super_block *, struct vfsmount *,
|
|
struct autofs_sb_info *,
|
|
struct autofs_packet_expire __user *);
|
|
int autofs4_expire_multi(struct super_block *, struct vfsmount *,
|
|
struct autofs_sb_info *, int __user *);
|
|
|
|
/* Operations structures */
|
|
|
|
extern struct inode_operations autofs4_symlink_inode_operations;
|
|
extern struct inode_operations autofs4_dir_inode_operations;
|
|
extern struct inode_operations autofs4_root_inode_operations;
|
|
extern struct inode_operations autofs4_indirect_root_inode_operations;
|
|
extern struct inode_operations autofs4_direct_root_inode_operations;
|
|
extern const struct file_operations autofs4_dir_operations;
|
|
extern const struct file_operations autofs4_root_operations;
|
|
|
|
/* Initializing function */
|
|
|
|
int autofs4_fill_super(struct super_block *, void *, int);
|
|
struct autofs_info *autofs4_init_ino(struct autofs_info *, struct autofs_sb_info *sbi, mode_t mode);
|
|
|
|
/* Queue management functions */
|
|
|
|
int autofs4_wait(struct autofs_sb_info *,struct dentry *, enum autofs_notify);
|
|
int autofs4_wait_release(struct autofs_sb_info *,autofs_wqt_t,int);
|
|
void autofs4_catatonic_mode(struct autofs_sb_info *);
|
|
|
|
static inline int autofs4_follow_mount(struct vfsmount **mnt, struct dentry **dentry)
|
|
{
|
|
int res = 0;
|
|
|
|
while (d_mountpoint(*dentry)) {
|
|
int followed = follow_down(mnt, dentry);
|
|
if (!followed)
|
|
break;
|
|
res = 1;
|
|
}
|
|
return res;
|
|
}
|
|
|
|
static inline u32 autofs4_get_dev(struct autofs_sb_info *sbi)
|
|
{
|
|
return new_encode_dev(sbi->sb->s_dev);
|
|
}
|
|
|
|
static inline u64 autofs4_get_ino(struct autofs_sb_info *sbi)
|
|
{
|
|
return sbi->sb->s_root->d_inode->i_ino;
|
|
}
|
|
|
|
static inline int simple_positive(struct dentry *dentry)
|
|
{
|
|
return dentry->d_inode && !d_unhashed(dentry);
|
|
}
|
|
|
|
static inline int __simple_empty(struct dentry *dentry)
|
|
{
|
|
struct dentry *child;
|
|
int ret = 0;
|
|
|
|
list_for_each_entry(child, &dentry->d_subdirs, d_u.d_child)
|
|
if (simple_positive(child))
|
|
goto out;
|
|
ret = 1;
|
|
out:
|
|
return ret;
|
|
}
|
|
|
|
void autofs4_dentry_release(struct dentry *);
|
|
|