LU-4423 ptlrpc: use 64-bit time for debugfs import state output

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

diff --git a/lustre/obdclass/llog_ioctl.c b/lustre/obdclass/llog_ioctl.c
index 3391618..da71aa8 100644 (file)
--- a/lustre/obdclass/llog_ioctl.c
+++ b/lustre/obdclass/llog_ioctl.c
@@ -15,11 +15,7 @@
  *
  * 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
  */
@@ -27,7 +23,7 @@
  * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2011, 2013, Intel Corporation.
+ * Copyright (c) 2011, 2014, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -37,6 +33,7 @@
 #define DEBUG_SUBSYSTEM S_LOG
 
 #include <obd_class.h>
+#include <lustre_ioctl.h>
 #include <lustre_log.h>
 #include "llog_internal.h"
 
@@ -429,7 +426,8 @@ out_close:
 EXPORT_SYMBOL(llog_ioctl);
 
 int llog_catalog_list(const struct lu_env *env, struct dt_device *d,
-                     int count, struct obd_ioctl_data *data)
+                     int count, struct obd_ioctl_data *data,
+                     const struct lu_fid *fid)
 {
        int                      size, i;
        struct llog_catid       *idarray;
@@ -440,7 +438,7 @@ int llog_catalog_list(const struct lu_env *env, struct dt_device *d,
        ENTRY;
 
        if (count == 0) { /* get total number of logs */
-               rc = llog_osd_get_cat_list(env, d, 0, 0, NULL);
+               rc = llog_osd_get_cat_list(env, d, 0, 0, NULL, fid);
                if (rc < 0)
                        RETURN(rc);
                count = rc;
@@ -452,7 +450,7 @@ int llog_catalog_list(const struct lu_env *env, struct dt_device *d,
        if (!idarray)
                RETURN(-ENOMEM);
 
-       rc = llog_osd_get_cat_list(env, d, 0, count, idarray);
+       rc = llog_osd_get_cat_list(env, d, 0, count, idarray, fid);
        if (rc)
                GOTO(out, rc);