about summary refs log tree commit homepage
diff options
context:
space:
mode:
authorEric Wong <normalperson@yhbt.net>2013-02-07 19:50:49 +0000
committerEric Wong <normalperson@yhbt.net>2013-02-07 19:50:49 +0000
commit315487f70c90b117aa4e9d63bbb21abae8af80ab (patch)
tree606e77c7f9f3d5c32f4666a8de0a7755386b45e3
parentc3550946c61a43cad54f1aa7c0f0f062a451042f (diff)
downloadcmogstored-315487f70c90b117aa4e9d63bbb21abae8af80ab.tar.gz
It should be clearer this code is only called from inside
mnt.c and not fs.c (the latter is for general filesystem
operations, not operations on a mount point).
-rw-r--r--Makefile.am2
-rw-r--r--mnt.c2
-rw-r--r--mnt.h4
-rw-r--r--mnt_usable.c (renamed from fs_usable.c)2
4 files changed, 5 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am
index e1eb2fa..557ecca 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -38,7 +38,6 @@ mog_src += fdmap.h
 mog_src += file.c
 mog_src += fs.c
 mog_src += fs.h
-mog_src += fs_usable.c
 mog_src += fsck_queue.c
 mog_src += gcc.h
 mog_src += http.c
@@ -65,6 +64,7 @@ mog_src += mgmt_fn.c
 mog_src += mkpath_for.c
 mog_src += mnt.c
 mog_src += mnt.h
+mog_src += mnt_usable.c
 mog_src += nostd/setproctitle.h
 mog_src += notify.c
 mog_src += notify.h
diff --git a/mnt.c b/mnt.c
index 8291ff2..e5c3244 100644
--- a/mnt.c
+++ b/mnt.c
@@ -100,7 +100,7 @@ static void mnt_populate(Hash_table *tbl)
 
                 if (head->me_dummy)
                         goto skip;
-                if (!mog_fs_usable(head->me_mountdir))
+                if (!mog_mnt_usable(head->me_mountdir))
                         goto skip;
 
                 /* the device number may not have been populated, do it */
diff --git a/mnt.h b/mnt.h
index aec6040..6310fd9 100644
--- a/mnt.h
+++ b/mnt.h
@@ -8,5 +8,5 @@ void mog_mnt_release(const struct mount_entry *);
 void mog_mnt_update_util(struct mog_iostat *);
 char *mog_mnt_fetch_util(dev_t st_dev, char dst[MOG_IOUTIL_LEN]);
 
-/* fs_usable.c */
-bool mog_fs_usable(const char *path);
+/* mnt_usable.c */
+bool mog_mnt_usable(const char *path);
diff --git a/fs_usable.c b/mnt_usable.c
index e1c5550..1d590b1 100644
--- a/fs_usable.c
+++ b/mnt_usable.c
@@ -20,7 +20,7 @@
  * prevents us from using filesystems of unknown size, since those could
  * be stalled/dead network mounts
  */
-bool mog_fs_usable(const char *path)
+bool mog_mnt_usable(const char *path)
 {
         struct MY_STATFS buf;