LU-1735 ptlrpc: only set jobid if not already set

[fs/lustre-release.git] / lustre / obdclass / statfs_pack.c

diff --git a/lustre/obdclass/statfs_pack.c b/lustre/obdclass/statfs_pack.c
index 6196380..673eade 100644 (file)
--- a/lustre/obdclass/statfs_pack.c
+++ b/lustre/obdclass/statfs_pack.c
@@ -1,6 +1,4 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
+/*
  * GPL HEADER START
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -26,7 +24,7 @@
  * GPL HEADER END
  */
 /*
- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  */
 /*
@@ -42,9 +40,6 @@
 
 #define DEBUG_SUBSYSTEM S_CLASS
 
-#ifndef EXPORT_SYMTAB
-# define EXPORT_SYMTAB
-#endif
 #ifndef __KERNEL__
 #include <liblustre.h>
 #endif
@@ -54,7 +49,7 @@
 #include <obd_support.h>
 #include <obd_class.h>
 
-void statfs_pack(struct obd_statfs *osfs, struct kstatfs *sfs)
+void statfs_pack(struct obd_statfs *osfs, cfs_kstatfs_t *sfs)
 {
         memset(osfs, 0, sizeof(*osfs));
         osfs->os_type = sfs->f_type;
@@ -66,8 +61,9 @@ void statfs_pack(struct obd_statfs *osfs, struct kstatfs *sfs)
         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)
+void statfs_unpack(cfs_kstatfs_t *sfs, struct obd_statfs *osfs)
 {
         memset(sfs, 0, sizeof(*sfs));
         sfs->f_type = osfs->os_type;
@@ -79,6 +75,4 @@ void statfs_unpack(struct kstatfs *sfs, struct obd_statfs *osfs)
         sfs->f_bsize = osfs->os_bsize;
         sfs->f_namelen = osfs->os_namelen;
 }
-
-EXPORT_SYMBOL(statfs_pack);
 EXPORT_SYMBOL(statfs_unpack);