X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=utils%2Fmount%2Fmount.c;h=dde4562b045d9f60e4e571ea8a35cf1e914a7ac7;hp=2dc0aec7ec84249460115c0997c9ab82f3d2db11;hb=8d85f209d0343cf8fef35ea0c94ba9c93af6ffa6;hpb=28e4224b9bbfc355c83e17df74c47221afacd560 diff --git a/utils/mount/mount.c b/utils/mount/mount.c index 2dc0aec..dde4562 100644 --- a/utils/mount/mount.c +++ b/utils/mount/mount.c @@ -26,6 +26,7 @@ #include #include #include +#include #include #include #include @@ -41,8 +42,10 @@ #include "nfsumount.h" #include "mount.h" #include "error.h" +#include "network.h" char *progname; +int nfs_mount_data_version; int nomtab; int verbose; int sloppy; @@ -69,11 +72,6 @@ struct opt_map { int mask; /* flag mask value */ }; -/* Custom mount options for our own purposes. */ -#define MS_DUMMY 0x00000000 -#define MS_USERS 0x40000000 -#define MS_USER 0x80000000 - static const struct opt_map opt_map[] = { { "defaults", 0, 0, 0 }, /* default options */ { "ro", 1, 0, MS_RDONLY }, /* read-only */ @@ -128,6 +126,63 @@ static const struct opt_map opt_map[] = { { NULL, 0, 0, 0 } }; +#define MAKE_VERSION(p,q,r) (65536 * (p) + 256 * (q) + (r)) + +int linux_version_code(void) +{ + struct utsname my_utsname; + int p, q, r; + + if (uname(&my_utsname) == 0) { + p = atoi(strtok(my_utsname.release, ".")); + q = atoi(strtok(NULL, ".")); + r = atoi(strtok(NULL, ".")); + return MAKE_VERSION(p,q,r); + } + return 0; +} + +/* + * Choose the version of the nfs_mount_data structure that is appropriate + * for the kernel that is doing the mount. + * + * NFS_MOUNT_VERSION: maximum version supported by these sources + * nfs_mount_data_version: maximum version supported by the running kernel + */ +static void discover_nfs_mount_data_version(void) +{ + int kernel_version = linux_version_code(); + + if (kernel_version) { + if (kernel_version < MAKE_VERSION(2, 1, 32)) + nfs_mount_data_version = 1; + else if (kernel_version < MAKE_VERSION(2, 2, 18)) + nfs_mount_data_version = 3; + else if (kernel_version < MAKE_VERSION(2, 3, 0)) + nfs_mount_data_version = 4; + else if (kernel_version < MAKE_VERSION(2, 3, 99)) + nfs_mount_data_version = 3; + else if (kernel_version < MAKE_VERSION(2, 6, 3)) + nfs_mount_data_version = 4; + else + nfs_mount_data_version = 6; + } + if (nfs_mount_data_version > NFS_MOUNT_VERSION) + nfs_mount_data_version = NFS_MOUNT_VERSION; +} + +static void print_one(char *spec, char *node, char *type, char *opts) +{ + if (verbose) { + printf("%s on %s type %s", spec, node, type); + + if (opts != NULL) + printf(" (%s)", opts); + + printf("\n"); + } +} + /* Try to build a canonical options string. */ static char * fix_opts_string (int flags, const char *extra_opts) { const struct opt_map *om; @@ -207,11 +262,6 @@ fail_unlock: return result; } -int do_mount_syscall(char *spec, char *node, char *type, int flags, void *data) -{ - return mount(spec, node, type, flags, data); -} - void mount_usage() { printf("usage: %s remotetarget dir [-rvVwfnh] [-o nfsoptions]\n", @@ -303,56 +353,6 @@ static int chk_mountpoint(char *mount_point) return 0; } -extern u_short getport( - struct sockaddr_in *saddr, - u_long prog, - u_long vers, - u_int prot); - -static int probe_statd() -{ - struct sockaddr_in addr; - u_short port; - - memset(&addr, 0, sizeof(addr)); - addr.sin_family = AF_INET; - addr.sin_addr.s_addr = htonl(INADDR_LOOPBACK); - port = getport(&addr, 100024, 1, IPPROTO_UDP); - - if (port == 0) - return 0; - addr.sin_port = htons(port); - - if (clnt_ping(&addr, 100024, 1, IPPROTO_UDP, NULL) <= 0) - return 0; - - return 1; -} - -static int start_statd() -{ - /* If /var/run/rpc.statd.pid exists and is non-empty, - * assume statd already running. - * If START_STATD not defined, or defined to a non-existent file, - * don't bother, - * else run that file (typically a shell script) - */ - struct stat stb; - - if (probe_statd()) - return 1; -#ifdef START_STATD - if (stat(START_STATD, &stb) ==0 && - S_ISREG(stb.st_mode) && - (stb.st_mode & S_IXUSR)) { - system(START_STATD); - if (probe_statd()) - return 1; - } -#endif - return 0; -} - int main(int argc, char *argv[]) { int c, flags = 0, mnt_err = 1, fake = 0; @@ -362,6 +362,8 @@ int main(int argc, char *argv[]) progname = basename(argv[0]); + discover_nfs_mount_data_version(); + if(!strncmp(progname, "umount", strlen("umount"))) { if(argc < 2) { umount_usage(); @@ -478,38 +480,15 @@ int main(int argc, char *argv[]) exit(EX_FAIL); if (strcmp(fs_type, "nfs4") == 0) - mnt_err = nfs4mount(spec, mount_point, &flags, &extra_opts, &mount_opts, 0); - else { - int need_statd = 0; - mnt_err = nfsmount(spec, mount_point, &flags, - &extra_opts, &mount_opts, - 0, &need_statd); - if (!mnt_err && !fake && need_statd) { - if (!start_statd()) { - fprintf(stderr, - "%s: rpc.statd is not running but is " - "required for remote locking\n" - " Either use \"-o nolocks\" to keep " - "locks local, or start statd.\n", - progname); - exit(1); - } - } - } + mnt_err = nfs4mount(spec, mount_point, flags, &extra_opts, fake); + else + mnt_err = nfsmount(spec, mount_point, flags, &extra_opts, fake); if (mnt_err) exit(EX_FAIL); - if (!fake) { - mnt_err = do_mount_syscall(spec, mount_point, fs_type, - flags & ~(MS_USER|MS_USERS) , - mount_opts); - - if (mnt_err) { - mount_error(spec, mount_point, errno); - exit(EX_FAIL); - } - } + if (!fake) + print_one(spec, mount_point, fs_type, mount_opts); if (!nomtab) mnt_err = add_mtab(spec, mount_point, fs_type, flags, extra_opts,