From mboxrd@z Thu Jan 1 00:00:00 1970 From: Vyacheslav Dubeyko Subject: [PATCH v4 04/15] nilfs-utils: fsck: modify check_mount() function with the purpose of adding opportunity of RO mount checking Date: Mon, 12 Nov 2012 13:35:28 +0400 Message-ID: <1352712928.2555.39.camel@slavad-ubuntu> Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Return-path: DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=dubeyko.com; s=default; h=Mime-Version:Content-Transfer-Encoding:Content-Type:Date:To:From:Subject:Message-ID; bh=GZp1LBQLI+oKETHz5i3kjXAXCHOKd08s4E0ZU1F43qc=; b=QoZ/dkwn2Xea6G49VEobqe/u7K+BL7SklkwVGU/zfav7QupYgDS+vnp1GObJD24GOl0uRB0IB6qV12kSxCBIXtmdqr/Adl2vqBGIxXws/YwNTRja5ec4Ct+pePZYd+/6; Sender: linux-nilfs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org List-ID: Content-Type: text/plain; charset="us-ascii" To: linux-nilfs Hi, This patch modifies check_mount() function with the purpose of adding opportunity of RO mount checking. With the best regards, Vyacheslav Dubeyko. -- From: Vyacheslav Dubeyko Subject: [PATCH v4 04/15] nilfs-utils: fsck: modify check_mount() function with the purpose of adding opportunity of RO mount checking This patch modifies check_mount() function with the purpose of adding opportunity of RO mount checking. Signed-off-by: Vyacheslav Dubeyko --- lib/ismounted.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/lib/ismounted.c b/lib/ismounted.c index 7c5f0fc..d16dce9 100644 --- a/lib/ismounted.c +++ b/lib/ismounted.c @@ -31,6 +31,15 @@ #define LINE_BUFFER_SIZE 256 /* Line buffer size for reading mtab */ +/* + * check_mount - Check that device mounted or not. + * @device: pointer on device. + * + * Return value: + * 0 - device is not mounted. + * -1 - device is mounted in RW mode. + * -2 - device is mounted in RO mode. + */ int check_mount(const char *device) { struct mntent *mnt; @@ -38,6 +47,7 @@ int check_mount(const char *device) FILE *f; dev_t file_dev = 0, file_rdev = 0; ino_t file_ino = 0; + int mount_type = 0; f = setmntent(_PATH_MOUNTED, "r"); if (f == NULL) { @@ -71,6 +81,9 @@ int check_mount(const char *device) } } + if (mnt) + mount_type = (hasmntopt(mnt, MNTOPT_RO)) ? -2 : -1; + endmntent(f); - return (mnt == NULL) ? 0 : -1; + return (mnt == NULL) ? 0 : mount_type; } -- 1.7.9.5 -- To unsubscribe from this list: send the line "unsubscribe linux-nilfs" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html