Update patches

Package-Manager: portage-2.2.8-r1
RepoMan-Options: --force

13 files changed, 184 insertions, 132 deletions

diff --git a/sys-cluster/lustre/ChangeLog b/sys-cluster/lustre/ChangeLog
index 9fefa38ac..73299e5ea 100644
--- a/sys-cluster/lustre/ChangeLog
+++ b/sys-cluster/lustre/ChangeLog
@@ -2,6 +2,21 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  27 Feb 2014; Alexey Shvetsov <alexxy@gentoo.org>
+  files/0001-LU-2982-build-make-AC-check-for-linux-arch-sandbox-f.patch,
+  files/0002-LU-3319-procfs-update-zfs-proc-handling-to-seq_files.patch,
+  files/0003-LU-3319-procfs-move-mgs-proc-handling-to-seq_files.patch,
+  files/0004-LU-3319-procfs-fix-symlink-handling.patch,
+  files/0005-LU-3319-procfs-move-osp-proc-handling-to-seq_files.patch,
+  files/0006-LU-3319-procfs-move-lod-proc-handling-to-seq_files.patch,
+  files/0007-LU-3319-procfs-move-mdd-ofd-proc-handling-to-seq_fil.patch,
+  files/0008-LU-3319-procfs-move-mdt-mds-proc-handling-to-seq_fil.patch,
+  files/0009-LU-3319-procfs-update-ldiskfs-proc-handling-to-seq_f.patch,
+  files/0010-LU-3319-lprocfs-client-side-cleanups.patch,
+  files/0011-LU-3974-llite-use-new-struct-dir_context.patch,
+  files/0012-LU-3974-llite-invalidatepage-api-changed.patch:
+  Update patches
+
   12 Feb 2014; Alexey Shvetsov <alexxy@gentoo.org>
   files/0011-LU-3974-llite-use-new-struct-dir_context.patch,
   files/0012-LU-3974-llite-invalidatepage-api-changed.patch:
diff --git a/sys-cluster/lustre/files/0001-LU-2982-build-make-AC-check-for-linux-arch-sandbox-f.patch b/sys-cluster/lustre/files/0001-LU-2982-build-make-AC-check-for-linux-arch-sandbox-f.patch
index caa6587f5..63fcb0af9 100644
--- a/sys-cluster/lustre/files/0001-LU-2982-build-make-AC-check-for-linux-arch-sandbox-f.patch
+++ b/sys-cluster/lustre/files/0001-LU-2982-build-make-AC-check-for-linux-arch-sandbox-f.patch
@@ -1,4 +1,4 @@
-From 247c87f4a981fd26bfaf219930193b1a35865736 Mon Sep 17 00:00:00 2001
+From f384f155612fb8b3fa6a12c4c969e29629f82027 Mon Sep 17 00:00:00 2001
 From: Alexey Shvetsov <alexxy@gentoo.org>
 Date: Mon, 18 Mar 2013 16:22:27 +0400
 Subject: [PATCH 01/12] LU-2982 build: make AC check for linux arch sandbox
diff --git a/sys-cluster/lustre/files/0002-LU-3319-procfs-update-zfs-proc-handling-to-seq_files.patch b/sys-cluster/lustre/files/0002-LU-3319-procfs-update-zfs-proc-handling-to-seq_files.patch
index 939f1fcc1..ff3c6bf44 100644
--- a/sys-cluster/lustre/files/0002-LU-3319-procfs-update-zfs-proc-handling-to-seq_files.patch
+++ b/sys-cluster/lustre/files/0002-LU-3319-procfs-update-zfs-proc-handling-to-seq_files.patch
@@ -1,4 +1,4 @@
-From c05c0be01814527d8d3762963c7a6d4c28189d2d Mon Sep 17 00:00:00 2001
+From 699242b35f07c7c64959dca02cc359d389c7f568 Mon Sep 17 00:00:00 2001
 From: James Simmons <uja.ornl@gmail.com>
 Date: Fri, 3 Jan 2014 09:55:26 -0500
 Subject: [PATCH 02/12] LU-3319 procfs: update zfs proc handling to seq_files
@@ -14,10 +14,10 @@ Change-Id: I6dc7e65c3e74e7934a17939815ec3c334fac58c7
  3 files changed, 57 insertions(+), 47 deletions(-)
 
 diff --git a/lustre/osd-zfs/osd_handler.c b/lustre/osd-zfs/osd_handler.c
-index d4193cd..36bf6a4 100644
+index 1025be9..c9bf49a 100644
 --- a/lustre/osd-zfs/osd_handler.c
 +++ b/lustre/osd-zfs/osd_handler.c
-@@ -745,6 +745,7 @@ static int osd_device_init(const struct lu_env *env, struct lu_device *d,
+@@ -748,6 +748,7 @@ static int osd_device_init(const struct lu_env *env, struct lu_device *d,
  static int osd_process_config(const struct lu_env *env,
  			      struct lu_device *d, struct lustre_cfg *cfg)
  {
@@ -25,7 +25,7 @@ index d4193cd..36bf6a4 100644
  	struct osd_device	*o = osd_dev(d);
  	int			rc;
  	ENTRY;
-@@ -758,12 +759,12 @@ static int osd_process_config(const struct lu_env *env,
+@@ -761,12 +762,12 @@ static int osd_process_config(const struct lu_env *env,
  		break;
  	case LCFG_PARAM: {
  		LASSERT(&o->od_dt_dev);
@@ -43,7 +43,7 @@ index d4193cd..36bf6a4 100644
  		break;
  	}
  	default:
-@@ -911,7 +912,7 @@ int __init osd_init(void)
+@@ -914,7 +915,7 @@ int __init osd_init(void)
  
  	rc = class_register_type(&osd_obd_device_ops, NULL, NULL,
  #ifndef HAVE_ONLY_PROCFS_SEQ
diff --git a/sys-cluster/lustre/files/0003-LU-3319-procfs-move-mgs-proc-handling-to-seq_files.patch b/sys-cluster/lustre/files/0003-LU-3319-procfs-move-mgs-proc-handling-to-seq_files.patch
index 756975ee9..38785b257 100644
--- a/sys-cluster/lustre/files/0003-LU-3319-procfs-move-mgs-proc-handling-to-seq_files.patch
+++ b/sys-cluster/lustre/files/0003-LU-3319-procfs-move-mgs-proc-handling-to-seq_files.patch
@@ -1,4 +1,4 @@
-From b262846027fbf96a5a80b81cfe86da53ce6e6f9f Mon Sep 17 00:00:00 2001
+From 44eb91a37b43a71a0d531359c9da082b6e1ec454 Mon Sep 17 00:00:00 2001
 From: James Simmons <uja.ornl@gmail.com>
 Date: Fri, 3 Jan 2014 09:58:53 -0500
 Subject: [PATCH 03/12] LU-3319 procfs: move mgs proc handling to seq_files
diff --git a/sys-cluster/lustre/files/0004-LU-3319-procfs-fix-symlink-handling.patch b/sys-cluster/lustre/files/0004-LU-3319-procfs-fix-symlink-handling.patch
index fc78c68c8..935325e9c 100644
--- a/sys-cluster/lustre/files/0004-LU-3319-procfs-fix-symlink-handling.patch
+++ b/sys-cluster/lustre/files/0004-LU-3319-procfs-fix-symlink-handling.patch
@@ -1,4 +1,4 @@
-From 8f24a0e29b5f4b18193742c9aecd960c6b6102ff Mon Sep 17 00:00:00 2001
+From 4bc21601224ea84152d9c3cc83eee33af8eb8cb2 Mon Sep 17 00:00:00 2001
 From: James Simmons <uja.ornl@gmail.com>
 Date: Sun, 9 Feb 2014 09:37:44 -0500
 Subject: [PATCH 04/12] LU-3319 procfs: fix symlink handling
@@ -24,7 +24,7 @@ Signed-off-by: James Simmons <uja.ornl@gmail.com>
  4 files changed, 91 insertions(+), 90 deletions(-)
 
 diff --git a/lustre/include/obd.h b/lustre/include/obd.h
-index c18052b..8fd2ce7 100644
+index ac80412..42266da 100644
 --- a/lustre/include/obd.h
 +++ b/lustre/include/obd.h
 @@ -183,13 +183,15 @@ struct obd_info {
@@ -59,10 +59,10 @@ index c18052b..8fd2ce7 100644
  	struct lprocfs_stats	*obd_svc_stats;
  	struct lprocfs_seq_vars	*obd_vars;
 diff --git a/lustre/lmv/lmv_obd.c b/lustre/lmv/lmv_obd.c
-index e0941c9..93db311 100644
+index ee5f3a7..66a9448 100644
 --- a/lustre/lmv/lmv_obd.c
 +++ b/lustre/lmv/lmv_obd.c
-@@ -242,9 +242,6 @@ static int lmv_connect(const struct lu_env *env,
+@@ -263,9 +263,6 @@ static int lmv_connect(const struct lu_env *env,
                         struct obd_uuid *cluuid, struct obd_connect_data *data,
                         void *localdata)
  {
@@ -72,7 +72,7 @@ index e0941c9..93db311 100644
          struct lmv_obd        *lmv = &obd->u.lmv;
          struct lustre_handle  conn = { 0 };
          int                    rc = 0;
-@@ -277,18 +274,15 @@ static int lmv_connect(const struct lu_env *env,
+@@ -298,18 +295,15 @@ static int lmv_connect(const struct lu_env *env,
                  lmv->conn_data = *data;
  
  #ifdef __KERNEL__
@@ -97,7 +97,7 @@ index e0941c9..93db311 100644
  	}
  #endif
  
-@@ -302,10 +296,8 @@ static int lmv_connect(const struct lu_env *env,
+@@ -323,10 +317,8 @@ static int lmv_connect(const struct lu_env *env,
                  rc = lmv_check_connect(obd);
  
  #ifdef __KERNEL__
@@ -110,7 +110,7 @@ index e0941c9..93db311 100644
  #endif
          RETURN(rc);
  }
-@@ -384,9 +376,6 @@ static int lmv_init_ea_size(struct obd_export *exp, int easize,
+@@ -405,9 +397,6 @@ static int lmv_init_ea_size(struct obd_export *exp, int easize,
  
  int lmv_connect_mdc(struct obd_device *obd, struct lmv_tgt_desc *tgt)
  {
@@ -120,7 +120,7 @@ index e0941c9..93db311 100644
          struct lmv_obd          *lmv = &obd->u.lmv;
          struct obd_uuid         *cluuid = &lmv->cluuid;
          struct obd_uuid          lmv_mdc_uuid = { "LMV_MDC_UUID" };
-@@ -466,14 +455,13 @@ int lmv_connect_mdc(struct obd_device *obd, struct lmv_tgt_desc *tgt)
+@@ -487,14 +476,13 @@ int lmv_connect_mdc(struct obd_device *obd, struct lmv_tgt_desc *tgt)
                  cfs_atomic_read(&obd->obd_refcount));
  
  #ifdef __KERNEL__
@@ -137,7 +137,7 @@ index e0941c9..93db311 100644
  						  "../../../%s/%s",
  						  mdc_obd->obd_type->typ_name,
  						  mdc_obd->obd_name);
-@@ -482,8 +470,7 @@ int lmv_connect_mdc(struct obd_device *obd, struct lmv_tgt_desc *tgt)
+@@ -503,8 +491,7 @@ int lmv_connect_mdc(struct obd_device *obd, struct lmv_tgt_desc *tgt)
  			       "/proc/fs/lustre/%s/%s/target_obds/%s.",
  			       obd->obd_type->typ_name, obd->obd_name,
  			       mdc_obd->obd_name);
@@ -147,7 +147,7 @@ index e0941c9..93db311 100644
  		}
  	}
  #endif
-@@ -675,9 +662,6 @@ int lmv_check_connect(struct obd_device *obd)
+@@ -696,9 +683,6 @@ int lmv_check_connect(struct obd_device *obd)
  
  static int lmv_disconnect_mdc(struct obd_device *obd, struct lmv_tgt_desc *tgt)
  {
@@ -157,7 +157,7 @@ index e0941c9..93db311 100644
          struct lmv_obd         *lmv = &obd->u.lmv;
          struct obd_device      *mdc_obd;
          int                     rc;
-@@ -695,9 +679,9 @@ static int lmv_disconnect_mdc(struct obd_device *obd, struct lmv_tgt_desc *tgt)
+@@ -716,9 +700,9 @@ static int lmv_disconnect_mdc(struct obd_device *obd, struct lmv_tgt_desc *tgt)
          }
  
  #ifdef __KERNEL__
@@ -170,7 +170,7 @@ index e0941c9..93db311 100644
  #endif
  	rc = obd_fid_fini(tgt->ltd_exp->exp_obd);
  	if (rc)
-@@ -747,8 +731,8 @@ static int lmv_disconnect(struct obd_export *exp)
+@@ -768,8 +752,8 @@ static int lmv_disconnect(struct obd_export *exp)
          }
  
  #ifdef __KERNEL__
@@ -331,7 +331,7 @@ index 286cd15..a3310fd 100644
          rc = class_disconnect(exp); /* bz 9811 */
          RETURN(rc);
 diff --git a/lustre/obdclass/genops.c b/lustre/obdclass/genops.c
-index c9d8a4e..a4a981c 100644
+index 20cd0a0..00bf342 100644
 --- a/lustre/obdclass/genops.c
 +++ b/lustre/obdclass/genops.c
 @@ -181,14 +181,15 @@ int class_register_type(struct obd_ops *dt_ops, struct md_ops *md_ops,
diff --git a/sys-cluster/lustre/files/0005-LU-3319-procfs-move-osp-proc-handling-to-seq_files.patch b/sys-cluster/lustre/files/0005-LU-3319-procfs-move-osp-proc-handling-to-seq_files.patch
index 7734600ca..2d5a97490 100644
--- a/sys-cluster/lustre/files/0005-LU-3319-procfs-move-osp-proc-handling-to-seq_files.patch
+++ b/sys-cluster/lustre/files/0005-LU-3319-procfs-move-osp-proc-handling-to-seq_files.patch
@@ -1,4 +1,4 @@
-From cfafe91ff9caf648f144c1a162112b7d1485aae4 Mon Sep 17 00:00:00 2001
+From e9786df9c5618c2cff7d81088548fefee874468a Mon Sep 17 00:00:00 2001
 From: James Simmons <uja.ornl@gmail.com>
 Date: Sun, 9 Feb 2014 17:10:18 -0500
 Subject: [PATCH 05/12] LU-3319 procfs: move osp proc handling to seq_files
@@ -624,10 +624,10 @@ index 75ebeb1..1ec40fc 100644
  }
  
 diff --git a/lustre/osp/lwp_dev.c b/lustre/osp/lwp_dev.c
-index 9560504..d6ae965 100644
+index dc4f978..b6e84e1 100644
 --- a/lustre/osp/lwp_dev.c
 +++ b/lustre/osp/lwp_dev.c
-@@ -186,25 +186,13 @@ const struct lu_device_operations lwp_lu_ops = {
+@@ -184,25 +184,13 @@ const struct lu_device_operations lwp_lu_ops = {
  	.ldo_process_config	= lwp_process_config,
  };
  
@@ -654,7 +654,7 @@ index 9560504..d6ae965 100644
  	int			   rc;
  	ENTRY;
  
-@@ -233,8 +221,8 @@ int lwp_init0(const struct lu_env *env, struct lwp_device *lwp,
+@@ -231,8 +219,8 @@ int lwp_init0(const struct lu_env *env, struct lwp_device *lwp,
  		RETURN(rc);
  	}
  
@@ -666,10 +666,10 @@ index 9560504..d6ae965 100644
  
  	RETURN(0);
 diff --git a/lustre/osp/osp_dev.c b/lustre/osp/osp_dev.c
-index 5828d88..7d45fa1 100644
+index a8d75ea..336b9f0 100644
 --- a/lustre/osp/osp_dev.c
 +++ b/lustre/osp/osp_dev.c
-@@ -371,7 +371,7 @@ static int osp_process_config(const struct lu_env *env,
+@@ -366,7 +366,7 @@ static int osp_process_config(const struct lu_env *env,
  			      struct lu_device *dev, struct lustre_cfg *lcfg)
  {
  	struct osp_device		*d = lu2osp_dev(dev);
@@ -678,7 +678,7 @@ index 5828d88..7d45fa1 100644
  	int				 rc;
  
  	ENTRY;
-@@ -385,11 +385,9 @@ static int osp_process_config(const struct lu_env *env,
+@@ -380,11 +380,9 @@ static int osp_process_config(const struct lu_env *env,
  		rc = osp_shutdown(env, d);
  		break;
  	case LCFG_PARAM:
@@ -693,7 +693,7 @@ index 5828d88..7d45fa1 100644
  		if (rc > 0)
  			rc = 0;
  		if (rc == -ENOSYS) {
-@@ -842,6 +840,9 @@ static struct lu_device *osp_device_fini(const struct lu_env *env,
+@@ -844,6 +842,9 @@ static struct lu_device *osp_device_fini(const struct lu_env *env,
  			OBD_FREE_PTR(cli->cl_rpc_lock);
  			cli->cl_rpc_lock = NULL;
  		}
@@ -703,7 +703,7 @@ index 5828d88..7d45fa1 100644
  	}
  
  	rc = client_obd_cleanup(m->opd_obd);
-@@ -1220,33 +1221,26 @@ struct llog_operations osp_mds_ost_orig_logops;
+@@ -1233,33 +1234,26 @@ struct llog_operations osp_mds_ost_orig_logops;
  
  static int __init osp_mod_init(void)
  {
@@ -741,7 +741,7 @@ index 5828d88..7d45fa1 100644
  #endif
  				LUSTRE_LWP_NAME, &lwp_device_type);
  	if (rc != 0) {
-@@ -1260,21 +1254,23 @@ static int __init osp_mod_init(void)
+@@ -1273,21 +1267,23 @@ static int __init osp_mod_init(void)
  	osp_mds_ost_orig_logops.lop_add = llog_cat_add_rec;
  	osp_mds_ost_orig_logops.lop_declare_add = llog_cat_declare_add_rec;
  
@@ -775,10 +775,10 @@ index 5828d88..7d45fa1 100644
  	class_unregister_type(LUSTRE_OSP_NAME);
  	lu_kmem_fini(osp_caches);
 diff --git a/lustre/osp/osp_internal.h b/lustre/osp/osp_internal.h
-index 0871d8d..0cc608b 100644
+index 2af16c0..84eca11 100644
 --- a/lustre/osp/osp_internal.h
 +++ b/lustre/osp/osp_internal.h
-@@ -433,7 +433,6 @@ int osp_write_last_oid_seq_files(struct lu_env *env, struct osp_device *osp,
+@@ -526,7 +526,6 @@ int osp_write_last_oid_seq_files(struct lu_env *env, struct osp_device *osp,
  int osp_init_pre_fid(struct osp_device *osp);
  
  /* lproc_osp.c */
@@ -786,7 +786,7 @@ index 0871d8d..0cc608b 100644
  void osp_lprocfs_init(struct osp_device *osp);
  
  /* osp_sync.c */
-@@ -447,7 +446,6 @@ int osp_sync_fini(struct osp_device *d);
+@@ -540,7 +539,6 @@ int osp_sync_fini(struct osp_device *d);
  void __osp_sync_check_for_work(struct osp_device *d);
  
  /* lwp_dev.c */
diff --git a/sys-cluster/lustre/files/0006-LU-3319-procfs-move-lod-proc-handling-to-seq_files.patch b/sys-cluster/lustre/files/0006-LU-3319-procfs-move-lod-proc-handling-to-seq_files.patch
index 1ca6b125d..06e3571f0 100644
--- a/sys-cluster/lustre/files/0006-LU-3319-procfs-move-lod-proc-handling-to-seq_files.patch
+++ b/sys-cluster/lustre/files/0006-LU-3319-procfs-move-lod-proc-handling-to-seq_files.patch
@@ -1,4 +1,4 @@
-From 82953bddbc3c7b9aa044d9eecc796bc12638f476 Mon Sep 17 00:00:00 2001
+From 2670599090a754d9fa8c7d952b530bc8fb88d56e Mon Sep 17 00:00:00 2001
 From: James Simmons <uja.ornl@gmail.com>
 Date: Sun, 9 Feb 2014 11:08:45 -0500
 Subject: [PATCH 06/12] LU-3319 procfs: move lod proc handling to seq_files
@@ -17,10 +17,10 @@ Change-Id: Iaa0f617fcd430e91f12afbc0faf6906fd275a7a5
  4 files changed, 152 insertions(+), 146 deletions(-)
 
 diff --git a/lustre/lod/lod_dev.c b/lustre/lod/lod_dev.c
-index 02a1e1e..b0ad1fd 100644
+index a451462..8776aa3 100644
 --- a/lustre/lod/lod_dev.c
 +++ b/lustre/lod/lod_dev.c
-@@ -297,12 +297,10 @@ static int lod_process_config(const struct lu_env *env,
+@@ -289,12 +289,10 @@ static int lod_process_config(const struct lu_env *env,
  	}
  
  	case LCFG_PARAM: {
@@ -36,7 +36,7 @@ index 02a1e1e..b0ad1fd 100644
  		if (rc > 0)
  			rc = 0;
  		GOTO(out, rc);
-@@ -916,19 +914,16 @@ static struct obd_ops lod_obd_device_ops = {
+@@ -890,19 +888,16 @@ static struct obd_ops lod_obd_device_ops = {
  
  static int __init lod_mod_init(void)
  {
@@ -59,7 +59,7 @@ index 02a1e1e..b0ad1fd 100644
  #endif
  				LUSTRE_LOD_NAME, &lod_device_type);
  	if (rc) {
-@@ -937,23 +932,25 @@ static int __init lod_mod_init(void)
+@@ -911,23 +906,25 @@ static int __init lod_mod_init(void)
  	}
  
  	/* create "lov" entry in procfs for compatibility purposes */
@@ -96,10 +96,10 @@ index 02a1e1e..b0ad1fd 100644
  	lu_kmem_fini(lod_caches);
  }
 diff --git a/lustre/lod/lod_internal.h b/lustre/lod/lod_internal.h
-index 6d99ad5..9299a91 100644
+index 2a00890..65ba47a 100644
 --- a/lustre/lod/lod_internal.h
 +++ b/lustre/lod/lod_internal.h
-@@ -376,7 +376,6 @@ int qos_add_tgt(struct lod_device*, struct lod_tgt_desc *);
+@@ -431,7 +431,6 @@ int qos_add_tgt(struct lod_device*, struct lod_tgt_desc *);
  int qos_del_tgt(struct lod_device *, struct lod_tgt_desc *);
  
  /* lproc_lod.c */
diff --git a/sys-cluster/lustre/files/0007-LU-3319-procfs-move-mdd-ofd-proc-handling-to-seq_fil.patch b/sys-cluster/lustre/files/0007-LU-3319-procfs-move-mdd-ofd-proc-handling-to-seq_fil.patch
index 0e748e6cc..b2921fc4f 100644
--- a/sys-cluster/lustre/files/0007-LU-3319-procfs-move-mdd-ofd-proc-handling-to-seq_fil.patch
+++ b/sys-cluster/lustre/files/0007-LU-3319-procfs-move-mdd-ofd-proc-handling-to-seq_fil.patch
@@ -1,6 +1,6 @@
-From 2790709429e9aaf4b11fca12e3f2e9d70f6608ce Mon Sep 17 00:00:00 2001
-From: James Simmons <uja.ornl@gmail.com>
-Date: Fri, 31 Jan 2014 14:00:32 -0500
+From 6af3bd54359520829a6199e81171fd849a6656f4 Mon Sep 17 00:00:00 2001
+From: Alexey Shvetsov <alexxy@gentoo.org>
+Date: Thu, 27 Feb 2014 16:06:08 +0400
 Subject: [PATCH 07/12] LU-3319 procfs: move mdd/ofd proc handling to seq_files
 
 With 3.10 linux kernel and above proc handling now only
@@ -9,14 +9,15 @@ layer proc entries over to using seq_files.
 
 Conflicts:
 	lustre/mdd/mdd_lproc.c
+	lustre/lfsck/lfsck_layout.c
 
 Signed-off-by: James Simmons <uja.ornl@gmail.com>
-Change-Id: I61b7df6bfd5efd0f12e3ca1a1813b7b62d493168
 Signed-off-by: Alexey Shvetsov <alexxy@gentoo.org>
+Change-Id: I61b7df6bfd5efd0f12e3ca1a1813b7b62d493168
 ---
  lustre/include/lustre_lfsck.h    |   6 +-
  lustre/lfsck/lfsck_internal.h    |   9 +-
- lustre/lfsck/lfsck_layout.c      |  66 ++----
+ lustre/lfsck/lfsck_layout.c      | 101 ++-------
  lustre/lfsck/lfsck_lib.c         |  77 +++----
  lustre/lfsck/lfsck_namespace.c   |  75 ++-----
  lustre/mdd/mdd_device.c          |  25 +--
@@ -28,13 +29,13 @@ Signed-off-by: Alexey Shvetsov <alexxy@gentoo.org>
  lustre/ofd/ofd_internal.h        |   6 +-
  lustre/osd-ldiskfs/osd_handler.c |   1 +
  lustre/osd-zfs/osd_handler.c     |   1 +
- 14 files changed, 462 insertions(+), 598 deletions(-)
+ 14 files changed, 462 insertions(+), 633 deletions(-)
 
 diff --git a/lustre/include/lustre_lfsck.h b/lustre/include/lustre_lfsck.h
-index 2e93420..0e578ac 100644
+index 1209bc2..bdb0955 100644
 --- a/lustre/include/lustre_lfsck.h
 +++ b/lustre/include/lustre_lfsck.h
-@@ -156,11 +156,11 @@ int lfsck_in_notify(const struct lu_env *env, struct dt_device *key,
+@@ -158,12 +158,12 @@ int lfsck_in_notify(const struct lu_env *env, struct dt_device *key,
  int lfsck_query(const struct lu_env *env, struct dt_device *key,
  		struct lfsck_request *lr);
  
@@ -48,12 +49,13 @@ index 2e93420..0e578ac 100644
 -int lfsck_dump(struct dt_device *key, void *buf, int len, enum lfsck_type type);
 +int lfsck_dump(struct seq_file *m, struct dt_device *key, enum lfsck_type type);
  
- #endif /* _LUSTRE_LFSCK_H */
+ static inline void lfsck_pack_rfa(struct lfsck_request *lr,
+ 				  const struct lu_fid *fid)
 diff --git a/lustre/lfsck/lfsck_internal.h b/lustre/lfsck/lfsck_internal.h
-index 01d3c60..fb98cf2 100644
+index 9f20729..48d3d82 100644
 --- a/lustre/lfsck/lfsck_internal.h
 +++ b/lustre/lfsck/lfsck_internal.h
-@@ -288,8 +288,7 @@ struct lfsck_operations {
+@@ -293,8 +293,7 @@ struct lfsck_operations {
  
  	int (*lfsck_dump)(const struct lu_env *env,
  			  struct lfsck_component *com,
@@ -63,7 +65,7 @@ index 01d3c60..fb98cf2 100644
  
  	int (*lfsck_double_scan)(const struct lu_env *env,
  				 struct lfsck_component *com);
-@@ -546,10 +545,10 @@ void lfsck_component_cleanup(const struct lu_env *env,
+@@ -571,10 +570,10 @@ void lfsck_component_cleanup(const struct lu_env *env,
  			     struct lfsck_component *com);
  void lfsck_instance_cleanup(const struct lu_env *env,
  			    struct lfsck_instance *lfsck);
@@ -78,10 +80,10 @@ index 01d3c60..fb98cf2 100644
  void lfsck_pos_fill(const struct lu_env *env, struct lfsck_instance *lfsck,
  		    struct lfsck_position *pos, bool init);
 diff --git a/lustre/lfsck/lfsck_layout.c b/lustre/lfsck/lfsck_layout.c
-index bdcd4c4..1295764 100644
+index f77ee87..27394e2 100644
 --- a/lustre/lfsck/lfsck_layout.c
 +++ b/lustre/lfsck/lfsck_layout.c
-@@ -2249,69 +2249,53 @@ static int lfsck_layout_slave_post(const struct lu_env *env,
+@@ -3657,69 +3657,53 @@ static int lfsck_layout_slave_post(const struct lu_env *env,
  }
  
  static int lfsck_layout_dump(const struct lu_env *env,
@@ -160,7 +162,7 @@ index bdcd4c4..1295764 100644
  		      "repaired_dangling: "LPU64"\n"
  		      "repaired_unmatched_pair: "LPU64"\n"
  		      "repaired_multiple_referenced: "LPU64"\n"
-@@ -2331,11 +2315,6 @@ static int lfsck_layout_dump(const struct lu_env *env,
+@@ -3739,11 +3723,6 @@ static int lfsck_layout_dump(const struct lu_env *env,
  		      lo->ll_objs_skipped,
  		      lo->ll_objs_failed_phase1,
  		      lo->ll_objs_failed_phase2);
@@ -172,7 +174,7 @@ index bdcd4c4..1295764 100644
  
  	if (lo->ll_status == LS_SCANNING_PHASE1) {
  		__u64 pos;
-@@ -2352,8 +2331,7 @@ static int lfsck_layout_dump(const struct lu_env *env,
+@@ -3760,8 +3739,7 @@ static int lfsck_layout_dump(const struct lu_env *env,
  			do_div(new_checked, duration);
  		if (rtime != 0)
  			do_div(speed, rtime);
@@ -182,7 +184,7 @@ index bdcd4c4..1295764 100644
  			      "checked_phase2: "LPU64"\n"
  			      "run_time_phase1: %u seconds\n"
  			      "run_time_phase2: %u seconds\n"
-@@ -2367,11 +2345,6 @@ static int lfsck_layout_dump(const struct lu_env *env,
+@@ -3775,11 +3753,6 @@ static int lfsck_layout_dump(const struct lu_env *env,
  			      lo->ll_run_time_phase2,
  			      speed,
  			      new_checked);
@@ -194,7 +196,7 @@ index bdcd4c4..1295764 100644
  
  		LASSERT(lfsck->li_di_oit != NULL);
  
-@@ -2384,12 +2357,7 @@ static int lfsck_layout_dump(const struct lu_env *env,
+@@ -3792,47 +3765,7 @@ static int lfsck_layout_dump(const struct lu_env *env,
  		pos = iops->store(env, lfsck->li_di_oit);
  		if (!lfsck->li_current_oit_processed)
  			pos--;
@@ -204,11 +206,46 @@ index bdcd4c4..1295764 100644
 -
 -		buf += rc;
 -		len -= rc;
+-	} else if (lo->ll_status == LS_SCANNING_PHASE2) {
+-		cfs_duration_t duration = cfs_time_current() -
+-					  lfsck->li_time_last_checkpoint;
+-		__u64 checked = lo->ll_objs_checked_phase1 + com->lc_new_checked;
+-		__u64 speed = checked;
+-		__u64 new_checked = com->lc_new_checked * HZ;
+-		__u32 rtime = lo->ll_run_time_phase1 +
+-			      cfs_duration_sec(duration + HALF_SEC);
+-
+-		if (duration != 0)
+-			do_div(new_checked, duration);
+-		if (rtime != 0)
+-			do_div(speed, rtime);
+-		rc = snprintf(buf, len,
+-			      "checked_phase1: "LPU64"\n"
+-			      "checked_phase2: "LPU64"\n"
+-			      "run_time_phase1: %u seconds\n"
+-			      "run_time_phase2: %u seconds\n"
+-			      "average_speed_phase1: "LPU64" items/sec\n"
+-			      "average_speed_phase2: N/A\n"
+-			      "real-time_speed_phase1: "LPU64" items/sec\n"
+-			      "real-time_speed_phase2: N/A\n"
+-			      "current_position: "DFID"\n",
+-			      checked,
+-			      lo->ll_objs_checked_phase2,
+-			      rtime,
+-			      lo->ll_run_time_phase2,
+-			      speed,
+-			      new_checked,
+-			      PFID(&com->lc_fid_latest_scanned_phase2));
+-		if (rc <= 0)
+-			goto out;
+-
+-		buf += rc;
+-		len -= rc;
 +		seq_printf(m, "current_position: "LPU64"\n", pos);
  	} else {
- 		/* XXX: LS_SCANNING_PHASE2 will be handled in the future. */
  		__u64 speed1 = lo->ll_objs_checked_phase1;
-@@ -2399,8 +2367,7 @@ static int lfsck_layout_dump(const struct lu_env *env,
+ 		__u64 speed2 = lo->ll_objs_checked_phase2;
+@@ -3841,8 +3774,7 @@ static int lfsck_layout_dump(const struct lu_env *env,
  			do_div(speed1, lo->ll_run_time_phase1);
  		if (lo->ll_run_time_phase2 != 0)
  			do_div(speed2, lo->ll_run_time_phase2);
@@ -218,7 +255,7 @@ index bdcd4c4..1295764 100644
  			      "checked_phase2: "LPU64"\n"
  			      "run_time_phase1: %u seconds\n"
  			      "run_time_phase2: %u seconds\n"
-@@ -2415,18 +2382,11 @@ static int lfsck_layout_dump(const struct lu_env *env,
+@@ -3857,18 +3789,11 @@ static int lfsck_layout_dump(const struct lu_env *env,
  			      lo->ll_run_time_phase2,
  			      speed1,
  			      speed2);
@@ -239,10 +276,10 @@ index bdcd4c4..1295764 100644
  
  static int lfsck_layout_master_double_scan(const struct lu_env *env,
 diff --git a/lustre/lfsck/lfsck_lib.c b/lustre/lfsck/lfsck_lib.c
-index 3eb3a02..b949b8d 100644
+index de7b849..d358ca1 100644
 --- a/lustre/lfsck/lfsck_lib.c
 +++ b/lustre/lfsck/lfsck_lib.c
-@@ -425,77 +425,52 @@ static inline int lfsck_instance_add(struct lfsck_instance *lfsck)
+@@ -426,77 +426,52 @@ static inline int lfsck_instance_add(struct lfsck_instance *lfsck)
  	return 0;
  }
  
@@ -339,7 +376,7 @@ index 3eb3a02..b949b8d 100644
  }
  
  void lfsck_pos_fill(const struct lu_env *env, struct lfsck_instance *lfsck,
-@@ -1104,7 +1079,7 @@ int lfsck_async_request(const struct lu_env *env, struct obd_export *exp,
+@@ -1149,7 +1124,7 @@ int lfsck_async_request(const struct lu_env *env, struct obd_export *exp,
  
  /* external interfaces */
  
@@ -348,7 +385,7 @@ index 3eb3a02..b949b8d 100644
  {
  	struct lu_env		env;
  	struct lfsck_instance  *lfsck;
-@@ -1117,8 +1092,7 @@ int lfsck_get_speed(struct dt_device *key, void *buf, int len)
+@@ -1162,8 +1137,7 @@ int lfsck_get_speed(struct dt_device *key, void *buf, int len)
  
  	lfsck = lfsck_instance_find(key, true, false);
  	if (likely(lfsck != NULL)) {
@@ -358,7 +395,7 @@ index 3eb3a02..b949b8d 100644
  		lfsck_instance_put(&env, lfsck);
  	} else {
  		rc = -ENODEV;
-@@ -1158,7 +1132,7 @@ int lfsck_set_speed(struct dt_device *key, int val)
+@@ -1203,7 +1177,7 @@ int lfsck_set_speed(struct dt_device *key, int val)
  }
  EXPORT_SYMBOL(lfsck_set_speed);
  
@@ -367,7 +404,7 @@ index 3eb3a02..b949b8d 100644
  {
  	struct lu_env		env;
  	struct lfsck_instance  *lfsck;
-@@ -1171,8 +1145,7 @@ int lfsck_get_windows(struct dt_device *key, void *buf, int len)
+@@ -1216,8 +1190,7 @@ int lfsck_get_windows(struct dt_device *key, void *buf, int len)
  
  	lfsck = lfsck_instance_find(key, true, false);
  	if (likely(lfsck != NULL)) {
@@ -377,7 +414,7 @@ index 3eb3a02..b949b8d 100644
  		lfsck_instance_put(&env, lfsck);
  	} else {
  		rc = -ENODEV;
-@@ -1222,7 +1195,7 @@ int lfsck_set_windows(struct dt_device *key, int val)
+@@ -1267,7 +1240,7 @@ int lfsck_set_windows(struct dt_device *key, int val)
  }
  EXPORT_SYMBOL(lfsck_set_windows);
  
@@ -386,7 +423,7 @@ index 3eb3a02..b949b8d 100644
  {
  	struct lu_env		env;
  	struct lfsck_instance  *lfsck;
-@@ -1238,7 +1211,7 @@ int lfsck_dump(struct dt_device *key, void *buf, int len, enum lfsck_type type)
+@@ -1283,7 +1256,7 @@ int lfsck_dump(struct dt_device *key, void *buf, int len, enum lfsck_type type)
  	if (likely(lfsck != NULL)) {
  		com = lfsck_component_find(lfsck, type);
  		if (likely(com != NULL)) {
@@ -619,10 +656,10 @@ index 40a4ee3..b0acecb 100644
  				LUSTRE_MDD_NAME, &mdd_device_type);
  	if (rc)
 diff --git a/lustre/mdd/mdd_internal.h b/lustre/mdd/mdd_internal.h
-index daa1dcb..5332b2c 100644
+index 0bfb2a2..bccef77 100644
 --- a/lustre/mdd/mdd_internal.h
 +++ b/lustre/mdd/mdd_internal.h
-@@ -340,7 +340,6 @@ int orph_declare_index_delete(const struct lu_env *, struct mdd_object *,
+@@ -342,7 +342,6 @@ int orph_declare_index_delete(const struct lu_env *, struct mdd_object *,
                                struct thandle *);
  
  /* mdd_lproc.c */
@@ -1047,7 +1084,7 @@ index de379b3..5714ee6 100644
  }
 -
 diff --git a/lustre/obdclass/lprocfs_status.c b/lustre/obdclass/lprocfs_status.c
-index 7cd7870..f9cb944 100644
+index 0ca58c5..5b72a5a 100644
 --- a/lustre/obdclass/lprocfs_status.c
 +++ b/lustre/obdclass/lprocfs_status.c
 @@ -388,11 +388,10 @@ EXPORT_SYMBOL(lprocfs_evict_client_seq_write);
@@ -1744,7 +1781,7 @@ index e303fd6..1759a7d 100644
  {
  	LASSERT(stats && stats->ls_num >= LPROC_OFD_STATS_LAST);
 diff --git a/lustre/ofd/ofd_dev.c b/lustre/ofd/ofd_dev.c
-index 6782e5d..1575972 100644
+index 9900bed..a9cc81f 100644
 --- a/lustre/ofd/ofd_dev.c
 +++ b/lustre/ofd/ofd_dev.c
 @@ -240,8 +240,7 @@ static int ofd_process_config(const struct lu_env *env, struct lu_device *d,
@@ -1767,7 +1804,7 @@ index 6782e5d..1575972 100644
  					      d->ld_obd);
  		if (rc > 0 || rc == -ENOSYS) {
  			CDEBUG(D_CONFIG, "pass param %s down the stack.\n",
-@@ -492,9 +490,10 @@ static struct lu_device_operations ofd_lu_ops = {
+@@ -496,9 +494,10 @@ static struct lu_device_operations ofd_lu_ops = {
  	.ldo_prepare		= ofd_prepare,
  };
  
@@ -1779,7 +1816,7 @@ index 6782e5d..1575972 100644
  	struct obd_device		*obd = ofd_obd(ofd);
  	cfs_proc_dir_entry_t		*entry;
  	int				 rc = 0;
-@@ -503,8 +502,8 @@ static int ofd_procfs_init(struct ofd_device *ofd)
+@@ -507,8 +506,8 @@ static int ofd_procfs_init(struct ofd_device *ofd)
  
  	/* lprocfs must be setup before the ofd so state can be safely added
  	 * to /proc incrementally as the ofd is setup */
@@ -1790,7 +1827,7 @@ index 6782e5d..1575972 100644
  	if (rc) {
  		CERROR("%s: lprocfs_obd_setup failed: %d.\n",
  		       obd->obd_name, rc);
-@@ -520,7 +519,7 @@ static int ofd_procfs_init(struct ofd_device *ofd)
+@@ -524,7 +523,7 @@ static int ofd_procfs_init(struct ofd_device *ofd)
  
  	obd->obd_uses_nid_stats = 1;
  
@@ -1799,7 +1836,7 @@ index 6782e5d..1575972 100644
  	if (IS_ERR(entry)) {
  		rc = PTR_ERR(entry);
  		CERROR("%s: error %d setting up lprocfs for %s\n",
-@@ -530,8 +529,10 @@ static int ofd_procfs_init(struct ofd_device *ofd)
+@@ -534,8 +533,10 @@ static int ofd_procfs_init(struct ofd_device *ofd)
  	obd->obd_proc_exports_entry = entry;
  
  	entry = lprocfs_add_simple(obd->obd_proc_exports_entry, "clear",
@@ -1812,7 +1849,7 @@ index 6782e5d..1575972 100644
  	if (IS_ERR(entry)) {
  		rc = PTR_ERR(entry);
  		CERROR("%s: add proc entry 'clear' failed: %d.\n",
-@@ -547,7 +548,7 @@ static int ofd_procfs_init(struct ofd_device *ofd)
+@@ -551,7 +552,7 @@ static int ofd_procfs_init(struct ofd_device *ofd)
  		GOTO(remove_entry_clear, rc);
  	RETURN(0);
  remove_entry_clear:
@@ -1821,7 +1858,7 @@ index 6782e5d..1575972 100644
  obd_cleanup:
  	lprocfs_obd_cleanup(obd);
  	lprocfs_free_obd_stats(obd);
-@@ -560,29 +561,28 @@ static void ofd_procfs_add_brw_stats_symlink(struct ofd_device *ofd)
+@@ -564,29 +565,28 @@ static void ofd_procfs_add_brw_stats_symlink(struct ofd_device *ofd)
  	struct obd_device	*obd = ofd_obd(ofd);
  	struct obd_device	*osd_obd = ofd->ofd_osd_exp->exp_obd;
  	cfs_proc_dir_entry_t	*osd_root = osd_obd->obd_type->typ_procroot;
@@ -1856,7 +1893,7 @@ index 6782e5d..1575972 100644
  		lprocfs_add_symlink("writethrough_cache_enable",
  				    obd->obd_proc_entry,
  				    "../../%s/%s/writethrough_cache_enable",
-@@ -593,13 +593,8 @@ static void ofd_procfs_fini(struct ofd_device *ofd)
+@@ -597,13 +597,8 @@ static void ofd_procfs_fini(struct ofd_device *ofd)
  {
  	struct obd_device *obd = ofd_obd(ofd);
  
@@ -1872,7 +1909,7 @@ index 6782e5d..1575972 100644
  	lprocfs_free_per_client_stats(obd);
  	lprocfs_obd_cleanup(obd);
  	lprocfs_free_obd_stats(obd);
-@@ -2364,7 +2359,6 @@ static struct lu_device_type ofd_device_type = {
+@@ -2368,7 +2363,6 @@ static struct lu_device_type ofd_device_type = {
  
  int __init ofd_init(void)
  {
@@ -1880,7 +1917,7 @@ index 6782e5d..1575972 100644
  	int				rc;
  
  	rc = lu_kmem_init(ofd_caches);
-@@ -2377,11 +2371,9 @@ int __init ofd_init(void)
+@@ -2381,11 +2375,9 @@ int __init ofd_init(void)
  		return(rc);
  	}
  
@@ -1894,10 +1931,10 @@ index 6782e5d..1575972 100644
  				LUSTRE_OST_NAME, &ofd_device_type);
  	return rc;
 diff --git a/lustre/ofd/ofd_internal.h b/lustre/ofd/ofd_internal.h
-index b22ceec..79dfaa9 100644
+index ab041ce..60cfb50 100644
 --- a/lustre/ofd/ofd_internal.h
 +++ b/lustre/ofd/ofd_internal.h
-@@ -390,13 +390,9 @@ int ofd_txn_stop_cb(const struct lu_env *env, struct thandle *txn,
+@@ -392,13 +392,9 @@ int ofd_txn_stop_cb(const struct lu_env *env, struct thandle *txn,
  
  /* lproc_ofd.c */
  #ifdef LPROCFS
@@ -1913,10 +1950,10 @@ index b22ceec..79dfaa9 100644
  #endif
  
 diff --git a/lustre/osd-ldiskfs/osd_handler.c b/lustre/osd-ldiskfs/osd_handler.c
-index 6f369d0..9027533 100644
+index a8022f0..4e1ec4a 100644
 --- a/lustre/osd-ldiskfs/osd_handler.c
 +++ b/lustre/osd-ldiskfs/osd_handler.c
-@@ -5882,6 +5882,7 @@ static int osd_obd_connect(const struct lu_env *env, struct obd_export **exp,
+@@ -5892,6 +5892,7 @@ static int osd_obd_connect(const struct lu_env *env, struct obd_export **exp,
  	osd->od_connects++;
  	spin_unlock(&osd->od_osfs_lock);
  
@@ -1925,10 +1962,10 @@ index 6f369d0..9027533 100644
  }
  
 diff --git a/lustre/osd-zfs/osd_handler.c b/lustre/osd-zfs/osd_handler.c
-index 36bf6a4..40d2c67 100644
+index c9bf49a..bd2463a 100644
 --- a/lustre/osd-zfs/osd_handler.c
 +++ b/lustre/osd-zfs/osd_handler.c
-@@ -813,6 +813,7 @@ static int osd_obd_connect(const struct lu_env *env, struct obd_export **exp,
+@@ -816,6 +816,7 @@ static int osd_obd_connect(const struct lu_env *env, struct obd_export **exp,
  	osd->od_connects++;
  	spin_unlock(&osd->od_objset.lock);
  
diff --git a/sys-cluster/lustre/files/0008-LU-3319-procfs-move-mdt-mds-proc-handling-to-seq_fil.patch b/sys-cluster/lustre/files/0008-LU-3319-procfs-move-mdt-mds-proc-handling-to-seq_fil.patch
index a6a425b5b..c271eb742 100644
--- a/sys-cluster/lustre/files/0008-LU-3319-procfs-move-mdt-mds-proc-handling-to-seq_fil.patch
+++ b/sys-cluster/lustre/files/0008-LU-3319-procfs-move-mdt-mds-proc-handling-to-seq_fil.patch
@@ -1,4 +1,4 @@
-From 1013b4b997343de8530c4d4ef5380220d57f155a Mon Sep 17 00:00:00 2001
+From 9ab620dbc6aae86b9d39d97ba50912dc93b6e4e2 Mon Sep 17 00:00:00 2001
 From: James Simmons <uja.ornl@gmail.com>
 Date: Sun, 9 Feb 2014 11:04:31 -0500
 Subject: [PATCH 08/12] LU-3319 procfs: move mdt/mds proc handling to seq_files
@@ -461,10 +461,10 @@ index 037bcbd..9bbcbd4 100644
  	{ 0 }
  };
 diff --git a/lustre/mdt/mdt_handler.c b/lustre/mdt/mdt_handler.c
-index 064fef1..c850356 100644
+index 17b7605..2b08be9 100644
 --- a/lustre/mdt/mdt_handler.c
 +++ b/lustre/mdt/mdt_handler.c
-@@ -4539,7 +4539,6 @@ static int mdt_process_config(const struct lu_env *env,
+@@ -4584,7 +4584,6 @@ static int mdt_process_config(const struct lu_env *env,
  
  	switch (cfg->lcfg_command) {
  	case LCFG_PARAM: {
@@ -472,7 +472,7 @@ index 064fef1..c850356 100644
  		struct obd_device	   *obd = d->ld_obd;
  
  		/* For interoperability */
-@@ -4574,14 +4573,13 @@ static int mdt_process_config(const struct lu_env *env,
+@@ -4619,14 +4618,13 @@ static int mdt_process_config(const struct lu_env *env,
  			}
  		}
  
@@ -492,7 +492,7 @@ index 064fef1..c850356 100644
  			if (rc > 0 || rc == -ENOSYS)
  				/* we don't understand; pass it on */
  				rc = next->ld_ops->ldo_process_config(env, next,
-@@ -5762,7 +5760,6 @@ static struct lu_device_type mdt_device_type = {
+@@ -5825,7 +5823,6 @@ static struct lu_device_type mdt_device_type = {
  
  static int __init mdt_mod_init(void)
  {
@@ -500,7 +500,7 @@ index 064fef1..c850356 100644
  	int rc;
  
  	CLASSERT(sizeof("0x0123456789ABCDEF:0x01234567:0x01234567") ==
-@@ -5777,10 +5774,9 @@ static int __init mdt_mod_init(void)
+@@ -5840,10 +5837,9 @@ static int __init mdt_mod_init(void)
  	if (rc)
  		GOTO(lu_fini, rc);
  
@@ -578,10 +578,10 @@ index 1300861..3125dcc 100644
  	RETURN(rc);
  }
 diff --git a/lustre/mdt/mdt_internal.h b/lustre/mdt/mdt_internal.h
-index d548988..e30d78d 100644
+index c3d4f7f..7b0381a 100644
 --- a/lustre/mdt/mdt_internal.h
 +++ b/lustre/mdt/mdt_internal.h
-@@ -784,9 +784,6 @@ void mdt_thread_info_init(struct ptlrpc_request *req,
+@@ -787,9 +787,6 @@ void mdt_thread_info_init(struct ptlrpc_request *req,
  void mdt_thread_info_fini(struct mdt_thread_info *mti);
  struct mdt_thread_info *tsi2mdt_info(struct tgt_session_info *tsi);
  
@@ -591,7 +591,7 @@ index d548988..e30d78d 100644
  int mdt_hsm_attr_set(struct mdt_thread_info *info, struct mdt_object *obj,
  		     const struct md_hsm *mh);
  
-@@ -919,13 +916,12 @@ int mdt_hsm_cdt_fini(struct mdt_device *mdt);
+@@ -924,13 +921,12 @@ int mdt_hsm_cdt_fini(struct mdt_device *mdt);
  int mdt_hsm_cdt_wakeup(struct mdt_device *mdt);
  
  /* coordinator control /proc interface */
@@ -609,7 +609,7 @@ index d548988..e30d78d 100644
  /* md_hsm helpers */
  struct mdt_object *mdt_hsm_get_md_hsm(struct mdt_thread_info *mti,
  				      const struct lu_fid *fid,
-@@ -1065,8 +1061,6 @@ enum {
+@@ -1070,8 +1066,6 @@ enum {
  };
  void mdt_counter_incr(struct ptlrpc_request *req, int opcode);
  void mdt_stats_counter_init(struct lprocfs_stats *stats);
diff --git a/sys-cluster/lustre/files/0009-LU-3319-procfs-update-ldiskfs-proc-handling-to-seq_f.patch b/sys-cluster/lustre/files/0009-LU-3319-procfs-update-ldiskfs-proc-handling-to-seq_f.patch
index 97b8e0e74..7f9d4d784 100644
--- a/sys-cluster/lustre/files/0009-LU-3319-procfs-update-ldiskfs-proc-handling-to-seq_f.patch
+++ b/sys-cluster/lustre/files/0009-LU-3319-procfs-update-ldiskfs-proc-handling-to-seq_f.patch
@@ -1,4 +1,4 @@
-From adf3be9fe382564c4760b83a5843b7d5502bbe48 Mon Sep 17 00:00:00 2001
+From 98a6eee60a100d445d7533eeba907e4e75c36f18 Mon Sep 17 00:00:00 2001
 From: James Simmons <uja.ornl@gmail.com>
 Date: Sun, 9 Feb 2014 10:45:37 -0500
 Subject: [PATCH 09/12] LU-3319 procfs: update ldiskfs proc handling to
@@ -19,10 +19,10 @@ Change-Id: Ia296a4682e2feda02bcfbe0100de8a89404cd731
  5 files changed, 220 insertions(+), 217 deletions(-)
 
 diff --git a/lustre/osd-ldiskfs/osd_compat.c b/lustre/osd-ldiskfs/osd_compat.c
-index b4a018c..6ca1304 100644
+index e693e8d..3fb6783 100644
 --- a/lustre/osd-ldiskfs/osd_compat.c
 +++ b/lustre/osd-ldiskfs/osd_compat.c
-@@ -1168,7 +1168,7 @@ int osd_obj_spec_update(struct osd_thread_info *info, struct osd_device *osd,
+@@ -1164,7 +1164,7 @@ int osd_obj_spec_update(struct osd_thread_info *info, struct osd_device *osd,
  			handle_t *th)
  {
  	struct dentry	*root;
@@ -31,7 +31,7 @@ index b4a018c..6ca1304 100644
  	int		 rc;
  	ENTRY;
  
-@@ -1189,7 +1189,7 @@ int osd_obj_spec_insert(struct osd_thread_info *info, struct osd_device *osd,
+@@ -1185,7 +1185,7 @@ int osd_obj_spec_insert(struct osd_thread_info *info, struct osd_device *osd,
  			handle_t *th)
  {
  	struct dentry	*root;
@@ -40,7 +40,7 @@ index b4a018c..6ca1304 100644
  	int		 rc;
  	ENTRY;
  
-@@ -1211,7 +1211,7 @@ int osd_obj_spec_lookup(struct osd_thread_info *info, struct osd_device *osd,
+@@ -1207,7 +1207,7 @@ int osd_obj_spec_lookup(struct osd_thread_info *info, struct osd_device *osd,
  	struct dentry	*root;
  	struct dentry	*dentry;
  	struct inode	*inode;
@@ -50,10 +50,10 @@ index b4a018c..6ca1304 100644
  	ENTRY;
  
 diff --git a/lustre/osd-ldiskfs/osd_handler.c b/lustre/osd-ldiskfs/osd_handler.c
-index 9027533..dfaa542 100644
+index 4e1ec4a..1d9a2ba 100644
 --- a/lustre/osd-ldiskfs/osd_handler.c
 +++ b/lustre/osd-ldiskfs/osd_handler.c
-@@ -5814,6 +5814,7 @@ static struct lu_device *osd_device_free(const struct lu_env *env,
+@@ -5824,6 +5824,7 @@ static struct lu_device *osd_device_free(const struct lu_env *env,
  static int osd_process_config(const struct lu_env *env,
                                struct lu_device *d, struct lustre_cfg *cfg)
  {
@@ -61,7 +61,7 @@ index 9027533..dfaa542 100644
  	struct osd_device		*o = osd_dev(d);
  	int				rc;
  	ENTRY;
-@@ -5828,12 +5829,12 @@ static int osd_process_config(const struct lu_env *env,
+@@ -5838,12 +5839,12 @@ static int osd_process_config(const struct lu_env *env,
  		break;
  	case LCFG_PARAM:
  		LASSERT(&o->od_dt_dev);
@@ -79,7 +79,7 @@ index 9027533..dfaa542 100644
  		break;
  	default:
  		rc = -ENOSYS;
-@@ -5981,9 +5982,10 @@ static int __init osd_mod_init(void)
+@@ -5991,9 +5992,10 @@ static int __init osd_mod_init(void)
  	if (rc)
  		return rc;
  
@@ -93,10 +93,10 @@ index 9027533..dfaa542 100644
  				LUSTRE_OSD_LDISKFS_NAME, &osd_device_type);
  	if (rc)
 diff --git a/lustre/osd-ldiskfs/osd_internal.h b/lustre/osd-ldiskfs/osd_internal.h
-index 8436d1f..c90147f 100644
+index dc52885..7d54162 100644
 --- a/lustre/osd-ldiskfs/osd_internal.h
 +++ b/lustre/osd-ldiskfs/osd_internal.h
-@@ -623,8 +623,8 @@ static inline int __osd_xattr_set(struct osd_thread_info *info,
+@@ -616,8 +616,8 @@ static inline int __osd_xattr_set(struct osd_thread_info *info,
  
  #ifdef LPROCFS
  /* osd_lproc.c */
@@ -107,7 +107,7 @@ index 8436d1f..c90147f 100644
  int osd_procfs_init(struct osd_device *osd, const char *name);
  int osd_procfs_fini(struct osd_device *osd);
  void osd_brw_stats_update(struct osd_device *osd, struct osd_iobuf *iobuf);
-@@ -679,7 +679,7 @@ int osd_oii_insert(struct osd_device *dev, struct osd_idmap_cache *oic,
+@@ -672,7 +672,7 @@ int osd_oii_insert(struct osd_device *dev, struct osd_idmap_cache *oic,
  		   int insert);
  int osd_oii_lookup(struct osd_device *dev, const struct lu_fid *fid,
  		   struct osd_inode_id *id);
@@ -602,10 +602,10 @@ index b9b4e3d..947a4b9 100644
 +}
  #endif
 diff --git a/lustre/osd-ldiskfs/osd_scrub.c b/lustre/osd-ldiskfs/osd_scrub.c
-index cce33af..1002913 100644
+index e558163..b5b91c8 100644
 --- a/lustre/osd-ldiskfs/osd_scrub.c
 +++ b/lustre/osd-ldiskfs/osd_scrub.c
-@@ -2578,80 +2578,69 @@ static const char *scrub_param_names[] = {
+@@ -2551,80 +2551,69 @@ static const char *scrub_param_names[] = {
  	NULL
  };
  
@@ -700,7 +700,7 @@ index cce33af..1002913 100644
  		      "name: OI_scrub\n"
  		      "magic: 0x%x\n"
  		      "oi_files: %d\n"
-@@ -2661,51 +2650,48 @@ int osd_scrub_dump(struct osd_device *dev, char *buf, int len)
+@@ -2634,51 +2623,48 @@ int osd_scrub_dump(struct osd_device *dev, char *buf, int len)
  	if (rc <= 0)
  		goto out;
  
@@ -761,7 +761,7 @@ index cce33af..1002913 100644
  		      "updated: "LPU64"\n"
  		      "failed: "LPU64"\n"
  		      "prior_updated: "LPU64"\n"
-@@ -2718,8 +2704,6 @@ int osd_scrub_dump(struct osd_device *dev, char *buf, int len)
+@@ -2691,8 +2677,6 @@ int osd_scrub_dump(struct osd_device *dev, char *buf, int len)
  	if (rc <= 0)
  		goto out;
  
@@ -770,7 +770,7 @@ index cce33af..1002913 100644
  	speed = checked;
  	if (thread_is_running(&scrub->os_thread)) {
  		cfs_duration_t duration = cfs_time_current() -
-@@ -2732,8 +2716,7 @@ int osd_scrub_dump(struct osd_device *dev, char *buf, int len)
+@@ -2705,8 +2689,7 @@ int osd_scrub_dump(struct osd_device *dev, char *buf, int len)
  			do_div(new_checked, duration);
  		if (rtime != 0)
  			do_div(speed, rtime);
@@ -780,7 +780,7 @@ index cce33af..1002913 100644
  			      "average_speed: "LPU64" objects/sec\n"
  			      "real-time_speed: "LPU64" objects/sec\n"
  			      "current_position: %u\n"
-@@ -2746,8 +2729,7 @@ int osd_scrub_dump(struct osd_device *dev, char *buf, int len)
+@@ -2719,8 +2702,7 @@ int osd_scrub_dump(struct osd_device *dev, char *buf, int len)
  	} else {
  		if (sf->sf_run_time != 0)
  			do_div(speed, sf->sf_run_time);
@@ -790,7 +790,7 @@ index cce33af..1002913 100644
  			      "average_speed: "LPU64" objects/sec\n"
  			      "real-time_speed: N/A\n"
  			      "current_position: N/A\n"
-@@ -2759,10 +2741,7 @@ int osd_scrub_dump(struct osd_device *dev, char *buf, int len)
+@@ -2732,10 +2714,7 @@ int osd_scrub_dump(struct osd_device *dev, char *buf, int len)
  	}
  	if (rc <= 0)
  		goto out;
diff --git a/sys-cluster/lustre/files/0010-LU-3319-lprocfs-client-side-cleanups.patch b/sys-cluster/lustre/files/0010-LU-3319-lprocfs-client-side-cleanups.patch
index 1eed584b6..b076a3ad9 100644
--- a/sys-cluster/lustre/files/0010-LU-3319-lprocfs-client-side-cleanups.patch
+++ b/sys-cluster/lustre/files/0010-LU-3319-lprocfs-client-side-cleanups.patch
@@ -1,4 +1,4 @@
-From cd81037fa6ecc7f6b36d3c49205a3d6f3e7aa0de Mon Sep 17 00:00:00 2001
+From 48d1258335516d5335567f11f5be91ceafbbac4e Mon Sep 17 00:00:00 2001
 From: James Simmons <uja.ornl@gmail.com>
 Date: Tue, 21 Jan 2014 12:06:59 -0500
 Subject: [PATCH 10/12] LU-3319 lprocfs: client side cleanups
@@ -251,10 +251,10 @@ index 648b6e5..f818def 100644
  };
  #endif /* LPROCFS */
 diff --git a/lustre/obdclass/lprocfs_status.c b/lustre/obdclass/lprocfs_status.c
-index f9cb944..abe5d71 100644
+index 5b72a5a..551f629 100644
 --- a/lustre/obdclass/lprocfs_status.c
 +++ b/lustre/obdclass/lprocfs_status.c
-@@ -2581,7 +2581,6 @@ void lprocfs_init_ldlm_stats(struct lprocfs_stats *ldlm_stats)
+@@ -2583,7 +2583,6 @@ void lprocfs_init_ldlm_stats(struct lprocfs_stats *ldlm_stats)
  EXPORT_SYMBOL(lprocfs_init_ldlm_stats);
  
  #ifdef HAVE_SERVER_SUPPORT
@@ -395,7 +395,7 @@ index b9d1b71..f95fb55 100644
  
  static int osc_process_config(struct obd_device *obd, obd_count len, void *buf)
 diff --git a/lustre/ost/ost_handler.c b/lustre/ost/ost_handler.c
-index d4da00d..d20a30f 100644
+index a39381f..d5458b2 100644
 --- a/lustre/ost/ost_handler.c
 +++ b/lustre/ost/ost_handler.c
 @@ -75,7 +75,8 @@ static struct cfs_cpt_table	*ost_io_cptable;
diff --git a/sys-cluster/lustre/files/0011-LU-3974-llite-use-new-struct-dir_context.patch b/sys-cluster/lustre/files/0011-LU-3974-llite-use-new-struct-dir_context.patch
index 6f9b65106..5b3983dee 100644
--- a/sys-cluster/lustre/files/0011-LU-3974-llite-use-new-struct-dir_context.patch
+++ b/sys-cluster/lustre/files/0011-LU-3974-llite-use-new-struct-dir_context.patch
@@ -1,4 +1,4 @@
-From 5d386e041277db90dc2dc8c890d0f90705e443a7 Mon Sep 17 00:00:00 2001
+From b3af9f9fde020df881b52b059a9e0d5d2c6ccfb9 Mon Sep 17 00:00:00 2001
 From: James Simmons <uja.ornl@gmail.com>
 Date: Mon, 20 Jan 2014 21:23:00 -0500
 Subject: [PATCH 11/12] LU-3974 llite: use new struct dir_context
@@ -61,7 +61,7 @@ index e6207c9..f44a277 100644
  	 LC_HAVE_DCOUNT
  
 diff --git a/lustre/llite/dir.c b/lustre/llite/dir.c
-index dc5d623..eb09ef8 100644
+index 6a1e3c5..05639f0 100644
 --- a/lustre/llite/dir.c
 +++ b/lustre/llite/dir.c
 @@ -195,9 +195,16 @@ struct lu_dirent *ll_dir_entry_next(struct inode *dir,
@@ -149,7 +149,7 @@ index dc5d623..eb09ef8 100644
  	ll_finish_md_op_data(op_data);
  	filp->f_version = inode->i_version;
  #ifdef HAVE_TOUCH_ATIME_1ARG
-@@ -1702,11 +1728,15 @@ int ll_dir_release(struct inode *inode, struct file *file)
+@@ -1809,11 +1835,15 @@ int ll_dir_release(struct inode *inode, struct file *file)
  }
  
  struct file_operations ll_dir_operations = {
@@ -173,10 +173,10 @@ index dc5d623..eb09ef8 100644
 +	.fsync		= ll_fsync,
  };
 diff --git a/lustre/llite/llite_internal.h b/lustre/llite/llite_internal.h
-index 92b278e..c477b4c 100644
+index 59ecdfb..148f6fa 100644
 --- a/lustre/llite/llite_internal.h
 +++ b/lustre/llite/llite_internal.h
-@@ -91,9 +91,12 @@ extern struct file_operations ll_pgcache_seq_fops;
+@@ -92,9 +92,12 @@ extern struct file_operations ll_pgcache_seq_fops;
  #define REMOTE_PERM_HASHSIZE 16
  
  struct ll_getname_data {
@@ -192,7 +192,7 @@ index 92b278e..c477b4c 100644
  };
  
  /* llite setxid/access permission for user on remote client */
-@@ -719,8 +722,13 @@ static void ll_stats_ops_tally(struct ll_sb_info *sbi, int op, int count) {}
+@@ -726,8 +729,13 @@ static void ll_stats_ops_tally(struct ll_sb_info *sbi, int op, int count) {}
  /* llite/dir.c */
  extern struct file_operations ll_dir_operations;
  extern struct inode_operations ll_dir_inode_operations;
@@ -207,10 +207,10 @@ index 92b278e..c477b4c 100644
  
  struct lu_dirent *ll_dir_entry_start(struct inode *dir,
 diff --git a/lustre/llite/llite_nfs.c b/lustre/llite/llite_nfs.c
-index 68616e9..faad453 100644
+index f96d17e..713e846 100644
 --- a/lustre/llite/llite_nfs.c
 +++ b/lustre/llite/llite_nfs.c
-@@ -236,7 +236,14 @@ static int ll_get_name(struct dentry *dentry, char *name,
+@@ -230,7 +230,14 @@ static int ll_get_name(struct dentry *dentry, char *name,
                         struct dentry *child)
  {
  	struct inode *dir = dentry->d_inode;
@@ -226,7 +226,7 @@ index 68616e9..faad453 100644
  	struct md_op_data *op_data;
  	int rc;
  	ENTRY;
-@@ -247,10 +254,6 @@ static int ll_get_name(struct dentry *dentry, char *name,
+@@ -241,10 +248,6 @@ static int ll_get_name(struct dentry *dentry, char *name,
          if (!dir->i_fop)
                  GOTO(out, rc = -EINVAL);
  
@@ -237,7 +237,7 @@ index 68616e9..faad453 100644
  	op_data = ll_prep_md_op_data(NULL, dir, dir, NULL, 0, 0,
  				     LUSTRE_OPC_ANY, dir);
  	if (IS_ERR(op_data))
-@@ -260,7 +263,11 @@ static int ll_get_name(struct dentry *dentry, char *name,
+@@ -254,7 +257,11 @@ static int ll_get_name(struct dentry *dentry, char *name,
  	op_data->op_max_pages =
  		ll_i2sbi(dir)->ll_md_brw_size >> PAGE_CACHE_SHIFT;
  	mutex_lock(&dir->i_mutex);
diff --git a/sys-cluster/lustre/files/0012-LU-3974-llite-invalidatepage-api-changed.patch b/sys-cluster/lustre/files/0012-LU-3974-llite-invalidatepage-api-changed.patch
index 21584acc0..90e558ece 100644
--- a/sys-cluster/lustre/files/0012-LU-3974-llite-invalidatepage-api-changed.patch
+++ b/sys-cluster/lustre/files/0012-LU-3974-llite-invalidatepage-api-changed.patch
@@ -1,4 +1,4 @@
-From 9ade0a01cf77e4ec0cbe26cd38c9c32d727fa74e Mon Sep 17 00:00:00 2001
+From 95cacafafbc5bc0ec28bbf7898df28bb0f0295e6 Mon Sep 17 00:00:00 2001
 From: James Simmons <uja.ornl@gmail.com>
 Date: Tue, 24 Sep 2013 12:29:47 -0400
 Subject: [PATCH 12/12] LU-3974 llite: invalidatepage api changed