Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-8288 lfsck: handle dangling LOV EA reference
[fs/lustre-release.git]
/
lustre
/
obdclass
/
statfs_pack.c
diff --git
a/lustre/obdclass/statfs_pack.c
b/lustre/obdclass/statfs_pack.c
index
eb3ed10
..
2a36051
100644
(file)
--- a/
lustre/obdclass/statfs_pack.c
+++ b/
lustre/obdclass/statfs_pack.c
@@
-15,17
+15,15
@@
*
* You should have received a copy of the GNU General Public License
* version 2 along with this program; If not, see
*
* You should have received a copy of the GNU General Public License
* version 2 along with this program; If not, see
- * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * http://www.gnu.org/licenses/gpl-2.0.html
*
* GPL HEADER END
*/
/*
* Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*
* GPL HEADER END
*/
/*
* Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
+ *
+ * Copyright (c) 2014, Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
*/
/*
* This file is part of Lustre, http://www.lustre.org/
@@
-40,16
+38,13
@@
#define DEBUG_SUBSYSTEM S_CLASS
#define DEBUG_SUBSYSTEM S_CLASS
-#ifndef __KERNEL__
-#include <liblustre.h>
-#endif
-
+#include <linux/statfs.h>
#include <lustre_export.h>
#include <lustre_net.h>
#include <obd_support.h>
#include <obd_class.h>
#include <lustre_export.h>
#include <lustre_net.h>
#include <obd_support.h>
#include <obd_class.h>
-void statfs_pack(struct obd_statfs *osfs,
cfs_kstatfs_t
*sfs)
+void statfs_pack(struct obd_statfs *osfs,
struct kstatfs
*sfs)
{
memset(osfs, 0, sizeof(*osfs));
osfs->os_type = sfs->f_type;
{
memset(osfs, 0, sizeof(*osfs));
osfs->os_type = sfs->f_type;
@@
-61,8
+56,9
@@
void statfs_pack(struct obd_statfs *osfs, cfs_kstatfs_t *sfs)
osfs->os_bsize = sfs->f_bsize;
osfs->os_namelen = sfs->f_namelen;
}
osfs->os_bsize = sfs->f_bsize;
osfs->os_namelen = sfs->f_namelen;
}
+EXPORT_SYMBOL(statfs_pack);
-void statfs_unpack(
cfs_kstatfs_t
*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;
{
memset(sfs, 0, sizeof(*sfs));
sfs->f_type = osfs->os_type;
@@
-74,6
+70,4
@@
void statfs_unpack(cfs_kstatfs_t *sfs, struct obd_statfs *osfs)
sfs->f_bsize = osfs->os_bsize;
sfs->f_namelen = osfs->os_namelen;
}
sfs->f_bsize = osfs->os_bsize;
sfs->f_namelen = osfs->os_namelen;
}
-
-EXPORT_SYMBOL(statfs_pack);
EXPORT_SYMBOL(statfs_unpack);
EXPORT_SYMBOL(statfs_unpack);