Gitweb: http://git.fedorahosted.org/git/?p=gfs2-utils.git;a=commitdiff;h=0d5b21adc86... Commit: 0d5b21adc867da3c738474ec2bcd1cfa625f8bb6 Parent: 63bd2eff2043c2d14399d5511e116ae0cdd8bba3 Author: Andrew Price anprice@redhat.com AuthorDate: Sat Nov 16 02:21:36 2013 -0600 Committer: Andrew Price anprice@redhat.com CommitterDate: Mon Nov 18 10:50:14 2013 +0000
libgfs2: Remove is_pathname_mounted
All callers are now using lgfs2_open_mnt* instead.
Resolves: bz#991204
Signed-off-by: Andrew Price anprice@redhat.com --- gfs2/libgfs2/libgfs2.h | 1 - gfs2/libgfs2/misc.c | 61 ------------------------------------------------ 2 files changed, 0 insertions(+), 62 deletions(-)
diff --git a/gfs2/libgfs2/libgfs2.h b/gfs2/libgfs2/libgfs2.h index 3e5d09c..e785017 100644 --- a/gfs2/libgfs2/libgfs2.h +++ b/gfs2/libgfs2/libgfs2.h @@ -715,7 +715,6 @@ extern int metafs_interrupted; extern int compute_heightsize(struct gfs2_sbd *sdp, uint64_t *heightsize, uint32_t *maxheight, uint32_t bsize1, int diptrs, int inptrs); extern int compute_constants(struct gfs2_sbd *sdp); -extern int is_pathname_mounted(char *path_name, char *device_name, int *ro_mount); extern int lgfs2_open_mnt(const char *path, int dirflags, int *dirfd, int devflags, int *devfd, struct mntent **mnt); extern int lgfs2_open_mnt_dev(const char *path, int flags, struct mntent **mnt); extern int lgfs2_open_mnt_dir(const char *path, int flags, struct mntent **mnt); diff --git a/gfs2/libgfs2/misc.c b/gfs2/libgfs2/misc.c index 195b983..c4ed722 100644 --- a/gfs2/libgfs2/misc.c +++ b/gfs2/libgfs2/misc.c @@ -102,67 +102,6 @@ int compute_constants(struct gfs2_sbd *sdp) return 0; }
-int is_pathname_mounted(char *path_name, char *device_name, int *ro_mount) -{ - FILE *fp; - struct mntent *mnt; - dev_t file_dev=0, file_rdev=0; - ino_t file_ino=0; - struct stat st_buf; - - *ro_mount = 0; - if ((fp = setmntent("/proc/mounts", "r")) == NULL) { - perror("open: /proc/mounts"); - return 0; - } - if (stat(path_name, &st_buf) == 0) { - if (S_ISBLK(st_buf.st_mode)) { -#ifndef __GNU__ /* The GNU hurd is broken with respect to stat devices */ - file_rdev = st_buf.st_rdev; -#endif /* __GNU__ */ - } else { - file_dev = st_buf.st_dev; - file_ino = st_buf.st_ino; - } - } - while ((mnt = getmntent (fp)) != NULL) { - /* Check if they specified the device instead of mnt point */ - if (strcmp(device_name, mnt->mnt_fsname) == 0) { - strcpy(path_name, mnt->mnt_dir); /* fix it */ - break; - } - if (strcmp(path_name, mnt->mnt_dir) == 0) { - strcpy(device_name, mnt->mnt_fsname); /* fix it */ - break; - } - if (stat(mnt->mnt_fsname, &st_buf) == 0) { - if (S_ISBLK(st_buf.st_mode)) { -#ifndef __GNU__ - if (file_rdev && (file_rdev == st_buf.st_rdev)) - break; -#endif /* __GNU__ */ - } else { - if (file_dev && ((file_dev == st_buf.st_dev) && - (file_ino == st_buf.st_ino))) - break; - } - } - } - endmntent (fp); - if (mnt == NULL) - return 0; - if (stat(mnt->mnt_dir, &st_buf) < 0) { - if (errno == ENOENT) - return 0; - } - /* Can't trust fstype because / has "rootfs". */ - if (file_rdev && (st_buf.st_dev != file_rdev)) - return 0; - if (hasmntopt(mnt, MNTOPT_RO)) - *ro_mount = 1; - return 1; /* mounted */ -} - /* Returns 0 if fd1 and fd2 refer to the same device/file, 1 otherwise, or -1 on error */ static int fdcmp(int fd1, int fd2) {
cluster-commits@lists.fedorahosted.org