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-e71dd7c1db99d86b1846290ee04cdbac30120586.tar.gz
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)
char *hostname;
char *pathname;
char *mounthost;
+ /* prior to 2.6.23, kernel took NFS options in a form of this struct
+ * only. 2.6.23+ looks at data->version, and if it's not 1..6,
+ * then data pointer is interpreted as a string. */
struct nfs_mount_data data;
char *opt;
struct hostent *hp;
@@ -968,7 +971,7 @@ static int nfsmount(struct mntent *mp, long vfsflags, char *filteropts)
int nfsprog;
int nfsvers;
int retval;
- /* these all are one-bit really. 4.3.1 likes this combination: */
+ /* these all are one-bit really. gcc 4.3.1 likes this combination: */
smallint tcp;
smallint soft;
int intr;