#define DEBUG_SUBSYSTEM S_CLASS
-#define EXPORT_SYMTAB
+#ifndef EXPORT_SYMTAB
+# define EXPORT_SYMTAB
+#endif
+#ifndef __KERNEL__
+#include <liblustre.h>
+#else
+#include <linux/version.h>
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0))
+#include <linux/statfs.h>
+#endif
+#endif
+
+#include <linux/lustre_export.h>
#include <linux/lustre_net.h>
#include <linux/obd_support.h>
#include <linux/obd_class.h>
-void obd_statfs_pack(struct obd_statfs *tgt, struct obd_statfs *src)
-{
- tgt->os_type = HTON__u64(src->os_type);
- tgt->os_blocks = HTON__u64(src->os_blocks);
- tgt->os_bfree = HTON__u64(src->os_bfree);
- tgt->os_bavail = HTON__u64(src->os_bavail);
- tgt->os_files = HTON__u64(src->os_files);
- tgt->os_ffree = HTON__u64(src->os_ffree);
- tgt->os_bsize = HTON__u32(src->os_bsize);
- tgt->os_namelen = HTON__u32(src->os_namelen);
-}
-
-void obd_statfs_unpack(struct obd_statfs *tgt, struct obd_statfs *src)
-{
- obd_statfs_pack(tgt, src);
-}
-
-void statfs_pack(struct obd_statfs *osfs, struct statfs *sfs)
+void statfs_pack(struct obd_statfs *osfs, struct kstatfs *sfs)
{
+ memset(osfs, 0, sizeof(*osfs));
osfs->os_type = sfs->f_type;
osfs->os_blocks = sfs->f_blocks;
osfs->os_bfree = sfs->f_bfree;
osfs->os_namelen = sfs->f_namelen;
}
-void statfs_unpack(struct statfs *sfs, struct obd_statfs *osfs)
+void statfs_unpack(struct kstatfs *sfs, struct obd_statfs *osfs)
{
+ memset(sfs, 0, sizeof(*sfs));
sfs->f_type = osfs->os_type;
sfs->f_blocks = osfs->os_blocks;
sfs->f_bfree = osfs->os_bfree;
sfs->f_namelen = osfs->os_namelen;
}
-int obd_self_statfs(struct obd_device *obd, struct statfs *sfs)
-{
- struct lustre_handle conn;
- struct obd_export *export, *my_export = NULL;
- struct obd_statfs osfs = { 0 };
- int rc;
- ENTRY;
-
- if (list_empty(&obd->obd_exports)) {
- export = my_export = class_new_export(obd);
- if (export == NULL)
- RETURN(-ENOMEM);
- } else
- export = list_entry(obd->obd_exports.next, typeof(*export),
- exp_obd_chain);
- conn.addr = (unsigned long)export;
- conn.cookie = export->exp_cookie;
-
- rc = obd_statfs(&conn, &osfs);
- if (!rc)
- statfs_unpack(sfs, &osfs);
-
- if (my_export)
- class_destroy_export(my_export);
- RETURN(rc);
-}
-
-EXPORT_SYMBOL(obd_statfs_pack);
-EXPORT_SYMBOL(obd_statfs_unpack);
EXPORT_SYMBOL(statfs_pack);
EXPORT_SYMBOL(statfs_unpack);
-EXPORT_SYMBOL(obd_self_statfs);