aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2009-05-13 16:32:32 +0200
committerDenys Vlasenko <vda.linux@googlemail.com>2009-05-13 16:32:32 +0200
commite71dd7c1db99d86b1846290ee04cdbac30120586 (patch)
treed40c2741257aa4887ae3a37bb00df2ad3d1b2ff3
parent7a5814c74c875d1d4ce80c8d24b0573a8fd51ab5 (diff)
downloadbusybox-w32-e71dd7c1db99d86b1846290ee04cdbac30120586.tar.gz
busybox-w32-e71dd7c1db99d86b1846290ee04cdbac30120586.tar.bz2
busybox-w32-e71dd7c1db99d86b1846290ee04cdbac30120586.zip
mount: document when kernel started accepting string as NFS options
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--util-linux/mount.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/util-linux/mount.c b/util-linux/mount.c
index d954febe5..1ebc7247b 100644
--- a/util-linux/mount.c
+++ b/util-linux/mount.c
@@ -942,6 +942,9 @@ static int nfsmount(struct mntent *mp, long vfsflags, char *filteropts)
942 char *hostname; 942 char *hostname;
943 char *pathname; 943 char *pathname;
944 char *mounthost; 944 char *mounthost;
945 /* prior to 2.6.23, kernel took NFS options in a form of this struct
946 * only. 2.6.23+ looks at data->version, and if it's not 1..6,
947 * then data pointer is interpreted as a string. */
945 struct nfs_mount_data data; 948 struct nfs_mount_data data;
946 char *opt; 949 char *opt;
947 struct hostent *hp; 950 struct hostent *hp;
@@ -968,7 +971,7 @@ static int nfsmount(struct mntent *mp, long vfsflags, char *filteropts)
968 int nfsprog; 971 int nfsprog;
969 int nfsvers; 972 int nfsvers;
970 int retval; 973 int retval;
971 /* these all are one-bit really. 4.3.1 likes this combination: */ 974 /* these all are one-bit really. gcc 4.3.1 likes this combination: */
972 smallint tcp; 975 smallint tcp;
973 smallint soft; 976 smallint soft;
974 int intr; 977 int intr;