From mboxrd@z Thu Jan 1 00:00:00 1970 From: rpeterso@sourceware.org Date: 13 Oct 2006 22:01:42 -0000 Subject: [Cluster-devel] cluster/gfs2/mount util.c Message-ID: <20061013220142.11992.qmail@sourceware.org> List-Id: To: cluster-devel.redhat.com MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit CVSROOT: /cvs/cluster Module name: cluster Changes by: rpeterso at sourceware.org 2006-10-13 22:01:40 Modified files: gfs2/mount : util.c Log message: This is a fix for bugzilla bug 210300: Unknown mount option "users". The gfs and gfs2 mount helper (/sbin/mount.gfs2) was aborting if it saw mount options that are not part of mount.h (i.e. internal to mount and vfs). The fix is to add the missing options so the mount helper will recognize them properly. Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/mount/util.c.diff?cvsroot=cluster&r1=1.14&r2=1.15 --- cluster/gfs2/mount/util.c 2006/10/13 20:01:19 1.14 +++ cluster/gfs2/mount/util.c 2006/10/13 22:01:40 1.15 @@ -45,6 +45,18 @@ { "noatime", 0, 0, MS_NOATIME }, /* Do not update access time */ { "diratime", 0, 1, MS_NODIRATIME }, /* Update dir access times */ { "nodiratime", 0, 0, MS_NODIRATIME },/* Do not update dir access times */ + + /* options used by the mount command only (not in sys/mount.h): */ + { "dirsync", 0, 0, 0 }, /* synchronous directory modifications */ + { "loop", 1, 0, 0 }, /* use a loop device */ + { "auto", 0, 1, 0 }, /* Can be mounted using -a */ + { "noauto", 0, 0, 0 }, /* Can only be mounted explicitly */ + { "users", 0, 0, 0 }, /* Allow ordinary user to mount */ + { "nousers", 0, 1, 0 }, /* Forbid ordinary user to mount */ + { "user", 0, 0, 0 }, /* Allow ordinary user to mount */ + { "nouser", 0, 1, 0 }, /* Forbid ordinary user to mount */ + { "owner", 0, 0, 0 }, /* Let the owner of the device mount */ + { "noowner", 0, 1, 0 }, /* Device owner has no special privs */ { NULL, 0, 0, 0 } };