From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 2567 invoked by alias); 25 Jul 2008 19:29:26 -0000 Received: (qmail 2535 invoked by uid 9579); 25 Jul 2008 19:29:24 -0000 Date: Fri, 25 Jul 2008 19:29:00 -0000 Message-ID: <20080725192924.2519.qmail@sourceware.org> From: rohara@sourceware.org To: cluster-cvs@sources.redhat.com, cluster-devel@redhat.com Subject: Cluster Project branch, RHEL5, updated. cmirror_1_1_15-178-g50203b1 X-Git-Refname: refs/heads/RHEL5 X-Git-Reftype: branch X-Git-Oldrev: e0ff895e257924ddba53244b01445f6665a2e163 X-Git-Newrev: 50203b164f9d122b3d2312534587e1dcef9e3bb8 Mailing-List: contact cluster-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cluster-cvs-owner@sourceware.org X-SW-Source: 2008-q3/txt/msg00144.txt.bz2 This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Cluster Project". http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=50203b164f9d122b3d2312534587e1dcef9e3bb8 The branch, RHEL5 has been updated via 50203b164f9d122b3d2312534587e1dcef9e3bb8 (commit) from e0ff895e257924ddba53244b01445f6665a2e163 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 50203b164f9d122b3d2312534587e1dcef9e3bb8 Author: Ryan O'Hara Date: Fri Jul 25 14:27:56 2008 -0500 gfs_mkfs: change the way we check to see if a device is mounted New method will attempt to open device with O_EXCL flag. If open() responds with EBUSY, mkfs will die. This indicates that the device is either mounted or part of a LVM volume. (BZ #426298) ----------------------------------------------------------------------- Summary of changes: gfs/gfs_mkfs/main.c | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-) diff --git a/gfs/gfs_mkfs/main.c b/gfs/gfs_mkfs/main.c index 4f3920a..09315a5 100644 --- a/gfs/gfs_mkfs/main.c +++ b/gfs/gfs_mkfs/main.c @@ -244,31 +244,31 @@ void are_you_sure(commandline_t *comline) /** - * check_mount - + * check_mount - check to see if device is mounted/busy * @ * */ void check_mount(char *device) { - struct mntent *mnt; - FILE *fp; + struct stat st_buf; + int fd; - if ((fp = setmntent("/proc/mounts", "r")) == NULL) { - die("error opening /proc/mounts"); - } + if (stat(device, &st_buf) < 0) + die("could not stat device %s\n", device); + if (!S_ISBLK(st_buf.st_mode)) + die("%s is not a block device\n", device); - while ((mnt = getmntent(fp)) != NULL) { - if (strcmp(device, mnt->mnt_fsname) == 0) { - printf("cannot create filesystem: "); - printf("%s appears to be mounted\n", device); - endmntent(fp); - exit(EXIT_FAILURE); - break; + fd = open(device, O_RDONLY | O_NONBLOCK | O_EXCL); + + if (fd < 0) { + if (errno == EBUSY) { + die("device %s is busy\n", device); } } - - endmntent(fp); + else { + close(fd); + } return; } hooks/post-receive -- Cluster Project