[git commit] mount: document when kernel started accepting string as NFS options

Denys Vlasenko vda.linux at googlemail.com
Wed May 13 14:32:32 UTC 2009


commit: http://git.busybox.net/busybox/commit/?id=e71dd7c1db99d86b1846290ee04cdbac30120586
branch: http://git.busybox.net/busybox/commit/?id=refs/heads/master


Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
 util-linux/mount.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/util-linux/mount.c b/util-linux/mount.c
index d954feb..1ebc724 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;
-- 
1.6.0.6


More information about the busybox-cvs mailing list