X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fobdclass%2Fstatfs_pack.c;h=9c52f8094e9feb1ddfc3b2d5a294b43bd0c2c3df;hb=cda353e6efae5013a26aedbe49d8aa6fb8fe456e;hp=8e20f850a4fa7e84eaccf3843694b3f64c2ed4bb;hpb=113303973ec9f8484eb2355a1a6ef3c4c7fd6a56;p=fs%2Flustre-release.git

diff --git a/lustre/obdclass/statfs_pack.c b/lustre/obdclass/statfs_pack.c
index 8e20f85..9c52f80 100644
--- a/lustre/obdclass/statfs_pack.c
+++ b/lustre/obdclass/statfs_pack.c
@@ -1,40 +1,44 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
+/*
+ * GPL HEADER START
  *
- *  Copyright (C) 2002, 2003 Cluster File Systems, Inc.
- *   Author: Andreas Dilger <adilger@clusterfs.com>
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *   This file is part of the Lustre file system, http://www.lustre.org
- *   Lustre is a trademark of Cluster File Systems, Inc.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 only,
+ * as published by the Free Software Foundation.
  *
- *   You may have signed or agreed to another license before downloading
- *   this software.  If so, you are bound by the terms and conditions
- *   of that agreement, and the following does not apply to you.  See the
- *   LICENSE file included with this distribution for more information.
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License version 2 for more details (a copy is included
+ * in the LICENSE file that accompanied this code).
  *
- *   If you did not agree to a different license, then this copy of Lustre
- *   is open source software; you can redistribute it and/or modify it
- *   under the terms of version 2 of the GNU General Public License as
- *   published by the Free Software Foundation.
+ * You should have received a copy of the GNU General Public License
+ * version 2 along with this program; If not, see
+ * http://www.gnu.org/licenses/gpl-2.0.html
  *
- *   In either case, Lustre is distributed in the hope that it will be
- *   useful, but WITHOUT ANY WARRANTY; without even the implied warranty
- *   of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   license text for more details.
+ * 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/
+ * Lustre is a trademark of Sun Microsystems, Inc.
+ *
+ * lustre/obdclass/statfs_pack.c
  *
  * (Un)packing of OST/MDS requests
  *
+ * Author: Andreas Dilger <adilger@clusterfs.com>
  */
 
 #define DEBUG_SUBSYSTEM S_CLASS
 
-#ifndef EXPORT_SYMTAB
-# define EXPORT_SYMTAB
-#endif
-#ifndef __KERNEL__
-#include <liblustre.h>
-#endif
-
+#include <linux/statfs.h>
 #include <lustre_export.h>
 #include <lustre_net.h>
 #include <obd_support.h>
@@ -42,29 +46,28 @@
 
 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_bavail = sfs->f_bavail;
-        osfs->os_files = sfs->f_files;
-        osfs->os_ffree = sfs->f_ffree;
-        osfs->os_bsize = sfs->f_bsize;
-        osfs->os_namelen = sfs->f_namelen;
+	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_bavail = sfs->f_bavail;
+	osfs->os_files = sfs->f_files;
+	osfs->os_ffree = sfs->f_ffree;
+	osfs->os_bsize = sfs->f_bsize;
+	osfs->os_namelen = sfs->f_namelen;
 }
+EXPORT_SYMBOL(statfs_pack);
 
 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_bavail = osfs->os_bavail;
-        sfs->f_files = osfs->os_files;
-        sfs->f_ffree = osfs->os_ffree;
-        sfs->f_bsize = osfs->os_bsize;
-        sfs->f_namelen = osfs->os_namelen;
+	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_bavail = osfs->os_bavail;
+	sfs->f_files = osfs->os_files;
+	sfs->f_ffree = osfs->os_ffree;
+	sfs->f_bsize = osfs->os_bsize;
+	sfs->f_namelen = osfs->os_namelen;
 }
-
-EXPORT_SYMBOL(statfs_pack);
 EXPORT_SYMBOL(statfs_unpack);