From: Chuck Lever Date: Mon, 16 Jul 2007 20:28:20 +0000 (-0400) Subject: mount.nfs: /bin/mount already handles --bind & friends X-Git-Tag: nfs-utils-1-1-1~148 X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=b960bca6e4f634bdcbcdd1d5638ab00db0851f8c;p=nfs-utils.git mount.nfs: /bin/mount already handles --bind & friends Clean-up: remove logic to handle --bind and other such command-line options from mount.nfs[4]. These options are already handled in /bin/mount, and the logic for handling them in the NFS helper is currently disabled. Other helpers such as mount.ocfs2 appear not to support --bind (ie. they rely on /bin/mount to do it). Signed-off-by: Chuck Lever Signed-off-by: Neil Brown --- diff --git a/utils/mount/mount.c b/utils/mount/mount.c index e06f027..24ba394 100644 --- a/utils/mount/mount.c +++ b/utils/mount/mount.c @@ -43,7 +43,6 @@ char *progname; int nomtab; int verbose; -int mounttype; int sloppy; static struct option longopts[] = { @@ -57,13 +56,6 @@ static struct option longopts[] = { { "read-write", 0, 0, 'w' }, { "rw", 0, 0, 'w' }, { "options", 1, 0, 'o' }, - { "bind", 0, 0, 128 }, - { "replace", 0, 0, 129 }, - { "after", 0, 0, 130 }, - { "before", 0, 0, 131 }, - { "over", 0, 0, 132 }, - { "move", 0, 0, 133 }, - { "rbind", 0, 0, 135 }, { NULL, 0, 0, 0 } }; @@ -444,27 +436,6 @@ int main(int argc, char *argv[]) case 's': ++sloppy; break; - case 128: /* bind */ - mounttype = MS_BIND; - break; - case 129: /* replace */ - mounttype = MS_REPLACE; - break; - case 130: /* after */ - mounttype = MS_AFTER; - break; - case 131: /* before */ - mounttype = MS_BEFORE; - break; - case 132: /* over */ - mounttype = MS_OVER; - break; - case 133: /* move */ - mounttype = MS_MOVE; - break; - case 135: /* rbind */ - mounttype = MS_BIND | MS_REC; - break; case 'h': default: mount_usage(); @@ -503,7 +474,6 @@ int main(int argc, char *argv[]) * gave us, so just take whatever is in /etc/fstab. */ mount_opts = strdup(mc->m.mnt_opts); - mounttype = 0; } mount_point = canonicalize(mount_point);