#include <linux/lustre_dlm.h>
#include <linux/init.h>
#include <linux/fs.h>
+#include <linux/lprocfs_status.h>
+
#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
kmem_cache_t *ll_file_data_slab;
extern int ll_commitcbd_setup(struct ll_sb_info *);
extern int ll_commitcbd_cleanup(struct ll_sb_info *);
+extern int rd_dev_uuid(char* page, char **start, off_t off,
+ int count, int *eof, void *data);
+
+extern int rd_dev_name(char* page, char **start, off_t off,
+ int count, int *eof, void *data);
+
+
+extern lprocfs_vars_t status_var_nm_1[];
+
static char *ll_read_opt(const char *opt, char *data)
{
char *value;
int err;
struct ll_fid rootfid;
struct obd_statfs osfs;
- __u64 last_committed;
- __u64 last_xid;
struct ptlrpc_request *request = NULL;
struct ptlrpc_connection *mdc_conn;
struct ll_read_inode2_cookie lic;
class_uuid_t uuid;
+
+ /* Lprocfs variables */
+ char mnt_name[100];
+ char uuid_name[100];
+ lprocfs_vars_t d_vars[3];
+
+
+
ENTRY;
MOD_INC_USE_COUNT;
GOTO(out_mdc, sb = NULL);
}
- /* XXX: need to store the last_* values somewhere */
- err = mdc_getstatus(&sbi->ll_mdc_conn, &rootfid, &last_committed,
- &last_xid, &request);
- ptlrpc_req_finished(request);
+ err = mdc_getstatus(&sbi->ll_mdc_conn, &rootfid);
if (err) {
CERROR("cannot mds_connect: rc = %d\n", err);
GOTO(out_mdc, sb = NULL);
}
- CDEBUG(D_SUPER, "rootfid %Ld\n", (unsigned long long)rootfid.id);
+ CDEBUG(D_SUPER, "rootfid "LPU64"\n", rootfid.id);
sbi->ll_rootino = rootfid.id;
memset(&osfs, 0, sizeof(osfs));
- request = NULL;
- err = mdc_statfs(&sbi->ll_mdc_conn, &osfs, &request);
- ptlrpc_req_finished(request);
+ err = obd_statfs(&sbi->ll_mdc_conn, &osfs);
sb->s_blocksize = osfs.os_bsize;
sb->s_blocksize_bits = log2(osfs.os_bsize);
sb->s_magic = LL_SUPER_MAGIC;
sb->s_op = &ll_super_operations;
/* make root inode */
- request = NULL;
err = mdc_getattr(&sbi->ll_mdc_conn, sbi->ll_rootino, S_IFDIR,
OBD_MD_FLNOTOBD|OBD_MD_FLBLOCKS, 0, &request);
if (err) {
}
ptlrpc_req_finished(request);
+ request = NULL;
+
+
+ /* Register this mount instance with LProcFS */
+
+ snprintf(mnt_name, 100, "mount_%s", sbi->ll_sb_uuid);
+ sbi->ll_mnt_root=lprocfs_reg_mnt(mnt_name);
+ if(!sbi->ll_mnt_root)
+ goto out_dev;
+
+ /* Add the static configuration info */
+ lprocfs_add_vars(sbi->ll_mnt_root, (lprocfs_vars_t*)status_var_nm_1,
+ (void*)sb);
+ /* Add the dynamic configuration stuff */
+ /* MDC */
+ obd = class_uuid2obd(mdc);
+
+ /* Reuse mnt_name */
+
+ sprintf(mnt_name, "status/%s/common_name", obd->obd_type->typ_name);
+
+ memset(d_vars, 0, sizeof(d_vars));
+ d_vars[0].read_fptr=rd_dev_name;
+ d_vars[0].write_fptr=0;
+ d_vars[0].name=(char*)mnt_name;
+
+ memset(uuid_name, '\0', strlen(uuid_name));
+ sprintf(uuid_name, "status/%s/uuid", obd->obd_type->typ_name);
+ d_vars[1].read_fptr=rd_dev_uuid;
+ d_vars[1].write_fptr=0;
+ d_vars[1].name=(char*)uuid_name;
+
+ err=lprocfs_add_vars(sbi->ll_mnt_root, (lprocfs_vars_t*)d_vars,
+ (void*)obd);
+ if (err) {
+ CDEBUG(D_OTHER, "Unable to add fs proc dynamic variables");
+ }
+
+ /* OSC or LOV*/
+ obd = class_uuid2obd(osc);
+ /* Reuse mnt_name */
+ memset(mnt_name, '\0', strlen(mnt_name));
+ sprintf(mnt_name, "status/%s/common_name", obd->obd_type->typ_name);
+
+ memset(d_vars, 0, sizeof(d_vars));
+ d_vars[0].read_fptr=rd_dev_name;
+ d_vars[0].write_fptr=0;
+ d_vars[0].name=(char*)mnt_name;
+
+ memset(uuid_name, '\0', strlen(uuid_name));
+ sprintf(uuid_name, "status/%s/uuid", obd->obd_type->typ_name);
+ d_vars[1].read_fptr=rd_dev_uuid;
+ d_vars[1].write_fptr=0;
+ d_vars[1].name=(char*)uuid_name;
+
+ err=lprocfs_add_vars(sbi->ll_mnt_root, (lprocfs_vars_t*)d_vars,
+ (void*)obd);
+ if (err) {
+ CDEBUG(D_OTHER, "Unable to add fs proc dynamic variables");
+ }
out_dev:
if (mdc)
OBD_FREE(mdc, strlen(mdc) + 1);
static void ll_put_super(struct super_block *sb)
{
struct ll_sb_info *sbi = ll_s2sbi(sb);
-
+ struct ll_fid rootfid;
ENTRY;
+
list_del(&sbi->ll_conn_chain);
ll_commitcbd_cleanup(sbi);
obd_disconnect(&sbi->ll_osc_conn);
+
+ /* NULL request to force sync on the MDS, and get the last_committed
+ * value to flush remaining RPCs from the sending queue on client.
+ *
+ * XXX This should be an mdc_sync() call to sync the whole MDS fs,
+ * which we can call for other reasons as well.
+ */
+ mdc_getstatus(&sbi->ll_mdc_conn, &rootfid);
+
+ lprocfs_dereg_mnt(sbi->ll_mnt_root);
obd_disconnect(&sbi->ll_mdc_conn);
OBD_FREE(sbi, sizeof(*sbi));
static int ll_statfs(struct super_block *sb, struct statfs *sfs)
{
- struct ptlrpc_request *request = NULL;
struct ll_sb_info *sbi = ll_s2sbi(sb);
struct obd_statfs osfs;
int rc;
ENTRY;
memset(sfs, 0, sizeof(*sfs));
- rc = mdc_statfs(&sbi->ll_mdc_conn, &osfs, &request);
+ rc = obd_statfs(&sbi->ll_mdc_conn, &osfs);
statfs_unpack(sfs, &osfs);
- ptlrpc_req_finished(request);
if (rc)
CERROR("mdc_statfs fails: rc = %d\n", rc);
else
git://git.whamcloud.com / fs / lustre-release.git / blobdiff