From mboxrd@z Thu Jan 1 00:00:00 1970 From: Coly Li Date: Thu, 31 Jul 2008 21:40:21 +0800 Subject: [Ocfs2-devel] [PATCH] ocfs2-tools: add error message to mount.ocfs2 when mount point is invalid. Message-ID: <4891C0C5.1010007@suse.de> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: ocfs2-devel@oss.oracle.com Adds error messages to mount.ocfs2 when mount point is invalid in three conditions: 1) mount point does not exist. 2) mount point is a symbolic link. 3) mount point is not a directory. Adding these error messages can help ocfs2console provides more helpful feedback information to end use. Similar information can be found when mounting ext[234] file systems. Patch is generated against upstream ocfs2-tools. Signed-off-by: Coly Li Cc: Joel Becker Cc: Tao Ma Cc: Tiger Yang --- diff --git a/mount.ocfs2/mount.ocfs2.c b/mount.ocfs2/mount.ocfs2.c index a97b4cb..eb8e336 100644 --- a/mount.ocfs2/mount.ocfs2.c +++ b/mount.ocfs2/mount.ocfs2.c @@ -382,9 +382,21 @@ int main(int argc, char **argv) o2cb_complete_group_join(&cluster, &desc, errno); } block_signals (SIG_UNBLOCK); - com_err(progname, ret, "while mounting %s on %s. " - "Check 'dmesg' for more information on this error.", - mo.dev, mo.dir); + + /* complain mount failure */ + if (lstat(mo.dir, &statbuf)) + com_err(progname, 0, "mount point %s does not " + "exist", mo.dir); + else if (stat(mo.dir, &statbuf)) + com_err(progname, 0, "mount point %s is a " + "symbolic link to nowhere", mo.dir); + else if (stat(mo.dir, &statbuf) || !S_ISDIR(statbuf.st_mode)) + com_err(progname, 0, "mount point %s is not " + "a directory", mo.dir); + else + com_err(progname, ret, "while mounting %s on %s. " + "Check 'dmesg' for more information on this " + "error.", mo.dev, mo.dir); goto bail; } if (hb_started) { -- Coly Li SuSE PRC Labs