da29fe63f0
When calling mount(), care must be taken to avoid passing in flags that are used only by the user space utilities. Otherwise we may stomp on flags that are reserved for other purposes in the kernel. In particular, openSUSE 12.3 kernels have added a new MS_RICHACL super-block flag whose value conflicts with our MS_COMMENT flag. This causes incorrect behavior such as the umask being ignored. The MS_COMMENT flag essentially serves as a placeholder in the option_map data structure of zfs_mount.c, but its value is never used. Therefore we can avoid the conflict by defining it to 0. The MS_USERS, MS_OWNER, and MS_GROUP flags also conflict with reserved flags in the kernel. While this is not known to have caused any problems, it is nevertheless incorrect. For the purposes of the mount.zfs helper, the "users", "owner", and "group" options just serve as hints to set additional implied options. Therefore we now define their associated mount flags in terms of the options that they imply rather than giving them unique values. Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov> Closes #1457
84 lines
2.3 KiB
C
84 lines
2.3 KiB
C
/*
|
|
* CDDL HEADER START
|
|
*
|
|
* The contents of this file are subject to the terms of the
|
|
* Common Development and Distribution License, Version 1.0 only
|
|
* (the "License"). You may not use this file except in compliance
|
|
* with the License.
|
|
*
|
|
* You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
|
|
* or http://www.opensolaris.org/os/licensing.
|
|
* See the License for the specific language governing permissions
|
|
* and limitations under the License.
|
|
*
|
|
* When distributing Covered Code, include this CDDL HEADER in each
|
|
* file and include the License file at usr/src/OPENSOLARIS.LICENSE.
|
|
* If applicable, add the following below this CDDL HEADER, with the
|
|
* fields enclosed by brackets "[]" replaced with your own identifying
|
|
* information: Portions Copyright [yyyy] [name of copyright owner]
|
|
*
|
|
* CDDL HEADER END
|
|
*/
|
|
/*
|
|
* Copyright 2006 Sun Microsystems, Inc. All rights reserved.
|
|
* Use is subject to license terms.
|
|
*/
|
|
|
|
#include_next <sys/mount.h>
|
|
|
|
#ifndef _LIBSPL_SYS_MOUNT_H
|
|
#define _LIBSPL_SYS_MOUNT_H
|
|
|
|
#include <sys/mntent.h>
|
|
#include <assert.h>
|
|
#include <string.h>
|
|
#include <stdlib.h>
|
|
|
|
/*
|
|
* Some old glibc headers don't define BLKGETSIZE64
|
|
* and we don't want to require the kernel headers
|
|
*/
|
|
#if !defined(BLKGETSIZE64)
|
|
#define BLKGETSIZE64 _IOR(0x12, 114, size_t)
|
|
#endif
|
|
|
|
/*
|
|
* Some old glibc headers don't correctly define MS_DIRSYNC and
|
|
* instead use the enum name S_WRITE. When using these older
|
|
* headers define MS_DIRSYNC to be S_WRITE.
|
|
*/
|
|
#if !defined(MS_DIRSYNC)
|
|
#define MS_DIRSYNC S_WRITE
|
|
#endif
|
|
|
|
#define MS_USERS (MS_NOEXEC|MS_NOSUID|MS_NODEV)
|
|
#define MS_OWNER (MS_NOSUID|MS_NODEV)
|
|
#define MS_GROUP (MS_NOSUID|MS_NODEV)
|
|
#define MS_COMMENT 0
|
|
|
|
/*
|
|
* Older glibc <sys/mount.h> headers did not define all the available
|
|
* umount2(2) flags. Both MNT_FORCE and MNT_DETACH are supported in the
|
|
* kernel back to 2.4.11 so we define them correctly if they are missing.
|
|
*/
|
|
#ifdef MNT_FORCE
|
|
# define MS_FORCE MNT_FORCE
|
|
#else
|
|
# define MS_FORCE 0x00000001
|
|
#endif /* MNT_FORCE */
|
|
|
|
#ifdef MNT_DETACH
|
|
# define MS_DETACH MNT_DETACH
|
|
#else
|
|
# define MS_DETACH 0x00000002
|
|
#endif /* MNT_DETACH */
|
|
|
|
/*
|
|
* Overlay mount is default in Linux, but for solaris/zfs
|
|
* compatibility, MS_OVERLAY is defined to explicitly have the user
|
|
* provide a flag (-O) to mount over a non empty directory.
|
|
*/
|
|
#define MS_OVERLAY 0x00000004
|
|
|
|
#endif /* _LIBSPL_SYS_MOUNT_H */
|