From 6e1d3dbacf699ed29af040be7d89e7ed7ed9b9a1 Mon Sep 17 00:00:00 2001 From: nfshp Date: Tue, 17 Dec 2002 13:19:24 +0000 Subject: [PATCH] merge HEAD to b_io branch. (seems quite a large changes from b_md and b_recover) --- lustre/mds/lproc_mds.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/lustre/mds/lproc_mds.c b/lustre/mds/lproc_mds.c index 0fc96bd..7028603 100644 --- a/lustre/mds/lproc_mds.c +++ b/lustre/mds/lproc_mds.c @@ -22,6 +22,7 @@ #define DEBUG_SUBSYSTEM S_CLASS #include +#include #include int rd_uuid(char* page, char **start, off_t off, int count, int *eof, @@ -103,15 +104,12 @@ int rd_kbfree(char* page, char **start, off_t off, int count, int *eof, } -int rd_fstype(char* page, char **start, off_t off, int count, int *eof, +int rd_fstype(char *page, char **start, off_t off, int count, int *eof, void *data) -{ - struct obd_device* temp = (struct obd_device*)data; - struct mds_obd *mds = &temp->u.mds; - int len = 0; - len += snprintf(page, count, "%s\n", mds->mds_fstype); - return len; - +{ + struct obd_device *obd = (struct obd_device *)data; + + return snprintf(page, count, "%s\n", obd->obd_fsops->fs_type); } int rd_filestotal(char* page, char **start, off_t off, int count, int *eof, -- 1.8.3.1