1 --- nfs-utils-1.1.0-rc1/utils/mount/mount.c~ 2007-03-29 05:55:33.000000000 +0200
2 +++ nfs-utils-1.1.0-rc1/utils/mount/mount.c 2007-04-05 18:58:38.000000000 +0200
7 - if (nfs_mount_vers == 4)
8 - mnt_err = nfs4mount(spec, mount_point, &flags, &extra_opts, &mount_opts, 0);
11 - mnt_err = nfsmount(spec, mount_point, &flags,
12 - &extra_opts, &mount_opts,
14 - if (!mnt_err && !fake && need_statd) {
15 - if (!start_statd()) {
17 - "%s: rpc.statd is not running but is "
18 - "required for remote locking\n"
19 - " Either use \"-o nolocks\" to keep "
20 - "locks local, or start statd.\n",
24 + if (nfs_mount_vers == 4)
25 + mnt_err = nfs4mount(spec, mount_point, &flags, &extra_opts, &mount_opts, 0);
28 + mnt_err = nfsmount(spec, mount_point, &flags,
29 + &extra_opts, &mount_opts,
31 + if (!mnt_err && need_statd) {
32 + if (!start_statd()) {
34 + "%s: rpc.statd is not running but is "
35 + "required for remote locking\n"
36 + " Either use \"-o nolocks\" to keep "
37 + "locks local, or start statd.\n",
51 mnt_err = do_mount_syscall(spec, mount_point,
52 nfs_mount_vers == 4 ? "nfs4" : "nfs",
53 flags & ~(MS_USER|MS_USERS) ,