diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-18 22:06:10 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-18 22:06:10 +0000 |
| commit | aba4e552a2f2c1492441acbccedd8e0a4c53f916 (patch) | |
| tree | 23921efb2b4af590160f034a89ff3da2ecca6e47 /fs/autofs4 | |
| parent | 9e17e1aa1cf1cb497d2f67147a51831888affcf3 (diff) | |
Merge with Linux 2.3.43.
Diffstat (limited to 'fs/autofs4')
| -rw-r--r-- | fs/autofs4/inode.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/autofs4/inode.c b/fs/autofs4/inode.c index 3d3485c9d..1b512ee1c 100644 --- a/fs/autofs4/inode.c +++ b/fs/autofs4/inode.c @@ -140,7 +140,7 @@ static int parse_options(char *options, int *pipefd, uid_t *uid, gid_t *gid, *gid = current->gid; *pgrp = current->pgrp; - *minproto = *maxproto = AUTOFS_PROTO_VERSION; + *minproto = *maxproto = AUTOFS_MAX_PROTO_VERSION; *pipefd = -1; @@ -278,15 +278,15 @@ struct super_block *autofs4_read_super(struct super_block *s, void *data, /* Couldn't this be tested earlier? */ if (maxproto < AUTOFS_MIN_PROTO_VERSION || - minproto > AUTOFS_PROTO_VERSION) { + minproto > AUTOFS_MAX_PROTO_VERSION) { printk("autofs: kernel does not match daemon version " "daemon (%d, %d) kernel (%d, %d)\n", minproto, maxproto, - AUTOFS_MIN_PROTO_VERSION, AUTOFS_PROTO_VERSION); + AUTOFS_MIN_PROTO_VERSION, AUTOFS_MAX_PROTO_VERSION); goto fail_dput; } - sbi->version = maxproto > AUTOFS_PROTO_VERSION ? AUTOFS_PROTO_VERSION : maxproto; + sbi->version = maxproto > AUTOFS_MAX_PROTO_VERSION ? AUTOFS_MAX_PROTO_VERSION : maxproto; DPRINTK(("autofs: pipe fd = %d, pgrp = %u\n", pipefd, sbi->oz_pgrp)); pipe = fget(pipefd); |