emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mount: support -o noacl

Browse Source 
Signed-off-by: Dave Love <fx@gnu.org>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Dave Love 2011-11-10 15:19:25 +01:00 committed by Denys Vlasenko
parent b9f4cd85f0
commit fae473c81b
1 changed files with 30 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
util-linux/mount.c
View File

@ -820,31 +820,31 @@ enum {
*/ */
struct nfs2_fh { struct nfs2_fh {
char data[32]; char data[32];
}; };
struct nfs3_fh { struct nfs3_fh {
unsigned short size; unsigned short size;
unsigned char data[64]; unsigned char data[64];
}; };
struct nfs_mount_data { struct nfs_mount_data {
int version; /* 1 */ int version; /* 1 */
int fd; /* 1 */ int fd; /* 1 */
struct nfs2_fh old_root; /* 1 */ struct nfs2_fh old_root; /* 1 */
int flags; /* 1 */ int flags; /* 1 */
int rsize; /* 1 */ int rsize; /* 1 */
int wsize; /* 1 */ int wsize; /* 1 */
int timeo; /* 1 */ int timeo; /* 1 */
int retrans; /* 1 */ int retrans; /* 1 */
int acregmin; /* 1 */ int acregmin; /* 1 */
int acregmax; /* 1 */ int acregmax; /* 1 */
int acdirmin; /* 1 */ int acdirmin; /* 1 */
int acdirmax; /* 1 */ int acdirmax; /* 1 */
struct sockaddr_in addr; /* 1 */ struct sockaddr_in addr; /* 1 */
char hostname[256]; /* 1 */ char hostname[256]; /* 1 */
int namlen; /* 2 */ int namlen; /* 2 */
unsigned int bsize; /* 3 */ unsigned int bsize; /* 3 */
struct nfs3_fh root; /* 4 */ struct nfs3_fh root; /* 4 */
}; };
/* bits in the flags field */ /* bits in the flags field */
@ -859,6 +859,7 @@ enum {
NFS_MOUNT_VER3 = 0x0080, /* 3 */ NFS_MOUNT_VER3 = 0x0080, /* 3 */
NFS_MOUNT_KERBEROS = 0x0100, /* 3 */ NFS_MOUNT_KERBEROS = 0x0100, /* 3 */
NFS_MOUNT_NONLM = 0x0200, /* 3 */ NFS_MOUNT_NONLM = 0x0200, /* 3 */
NFS_MOUNT_NOACL = 0x0800, /* 4 */
NFS_MOUNT_NORDIRPLUS = 0x4000 NFS_MOUNT_NORDIRPLUS = 0x4000
}; };
@ -1123,6 +1124,7 @@ static NOINLINE int nfsmount(struct mntent *mp, long vfsflags, char *filteropts)
int noac; int noac;
int nordirplus; int nordirplus;
int nolock; int nolock;
int noacl;
find_kernel_nfs_mount_version(); find_kernel_nfs_mount_version();
@ -1195,6 +1197,7 @@ static NOINLINE int nfsmount(struct mntent *mp, long vfsflags, char *filteropts)
nolock = 0; nolock = 0;
noac = 0; noac = 0;
nordirplus = 0; nordirplus = 0;
noacl = 0;
retry = 10000; /* 10000 minutes ~ 1 week */ retry = 10000; /* 10000 minutes ~ 1 week */
tcp = 1; /* nfs-utils uses tcp per default */ tcp = 1; /* nfs-utils uses tcp per default */
@ -1333,7 +1336,8 @@ static NOINLINE int nfsmount(struct mntent *mp, long vfsflags, char *filteropts)
"tcp\0" "tcp\0"
"udp\0" "udp\0"
"lock\0" "lock\0"
"rdirplus\0"; "rdirplus\0"
"acl\0";
int val = 1; int val = 1;
if (!strncmp(opt, "no", 2)) { if (!strncmp(opt, "no", 2)) {
val = 0; val = 0;
@ -1383,6 +1387,9 @@ static NOINLINE int nfsmount(struct mntent *mp, long vfsflags, char *filteropts)
case 11: //rdirplus case 11: //rdirplus
nordirplus = !val; nordirplus = !val;
break; break;
case 12: // acl
noacl = !val;
break;
default: default:
bb_error_msg("unknown nfs mount option: %s%s", val ? "" : "no", opt); bb_error_msg("unknown nfs mount option: %s%s", val ? "" : "no", opt);
goto fail; goto fail;
@ -1396,7 +1403,8 @@ static NOINLINE int nfsmount(struct mntent *mp, long vfsflags, char *filteropts)
| (posix ? NFS_MOUNT_POSIX : 0) | (posix ? NFS_MOUNT_POSIX : 0)
| (nocto ? NFS_MOUNT_NOCTO : 0) | (nocto ? NFS_MOUNT_NOCTO : 0)
| (noac ? NFS_MOUNT_NOAC : 0) | (noac ? NFS_MOUNT_NOAC : 0)
| (nordirplus ? NFS_MOUNT_NORDIRPLUS : 0); | (nordirplus ? NFS_MOUNT_NORDIRPLUS : 0)
| (noacl ? NFS_MOUNT_NOACL : 0);
if (nfs_mount_version >= 2) if (nfs_mount_version >= 2)
data.flags |= (tcp ? NFS_MOUNT_TCP : 0); data.flags |= (tcp ? NFS_MOUNT_TCP : 0);
if (nfs_mount_version >= 3) if (nfs_mount_version >= 3)