Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2024-12-22 14:30:31 +00:00
Code Issues Projects Releases Wiki Activity

mount: document when kernel started accepting string as NFS options

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2009-05-13 16:32:32 +02:00
parent 7a5814c74c
commit e71dd7c1db
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
util-linux/mount.c
View File

@ -942,6 +942,9 @@ static int nfsmount(struct mntent *mp, long vfsflags, char *filteropts)
char *hostname; char *hostname;
char *pathname; char *pathname;
char *mounthost; 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; struct nfs_mount_data data;
char *opt; char *opt;
struct hostent *hp; struct hostent *hp;
@ -968,7 +971,7 @@ static int nfsmount(struct mntent *mp, long vfsflags, char *filteropts)
int nfsprog; int nfsprog;
int nfsvers; int nfsvers;
int retval; 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 tcp;
smallint soft; smallint soft;
int intr; int intr;