1 |
commit: 7890d3a30936ae1853d6893b900dc87350a834f4 |
2 |
Author: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Feb 27 12:08:26 2014 +0000 |
4 |
Commit: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Feb 27 12:08:26 2014 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=7890d3a3 |
7 |
|
8 |
Update patches |
9 |
|
10 |
Package-Manager: portage-2.2.8-r1 |
11 |
RepoMan-Options: --force |
12 |
|
13 |
--- |
14 |
sys-cluster/lustre/ChangeLog | 15 +++ |
15 |
...ld-make-AC-check-for-linux-arch-sandbox-f.patch | 2 +- |
16 |
...cfs-update-zfs-proc-handling-to-seq_files.patch | 10 +- |
17 |
...rocfs-move-mgs-proc-handling-to-seq_files.patch | 2 +- |
18 |
.../0004-LU-3319-procfs-fix-symlink-handling.patch | 26 ++-- |
19 |
...rocfs-move-osp-proc-handling-to-seq_files.patch | 26 ++-- |
20 |
...rocfs-move-lod-proc-handling-to-seq_files.patch | 14 +-- |
21 |
...cfs-move-mdd-ofd-proc-handling-to-seq_fil.patch | 133 +++++++++++++-------- |
22 |
...cfs-move-mdt-mds-proc-handling-to-seq_fil.patch | 20 ++-- |
23 |
...cfs-update-ldiskfs-proc-handling-to-seq_f.patch | 38 +++--- |
24 |
...0010-LU-3319-lprocfs-client-side-cleanups.patch | 8 +- |
25 |
...-LU-3974-llite-use-new-struct-dir_context.patch | 20 ++-- |
26 |
...-LU-3974-llite-invalidatepage-api-changed.patch | 2 +- |
27 |
13 files changed, 184 insertions(+), 132 deletions(-) |
28 |
|
29 |
diff --git a/sys-cluster/lustre/ChangeLog b/sys-cluster/lustre/ChangeLog |
30 |
index 9fefa38..73299e5 100644 |
31 |
--- a/sys-cluster/lustre/ChangeLog |
32 |
+++ b/sys-cluster/lustre/ChangeLog |
33 |
@@ -2,6 +2,21 @@ |
34 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
35 |
# $Header: $ |
36 |
|
37 |
+ 27 Feb 2014; Alexey Shvetsov <alexxy@g.o> |
38 |
+ files/0001-LU-2982-build-make-AC-check-for-linux-arch-sandbox-f.patch, |
39 |
+ files/0002-LU-3319-procfs-update-zfs-proc-handling-to-seq_files.patch, |
40 |
+ files/0003-LU-3319-procfs-move-mgs-proc-handling-to-seq_files.patch, |
41 |
+ files/0004-LU-3319-procfs-fix-symlink-handling.patch, |
42 |
+ files/0005-LU-3319-procfs-move-osp-proc-handling-to-seq_files.patch, |
43 |
+ files/0006-LU-3319-procfs-move-lod-proc-handling-to-seq_files.patch, |
44 |
+ files/0007-LU-3319-procfs-move-mdd-ofd-proc-handling-to-seq_fil.patch, |
45 |
+ files/0008-LU-3319-procfs-move-mdt-mds-proc-handling-to-seq_fil.patch, |
46 |
+ files/0009-LU-3319-procfs-update-ldiskfs-proc-handling-to-seq_f.patch, |
47 |
+ files/0010-LU-3319-lprocfs-client-side-cleanups.patch, |
48 |
+ files/0011-LU-3974-llite-use-new-struct-dir_context.patch, |
49 |
+ files/0012-LU-3974-llite-invalidatepage-api-changed.patch: |
50 |
+ Update patches |
51 |
+ |
52 |
12 Feb 2014; Alexey Shvetsov <alexxy@g.o> |
53 |
files/0011-LU-3974-llite-use-new-struct-dir_context.patch, |
54 |
files/0012-LU-3974-llite-invalidatepage-api-changed.patch: |
55 |
|
56 |
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 |
57 |
index caa6587..63fcb0a 100644 |
58 |
--- a/sys-cluster/lustre/files/0001-LU-2982-build-make-AC-check-for-linux-arch-sandbox-f.patch |
59 |
+++ b/sys-cluster/lustre/files/0001-LU-2982-build-make-AC-check-for-linux-arch-sandbox-f.patch |
60 |
@@ -1,4 +1,4 @@ |
61 |
-From 247c87f4a981fd26bfaf219930193b1a35865736 Mon Sep 17 00:00:00 2001 |
62 |
+From f384f155612fb8b3fa6a12c4c969e29629f82027 Mon Sep 17 00:00:00 2001 |
63 |
From: Alexey Shvetsov <alexxy@g.o> |
64 |
Date: Mon, 18 Mar 2013 16:22:27 +0400 |
65 |
Subject: [PATCH 01/12] LU-2982 build: make AC check for linux arch sandbox |
66 |
|
67 |
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 |
68 |
index 939f1fc..ff3c6bf 100644 |
69 |
--- a/sys-cluster/lustre/files/0002-LU-3319-procfs-update-zfs-proc-handling-to-seq_files.patch |
70 |
+++ b/sys-cluster/lustre/files/0002-LU-3319-procfs-update-zfs-proc-handling-to-seq_files.patch |
71 |
@@ -1,4 +1,4 @@ |
72 |
-From c05c0be01814527d8d3762963c7a6d4c28189d2d Mon Sep 17 00:00:00 2001 |
73 |
+From 699242b35f07c7c64959dca02cc359d389c7f568 Mon Sep 17 00:00:00 2001 |
74 |
From: James Simmons <uja.ornl@×××××.com> |
75 |
Date: Fri, 3 Jan 2014 09:55:26 -0500 |
76 |
Subject: [PATCH 02/12] LU-3319 procfs: update zfs proc handling to seq_files |
77 |
@@ -14,10 +14,10 @@ Change-Id: I6dc7e65c3e74e7934a17939815ec3c334fac58c7 |
78 |
3 files changed, 57 insertions(+), 47 deletions(-) |
79 |
|
80 |
diff --git a/lustre/osd-zfs/osd_handler.c b/lustre/osd-zfs/osd_handler.c |
81 |
-index d4193cd..36bf6a4 100644 |
82 |
+index 1025be9..c9bf49a 100644 |
83 |
--- a/lustre/osd-zfs/osd_handler.c |
84 |
+++ b/lustre/osd-zfs/osd_handler.c |
85 |
-@@ -745,6 +745,7 @@ static int osd_device_init(const struct lu_env *env, struct lu_device *d, |
86 |
+@@ -748,6 +748,7 @@ static int osd_device_init(const struct lu_env *env, struct lu_device *d, |
87 |
static int osd_process_config(const struct lu_env *env, |
88 |
struct lu_device *d, struct lustre_cfg *cfg) |
89 |
{ |
90 |
@@ -25,7 +25,7 @@ index d4193cd..36bf6a4 100644 |
91 |
struct osd_device *o = osd_dev(d); |
92 |
int rc; |
93 |
ENTRY; |
94 |
-@@ -758,12 +759,12 @@ static int osd_process_config(const struct lu_env *env, |
95 |
+@@ -761,12 +762,12 @@ static int osd_process_config(const struct lu_env *env, |
96 |
break; |
97 |
case LCFG_PARAM: { |
98 |
LASSERT(&o->od_dt_dev); |
99 |
@@ -43,7 +43,7 @@ index d4193cd..36bf6a4 100644 |
100 |
break; |
101 |
} |
102 |
default: |
103 |
-@@ -911,7 +912,7 @@ int __init osd_init(void) |
104 |
+@@ -914,7 +915,7 @@ int __init osd_init(void) |
105 |
|
106 |
rc = class_register_type(&osd_obd_device_ops, NULL, NULL, |
107 |
#ifndef HAVE_ONLY_PROCFS_SEQ |
108 |
|
109 |
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 |
110 |
index 756975e..38785b2 100644 |
111 |
--- a/sys-cluster/lustre/files/0003-LU-3319-procfs-move-mgs-proc-handling-to-seq_files.patch |
112 |
+++ b/sys-cluster/lustre/files/0003-LU-3319-procfs-move-mgs-proc-handling-to-seq_files.patch |
113 |
@@ -1,4 +1,4 @@ |
114 |
-From b262846027fbf96a5a80b81cfe86da53ce6e6f9f Mon Sep 17 00:00:00 2001 |
115 |
+From 44eb91a37b43a71a0d531359c9da082b6e1ec454 Mon Sep 17 00:00:00 2001 |
116 |
From: James Simmons <uja.ornl@×××××.com> |
117 |
Date: Fri, 3 Jan 2014 09:58:53 -0500 |
118 |
Subject: [PATCH 03/12] LU-3319 procfs: move mgs proc handling to seq_files |
119 |
|
120 |
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 |
121 |
index fc78c68..935325e 100644 |
122 |
--- a/sys-cluster/lustre/files/0004-LU-3319-procfs-fix-symlink-handling.patch |
123 |
+++ b/sys-cluster/lustre/files/0004-LU-3319-procfs-fix-symlink-handling.patch |
124 |
@@ -1,4 +1,4 @@ |
125 |
-From 8f24a0e29b5f4b18193742c9aecd960c6b6102ff Mon Sep 17 00:00:00 2001 |
126 |
+From 4bc21601224ea84152d9c3cc83eee33af8eb8cb2 Mon Sep 17 00:00:00 2001 |
127 |
From: James Simmons <uja.ornl@×××××.com> |
128 |
Date: Sun, 9 Feb 2014 09:37:44 -0500 |
129 |
Subject: [PATCH 04/12] LU-3319 procfs: fix symlink handling |
130 |
@@ -24,7 +24,7 @@ Signed-off-by: James Simmons <uja.ornl@×××××.com> |
131 |
4 files changed, 91 insertions(+), 90 deletions(-) |
132 |
|
133 |
diff --git a/lustre/include/obd.h b/lustre/include/obd.h |
134 |
-index c18052b..8fd2ce7 100644 |
135 |
+index ac80412..42266da 100644 |
136 |
--- a/lustre/include/obd.h |
137 |
+++ b/lustre/include/obd.h |
138 |
@@ -183,13 +183,15 @@ struct obd_info { |
139 |
@@ -59,10 +59,10 @@ index c18052b..8fd2ce7 100644 |
140 |
struct lprocfs_stats *obd_svc_stats; |
141 |
struct lprocfs_seq_vars *obd_vars; |
142 |
diff --git a/lustre/lmv/lmv_obd.c b/lustre/lmv/lmv_obd.c |
143 |
-index e0941c9..93db311 100644 |
144 |
+index ee5f3a7..66a9448 100644 |
145 |
--- a/lustre/lmv/lmv_obd.c |
146 |
+++ b/lustre/lmv/lmv_obd.c |
147 |
-@@ -242,9 +242,6 @@ static int lmv_connect(const struct lu_env *env, |
148 |
+@@ -263,9 +263,6 @@ static int lmv_connect(const struct lu_env *env, |
149 |
struct obd_uuid *cluuid, struct obd_connect_data *data, |
150 |
void *localdata) |
151 |
{ |
152 |
@@ -72,7 +72,7 @@ index e0941c9..93db311 100644 |
153 |
struct lmv_obd *lmv = &obd->u.lmv; |
154 |
struct lustre_handle conn = { 0 }; |
155 |
int rc = 0; |
156 |
-@@ -277,18 +274,15 @@ static int lmv_connect(const struct lu_env *env, |
157 |
+@@ -298,18 +295,15 @@ static int lmv_connect(const struct lu_env *env, |
158 |
lmv->conn_data = *data; |
159 |
|
160 |
#ifdef __KERNEL__ |
161 |
@@ -97,7 +97,7 @@ index e0941c9..93db311 100644 |
162 |
} |
163 |
#endif |
164 |
|
165 |
-@@ -302,10 +296,8 @@ static int lmv_connect(const struct lu_env *env, |
166 |
+@@ -323,10 +317,8 @@ static int lmv_connect(const struct lu_env *env, |
167 |
rc = lmv_check_connect(obd); |
168 |
|
169 |
#ifdef __KERNEL__ |
170 |
@@ -110,7 +110,7 @@ index e0941c9..93db311 100644 |
171 |
#endif |
172 |
RETURN(rc); |
173 |
} |
174 |
-@@ -384,9 +376,6 @@ static int lmv_init_ea_size(struct obd_export *exp, int easize, |
175 |
+@@ -405,9 +397,6 @@ static int lmv_init_ea_size(struct obd_export *exp, int easize, |
176 |
|
177 |
int lmv_connect_mdc(struct obd_device *obd, struct lmv_tgt_desc *tgt) |
178 |
{ |
179 |
@@ -120,7 +120,7 @@ index e0941c9..93db311 100644 |
180 |
struct lmv_obd *lmv = &obd->u.lmv; |
181 |
struct obd_uuid *cluuid = &lmv->cluuid; |
182 |
struct obd_uuid lmv_mdc_uuid = { "LMV_MDC_UUID" }; |
183 |
-@@ -466,14 +455,13 @@ int lmv_connect_mdc(struct obd_device *obd, struct lmv_tgt_desc *tgt) |
184 |
+@@ -487,14 +476,13 @@ int lmv_connect_mdc(struct obd_device *obd, struct lmv_tgt_desc *tgt) |
185 |
cfs_atomic_read(&obd->obd_refcount)); |
186 |
|
187 |
#ifdef __KERNEL__ |
188 |
@@ -137,7 +137,7 @@ index e0941c9..93db311 100644 |
189 |
"../../../%s/%s", |
190 |
mdc_obd->obd_type->typ_name, |
191 |
mdc_obd->obd_name); |
192 |
-@@ -482,8 +470,7 @@ int lmv_connect_mdc(struct obd_device *obd, struct lmv_tgt_desc *tgt) |
193 |
+@@ -503,8 +491,7 @@ int lmv_connect_mdc(struct obd_device *obd, struct lmv_tgt_desc *tgt) |
194 |
"/proc/fs/lustre/%s/%s/target_obds/%s.", |
195 |
obd->obd_type->typ_name, obd->obd_name, |
196 |
mdc_obd->obd_name); |
197 |
@@ -147,7 +147,7 @@ index e0941c9..93db311 100644 |
198 |
} |
199 |
} |
200 |
#endif |
201 |
-@@ -675,9 +662,6 @@ int lmv_check_connect(struct obd_device *obd) |
202 |
+@@ -696,9 +683,6 @@ int lmv_check_connect(struct obd_device *obd) |
203 |
|
204 |
static int lmv_disconnect_mdc(struct obd_device *obd, struct lmv_tgt_desc *tgt) |
205 |
{ |
206 |
@@ -157,7 +157,7 @@ index e0941c9..93db311 100644 |
207 |
struct lmv_obd *lmv = &obd->u.lmv; |
208 |
struct obd_device *mdc_obd; |
209 |
int rc; |
210 |
-@@ -695,9 +679,9 @@ static int lmv_disconnect_mdc(struct obd_device *obd, struct lmv_tgt_desc *tgt) |
211 |
+@@ -716,9 +700,9 @@ static int lmv_disconnect_mdc(struct obd_device *obd, struct lmv_tgt_desc *tgt) |
212 |
} |
213 |
|
214 |
#ifdef __KERNEL__ |
215 |
@@ -170,7 +170,7 @@ index e0941c9..93db311 100644 |
216 |
#endif |
217 |
rc = obd_fid_fini(tgt->ltd_exp->exp_obd); |
218 |
if (rc) |
219 |
-@@ -747,8 +731,8 @@ static int lmv_disconnect(struct obd_export *exp) |
220 |
+@@ -768,8 +752,8 @@ static int lmv_disconnect(struct obd_export *exp) |
221 |
} |
222 |
|
223 |
#ifdef __KERNEL__ |
224 |
@@ -331,7 +331,7 @@ index 286cd15..a3310fd 100644 |
225 |
rc = class_disconnect(exp); /* bz 9811 */ |
226 |
RETURN(rc); |
227 |
diff --git a/lustre/obdclass/genops.c b/lustre/obdclass/genops.c |
228 |
-index c9d8a4e..a4a981c 100644 |
229 |
+index 20cd0a0..00bf342 100644 |
230 |
--- a/lustre/obdclass/genops.c |
231 |
+++ b/lustre/obdclass/genops.c |
232 |
@@ -181,14 +181,15 @@ int class_register_type(struct obd_ops *dt_ops, struct md_ops *md_ops, |
233 |
|
234 |
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 |
235 |
index 7734600..2d5a974 100644 |
236 |
--- a/sys-cluster/lustre/files/0005-LU-3319-procfs-move-osp-proc-handling-to-seq_files.patch |
237 |
+++ b/sys-cluster/lustre/files/0005-LU-3319-procfs-move-osp-proc-handling-to-seq_files.patch |
238 |
@@ -1,4 +1,4 @@ |
239 |
-From cfafe91ff9caf648f144c1a162112b7d1485aae4 Mon Sep 17 00:00:00 2001 |
240 |
+From e9786df9c5618c2cff7d81088548fefee874468a Mon Sep 17 00:00:00 2001 |
241 |
From: James Simmons <uja.ornl@×××××.com> |
242 |
Date: Sun, 9 Feb 2014 17:10:18 -0500 |
243 |
Subject: [PATCH 05/12] LU-3319 procfs: move osp proc handling to seq_files |
244 |
@@ -624,10 +624,10 @@ index 75ebeb1..1ec40fc 100644 |
245 |
} |
246 |
|
247 |
diff --git a/lustre/osp/lwp_dev.c b/lustre/osp/lwp_dev.c |
248 |
-index 9560504..d6ae965 100644 |
249 |
+index dc4f978..b6e84e1 100644 |
250 |
--- a/lustre/osp/lwp_dev.c |
251 |
+++ b/lustre/osp/lwp_dev.c |
252 |
-@@ -186,25 +186,13 @@ const struct lu_device_operations lwp_lu_ops = { |
253 |
+@@ -184,25 +184,13 @@ const struct lu_device_operations lwp_lu_ops = { |
254 |
.ldo_process_config = lwp_process_config, |
255 |
}; |
256 |
|
257 |
@@ -654,7 +654,7 @@ index 9560504..d6ae965 100644 |
258 |
int rc; |
259 |
ENTRY; |
260 |
|
261 |
-@@ -233,8 +221,8 @@ int lwp_init0(const struct lu_env *env, struct lwp_device *lwp, |
262 |
+@@ -231,8 +219,8 @@ int lwp_init0(const struct lu_env *env, struct lwp_device *lwp, |
263 |
RETURN(rc); |
264 |
} |
265 |
|
266 |
@@ -666,10 +666,10 @@ index 9560504..d6ae965 100644 |
267 |
|
268 |
RETURN(0); |
269 |
diff --git a/lustre/osp/osp_dev.c b/lustre/osp/osp_dev.c |
270 |
-index 5828d88..7d45fa1 100644 |
271 |
+index a8d75ea..336b9f0 100644 |
272 |
--- a/lustre/osp/osp_dev.c |
273 |
+++ b/lustre/osp/osp_dev.c |
274 |
-@@ -371,7 +371,7 @@ static int osp_process_config(const struct lu_env *env, |
275 |
+@@ -366,7 +366,7 @@ static int osp_process_config(const struct lu_env *env, |
276 |
struct lu_device *dev, struct lustre_cfg *lcfg) |
277 |
{ |
278 |
struct osp_device *d = lu2osp_dev(dev); |
279 |
@@ -678,7 +678,7 @@ index 5828d88..7d45fa1 100644 |
280 |
int rc; |
281 |
|
282 |
ENTRY; |
283 |
-@@ -385,11 +385,9 @@ static int osp_process_config(const struct lu_env *env, |
284 |
+@@ -380,11 +380,9 @@ static int osp_process_config(const struct lu_env *env, |
285 |
rc = osp_shutdown(env, d); |
286 |
break; |
287 |
case LCFG_PARAM: |
288 |
@@ -693,7 +693,7 @@ index 5828d88..7d45fa1 100644 |
289 |
if (rc > 0) |
290 |
rc = 0; |
291 |
if (rc == -ENOSYS) { |
292 |
-@@ -842,6 +840,9 @@ static struct lu_device *osp_device_fini(const struct lu_env *env, |
293 |
+@@ -844,6 +842,9 @@ static struct lu_device *osp_device_fini(const struct lu_env *env, |
294 |
OBD_FREE_PTR(cli->cl_rpc_lock); |
295 |
cli->cl_rpc_lock = NULL; |
296 |
} |
297 |
@@ -703,7 +703,7 @@ index 5828d88..7d45fa1 100644 |
298 |
} |
299 |
|
300 |
rc = client_obd_cleanup(m->opd_obd); |
301 |
-@@ -1220,33 +1221,26 @@ struct llog_operations osp_mds_ost_orig_logops; |
302 |
+@@ -1233,33 +1234,26 @@ struct llog_operations osp_mds_ost_orig_logops; |
303 |
|
304 |
static int __init osp_mod_init(void) |
305 |
{ |
306 |
@@ -741,7 +741,7 @@ index 5828d88..7d45fa1 100644 |
307 |
#endif |
308 |
LUSTRE_LWP_NAME, &lwp_device_type); |
309 |
if (rc != 0) { |
310 |
-@@ -1260,21 +1254,23 @@ static int __init osp_mod_init(void) |
311 |
+@@ -1273,21 +1267,23 @@ static int __init osp_mod_init(void) |
312 |
osp_mds_ost_orig_logops.lop_add = llog_cat_add_rec; |
313 |
osp_mds_ost_orig_logops.lop_declare_add = llog_cat_declare_add_rec; |
314 |
|
315 |
@@ -775,10 +775,10 @@ index 5828d88..7d45fa1 100644 |
316 |
class_unregister_type(LUSTRE_OSP_NAME); |
317 |
lu_kmem_fini(osp_caches); |
318 |
diff --git a/lustre/osp/osp_internal.h b/lustre/osp/osp_internal.h |
319 |
-index 0871d8d..0cc608b 100644 |
320 |
+index 2af16c0..84eca11 100644 |
321 |
--- a/lustre/osp/osp_internal.h |
322 |
+++ b/lustre/osp/osp_internal.h |
323 |
-@@ -433,7 +433,6 @@ int osp_write_last_oid_seq_files(struct lu_env *env, struct osp_device *osp, |
324 |
+@@ -526,7 +526,6 @@ int osp_write_last_oid_seq_files(struct lu_env *env, struct osp_device *osp, |
325 |
int osp_init_pre_fid(struct osp_device *osp); |
326 |
|
327 |
/* lproc_osp.c */ |
328 |
@@ -786,7 +786,7 @@ index 0871d8d..0cc608b 100644 |
329 |
void osp_lprocfs_init(struct osp_device *osp); |
330 |
|
331 |
/* osp_sync.c */ |
332 |
-@@ -447,7 +446,6 @@ int osp_sync_fini(struct osp_device *d); |
333 |
+@@ -540,7 +539,6 @@ int osp_sync_fini(struct osp_device *d); |
334 |
void __osp_sync_check_for_work(struct osp_device *d); |
335 |
|
336 |
/* lwp_dev.c */ |
337 |
|
338 |
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 |
339 |
index 1ca6b12..06e3571 100644 |
340 |
--- a/sys-cluster/lustre/files/0006-LU-3319-procfs-move-lod-proc-handling-to-seq_files.patch |
341 |
+++ b/sys-cluster/lustre/files/0006-LU-3319-procfs-move-lod-proc-handling-to-seq_files.patch |
342 |
@@ -1,4 +1,4 @@ |
343 |
-From 82953bddbc3c7b9aa044d9eecc796bc12638f476 Mon Sep 17 00:00:00 2001 |
344 |
+From 2670599090a754d9fa8c7d952b530bc8fb88d56e Mon Sep 17 00:00:00 2001 |
345 |
From: James Simmons <uja.ornl@×××××.com> |
346 |
Date: Sun, 9 Feb 2014 11:08:45 -0500 |
347 |
Subject: [PATCH 06/12] LU-3319 procfs: move lod proc handling to seq_files |
348 |
@@ -17,10 +17,10 @@ Change-Id: Iaa0f617fcd430e91f12afbc0faf6906fd275a7a5 |
349 |
4 files changed, 152 insertions(+), 146 deletions(-) |
350 |
|
351 |
diff --git a/lustre/lod/lod_dev.c b/lustre/lod/lod_dev.c |
352 |
-index 02a1e1e..b0ad1fd 100644 |
353 |
+index a451462..8776aa3 100644 |
354 |
--- a/lustre/lod/lod_dev.c |
355 |
+++ b/lustre/lod/lod_dev.c |
356 |
-@@ -297,12 +297,10 @@ static int lod_process_config(const struct lu_env *env, |
357 |
+@@ -289,12 +289,10 @@ static int lod_process_config(const struct lu_env *env, |
358 |
} |
359 |
|
360 |
case LCFG_PARAM: { |
361 |
@@ -36,7 +36,7 @@ index 02a1e1e..b0ad1fd 100644 |
362 |
if (rc > 0) |
363 |
rc = 0; |
364 |
GOTO(out, rc); |
365 |
-@@ -916,19 +914,16 @@ static struct obd_ops lod_obd_device_ops = { |
366 |
+@@ -890,19 +888,16 @@ static struct obd_ops lod_obd_device_ops = { |
367 |
|
368 |
static int __init lod_mod_init(void) |
369 |
{ |
370 |
@@ -59,7 +59,7 @@ index 02a1e1e..b0ad1fd 100644 |
371 |
#endif |
372 |
LUSTRE_LOD_NAME, &lod_device_type); |
373 |
if (rc) { |
374 |
-@@ -937,23 +932,25 @@ static int __init lod_mod_init(void) |
375 |
+@@ -911,23 +906,25 @@ static int __init lod_mod_init(void) |
376 |
} |
377 |
|
378 |
/* create "lov" entry in procfs for compatibility purposes */ |
379 |
@@ -96,10 +96,10 @@ index 02a1e1e..b0ad1fd 100644 |
380 |
lu_kmem_fini(lod_caches); |
381 |
} |
382 |
diff --git a/lustre/lod/lod_internal.h b/lustre/lod/lod_internal.h |
383 |
-index 6d99ad5..9299a91 100644 |
384 |
+index 2a00890..65ba47a 100644 |
385 |
--- a/lustre/lod/lod_internal.h |
386 |
+++ b/lustre/lod/lod_internal.h |
387 |
-@@ -376,7 +376,6 @@ int qos_add_tgt(struct lod_device*, struct lod_tgt_desc *); |
388 |
+@@ -431,7 +431,6 @@ int qos_add_tgt(struct lod_device*, struct lod_tgt_desc *); |
389 |
int qos_del_tgt(struct lod_device *, struct lod_tgt_desc *); |
390 |
|
391 |
/* lproc_lod.c */ |
392 |
|
393 |
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 |
394 |
index 0e748e6..b2921fc 100644 |
395 |
--- a/sys-cluster/lustre/files/0007-LU-3319-procfs-move-mdd-ofd-proc-handling-to-seq_fil.patch |
396 |
+++ b/sys-cluster/lustre/files/0007-LU-3319-procfs-move-mdd-ofd-proc-handling-to-seq_fil.patch |
397 |
@@ -1,6 +1,6 @@ |
398 |
-From 2790709429e9aaf4b11fca12e3f2e9d70f6608ce Mon Sep 17 00:00:00 2001 |
399 |
-From: James Simmons <uja.ornl@×××××.com> |
400 |
-Date: Fri, 31 Jan 2014 14:00:32 -0500 |
401 |
+From 6af3bd54359520829a6199e81171fd849a6656f4 Mon Sep 17 00:00:00 2001 |
402 |
+From: Alexey Shvetsov <alexxy@g.o> |
403 |
+Date: Thu, 27 Feb 2014 16:06:08 +0400 |
404 |
Subject: [PATCH 07/12] LU-3319 procfs: move mdd/ofd proc handling to seq_files |
405 |
|
406 |
With 3.10 linux kernel and above proc handling now only |
407 |
@@ -9,14 +9,15 @@ layer proc entries over to using seq_files. |
408 |
|
409 |
Conflicts: |
410 |
lustre/mdd/mdd_lproc.c |
411 |
+ lustre/lfsck/lfsck_layout.c |
412 |
|
413 |
Signed-off-by: James Simmons <uja.ornl@×××××.com> |
414 |
-Change-Id: I61b7df6bfd5efd0f12e3ca1a1813b7b62d493168 |
415 |
Signed-off-by: Alexey Shvetsov <alexxy@g.o> |
416 |
+Change-Id: I61b7df6bfd5efd0f12e3ca1a1813b7b62d493168 |
417 |
--- |
418 |
lustre/include/lustre_lfsck.h | 6 +- |
419 |
lustre/lfsck/lfsck_internal.h | 9 +- |
420 |
- lustre/lfsck/lfsck_layout.c | 66 ++---- |
421 |
+ lustre/lfsck/lfsck_layout.c | 101 ++------- |
422 |
lustre/lfsck/lfsck_lib.c | 77 +++---- |
423 |
lustre/lfsck/lfsck_namespace.c | 75 ++----- |
424 |
lustre/mdd/mdd_device.c | 25 +-- |
425 |
@@ -28,13 +29,13 @@ Signed-off-by: Alexey Shvetsov <alexxy@g.o> |
426 |
lustre/ofd/ofd_internal.h | 6 +- |
427 |
lustre/osd-ldiskfs/osd_handler.c | 1 + |
428 |
lustre/osd-zfs/osd_handler.c | 1 + |
429 |
- 14 files changed, 462 insertions(+), 598 deletions(-) |
430 |
+ 14 files changed, 462 insertions(+), 633 deletions(-) |
431 |
|
432 |
diff --git a/lustre/include/lustre_lfsck.h b/lustre/include/lustre_lfsck.h |
433 |
-index 2e93420..0e578ac 100644 |
434 |
+index 1209bc2..bdb0955 100644 |
435 |
--- a/lustre/include/lustre_lfsck.h |
436 |
+++ b/lustre/include/lustre_lfsck.h |
437 |
-@@ -156,11 +156,11 @@ int lfsck_in_notify(const struct lu_env *env, struct dt_device *key, |
438 |
+@@ -158,12 +158,12 @@ int lfsck_in_notify(const struct lu_env *env, struct dt_device *key, |
439 |
int lfsck_query(const struct lu_env *env, struct dt_device *key, |
440 |
struct lfsck_request *lr); |
441 |
|
442 |
@@ -48,12 +49,13 @@ index 2e93420..0e578ac 100644 |
443 |
-int lfsck_dump(struct dt_device *key, void *buf, int len, enum lfsck_type type); |
444 |
+int lfsck_dump(struct seq_file *m, struct dt_device *key, enum lfsck_type type); |
445 |
|
446 |
- #endif /* _LUSTRE_LFSCK_H */ |
447 |
+ static inline void lfsck_pack_rfa(struct lfsck_request *lr, |
448 |
+ const struct lu_fid *fid) |
449 |
diff --git a/lustre/lfsck/lfsck_internal.h b/lustre/lfsck/lfsck_internal.h |
450 |
-index 01d3c60..fb98cf2 100644 |
451 |
+index 9f20729..48d3d82 100644 |
452 |
--- a/lustre/lfsck/lfsck_internal.h |
453 |
+++ b/lustre/lfsck/lfsck_internal.h |
454 |
-@@ -288,8 +288,7 @@ struct lfsck_operations { |
455 |
+@@ -293,8 +293,7 @@ struct lfsck_operations { |
456 |
|
457 |
int (*lfsck_dump)(const struct lu_env *env, |
458 |
struct lfsck_component *com, |
459 |
@@ -63,7 +65,7 @@ index 01d3c60..fb98cf2 100644 |
460 |
|
461 |
int (*lfsck_double_scan)(const struct lu_env *env, |
462 |
struct lfsck_component *com); |
463 |
-@@ -546,10 +545,10 @@ void lfsck_component_cleanup(const struct lu_env *env, |
464 |
+@@ -571,10 +570,10 @@ void lfsck_component_cleanup(const struct lu_env *env, |
465 |
struct lfsck_component *com); |
466 |
void lfsck_instance_cleanup(const struct lu_env *env, |
467 |
struct lfsck_instance *lfsck); |
468 |
@@ -78,10 +80,10 @@ index 01d3c60..fb98cf2 100644 |
469 |
void lfsck_pos_fill(const struct lu_env *env, struct lfsck_instance *lfsck, |
470 |
struct lfsck_position *pos, bool init); |
471 |
diff --git a/lustre/lfsck/lfsck_layout.c b/lustre/lfsck/lfsck_layout.c |
472 |
-index bdcd4c4..1295764 100644 |
473 |
+index f77ee87..27394e2 100644 |
474 |
--- a/lustre/lfsck/lfsck_layout.c |
475 |
+++ b/lustre/lfsck/lfsck_layout.c |
476 |
-@@ -2249,69 +2249,53 @@ static int lfsck_layout_slave_post(const struct lu_env *env, |
477 |
+@@ -3657,69 +3657,53 @@ static int lfsck_layout_slave_post(const struct lu_env *env, |
478 |
} |
479 |
|
480 |
static int lfsck_layout_dump(const struct lu_env *env, |
481 |
@@ -160,7 +162,7 @@ index bdcd4c4..1295764 100644 |
482 |
"repaired_dangling: "LPU64"\n" |
483 |
"repaired_unmatched_pair: "LPU64"\n" |
484 |
"repaired_multiple_referenced: "LPU64"\n" |
485 |
-@@ -2331,11 +2315,6 @@ static int lfsck_layout_dump(const struct lu_env *env, |
486 |
+@@ -3739,11 +3723,6 @@ static int lfsck_layout_dump(const struct lu_env *env, |
487 |
lo->ll_objs_skipped, |
488 |
lo->ll_objs_failed_phase1, |
489 |
lo->ll_objs_failed_phase2); |
490 |
@@ -172,7 +174,7 @@ index bdcd4c4..1295764 100644 |
491 |
|
492 |
if (lo->ll_status == LS_SCANNING_PHASE1) { |
493 |
__u64 pos; |
494 |
-@@ -2352,8 +2331,7 @@ static int lfsck_layout_dump(const struct lu_env *env, |
495 |
+@@ -3760,8 +3739,7 @@ static int lfsck_layout_dump(const struct lu_env *env, |
496 |
do_div(new_checked, duration); |
497 |
if (rtime != 0) |
498 |
do_div(speed, rtime); |
499 |
@@ -182,7 +184,7 @@ index bdcd4c4..1295764 100644 |
500 |
"checked_phase2: "LPU64"\n" |
501 |
"run_time_phase1: %u seconds\n" |
502 |
"run_time_phase2: %u seconds\n" |
503 |
-@@ -2367,11 +2345,6 @@ static int lfsck_layout_dump(const struct lu_env *env, |
504 |
+@@ -3775,11 +3753,6 @@ static int lfsck_layout_dump(const struct lu_env *env, |
505 |
lo->ll_run_time_phase2, |
506 |
speed, |
507 |
new_checked); |
508 |
@@ -194,7 +196,7 @@ index bdcd4c4..1295764 100644 |
509 |
|
510 |
LASSERT(lfsck->li_di_oit != NULL); |
511 |
|
512 |
-@@ -2384,12 +2357,7 @@ static int lfsck_layout_dump(const struct lu_env *env, |
513 |
+@@ -3792,47 +3765,7 @@ static int lfsck_layout_dump(const struct lu_env *env, |
514 |
pos = iops->store(env, lfsck->li_di_oit); |
515 |
if (!lfsck->li_current_oit_processed) |
516 |
pos--; |
517 |
@@ -204,11 +206,46 @@ index bdcd4c4..1295764 100644 |
518 |
- |
519 |
- buf += rc; |
520 |
- len -= rc; |
521 |
+- } else if (lo->ll_status == LS_SCANNING_PHASE2) { |
522 |
+- cfs_duration_t duration = cfs_time_current() - |
523 |
+- lfsck->li_time_last_checkpoint; |
524 |
+- __u64 checked = lo->ll_objs_checked_phase1 + com->lc_new_checked; |
525 |
+- __u64 speed = checked; |
526 |
+- __u64 new_checked = com->lc_new_checked * HZ; |
527 |
+- __u32 rtime = lo->ll_run_time_phase1 + |
528 |
+- cfs_duration_sec(duration + HALF_SEC); |
529 |
+- |
530 |
+- if (duration != 0) |
531 |
+- do_div(new_checked, duration); |
532 |
+- if (rtime != 0) |
533 |
+- do_div(speed, rtime); |
534 |
+- rc = snprintf(buf, len, |
535 |
+- "checked_phase1: "LPU64"\n" |
536 |
+- "checked_phase2: "LPU64"\n" |
537 |
+- "run_time_phase1: %u seconds\n" |
538 |
+- "run_time_phase2: %u seconds\n" |
539 |
+- "average_speed_phase1: "LPU64" items/sec\n" |
540 |
+- "average_speed_phase2: N/A\n" |
541 |
+- "real-time_speed_phase1: "LPU64" items/sec\n" |
542 |
+- "real-time_speed_phase2: N/A\n" |
543 |
+- "current_position: "DFID"\n", |
544 |
+- checked, |
545 |
+- lo->ll_objs_checked_phase2, |
546 |
+- rtime, |
547 |
+- lo->ll_run_time_phase2, |
548 |
+- speed, |
549 |
+- new_checked, |
550 |
+- PFID(&com->lc_fid_latest_scanned_phase2)); |
551 |
+- if (rc <= 0) |
552 |
+- goto out; |
553 |
+- |
554 |
+- buf += rc; |
555 |
+- len -= rc; |
556 |
+ seq_printf(m, "current_position: "LPU64"\n", pos); |
557 |
} else { |
558 |
- /* XXX: LS_SCANNING_PHASE2 will be handled in the future. */ |
559 |
__u64 speed1 = lo->ll_objs_checked_phase1; |
560 |
-@@ -2399,8 +2367,7 @@ static int lfsck_layout_dump(const struct lu_env *env, |
561 |
+ __u64 speed2 = lo->ll_objs_checked_phase2; |
562 |
+@@ -3841,8 +3774,7 @@ static int lfsck_layout_dump(const struct lu_env *env, |
563 |
do_div(speed1, lo->ll_run_time_phase1); |
564 |
if (lo->ll_run_time_phase2 != 0) |
565 |
do_div(speed2, lo->ll_run_time_phase2); |
566 |
@@ -218,7 +255,7 @@ index bdcd4c4..1295764 100644 |
567 |
"checked_phase2: "LPU64"\n" |
568 |
"run_time_phase1: %u seconds\n" |
569 |
"run_time_phase2: %u seconds\n" |
570 |
-@@ -2415,18 +2382,11 @@ static int lfsck_layout_dump(const struct lu_env *env, |
571 |
+@@ -3857,18 +3789,11 @@ static int lfsck_layout_dump(const struct lu_env *env, |
572 |
lo->ll_run_time_phase2, |
573 |
speed1, |
574 |
speed2); |
575 |
@@ -239,10 +276,10 @@ index bdcd4c4..1295764 100644 |
576 |
|
577 |
static int lfsck_layout_master_double_scan(const struct lu_env *env, |
578 |
diff --git a/lustre/lfsck/lfsck_lib.c b/lustre/lfsck/lfsck_lib.c |
579 |
-index 3eb3a02..b949b8d 100644 |
580 |
+index de7b849..d358ca1 100644 |
581 |
--- a/lustre/lfsck/lfsck_lib.c |
582 |
+++ b/lustre/lfsck/lfsck_lib.c |
583 |
-@@ -425,77 +425,52 @@ static inline int lfsck_instance_add(struct lfsck_instance *lfsck) |
584 |
+@@ -426,77 +426,52 @@ static inline int lfsck_instance_add(struct lfsck_instance *lfsck) |
585 |
return 0; |
586 |
} |
587 |
|
588 |
@@ -339,7 +376,7 @@ index 3eb3a02..b949b8d 100644 |
589 |
} |
590 |
|
591 |
void lfsck_pos_fill(const struct lu_env *env, struct lfsck_instance *lfsck, |
592 |
-@@ -1104,7 +1079,7 @@ int lfsck_async_request(const struct lu_env *env, struct obd_export *exp, |
593 |
+@@ -1149,7 +1124,7 @@ int lfsck_async_request(const struct lu_env *env, struct obd_export *exp, |
594 |
|
595 |
/* external interfaces */ |
596 |
|
597 |
@@ -348,7 +385,7 @@ index 3eb3a02..b949b8d 100644 |
598 |
{ |
599 |
struct lu_env env; |
600 |
struct lfsck_instance *lfsck; |
601 |
-@@ -1117,8 +1092,7 @@ int lfsck_get_speed(struct dt_device *key, void *buf, int len) |
602 |
+@@ -1162,8 +1137,7 @@ int lfsck_get_speed(struct dt_device *key, void *buf, int len) |
603 |
|
604 |
lfsck = lfsck_instance_find(key, true, false); |
605 |
if (likely(lfsck != NULL)) { |
606 |
@@ -358,7 +395,7 @@ index 3eb3a02..b949b8d 100644 |
607 |
lfsck_instance_put(&env, lfsck); |
608 |
} else { |
609 |
rc = -ENODEV; |
610 |
-@@ -1158,7 +1132,7 @@ int lfsck_set_speed(struct dt_device *key, int val) |
611 |
+@@ -1203,7 +1177,7 @@ int lfsck_set_speed(struct dt_device *key, int val) |
612 |
} |
613 |
EXPORT_SYMBOL(lfsck_set_speed); |
614 |
|
615 |
@@ -367,7 +404,7 @@ index 3eb3a02..b949b8d 100644 |
616 |
{ |
617 |
struct lu_env env; |
618 |
struct lfsck_instance *lfsck; |
619 |
-@@ -1171,8 +1145,7 @@ int lfsck_get_windows(struct dt_device *key, void *buf, int len) |
620 |
+@@ -1216,8 +1190,7 @@ int lfsck_get_windows(struct dt_device *key, void *buf, int len) |
621 |
|
622 |
lfsck = lfsck_instance_find(key, true, false); |
623 |
if (likely(lfsck != NULL)) { |
624 |
@@ -377,7 +414,7 @@ index 3eb3a02..b949b8d 100644 |
625 |
lfsck_instance_put(&env, lfsck); |
626 |
} else { |
627 |
rc = -ENODEV; |
628 |
-@@ -1222,7 +1195,7 @@ int lfsck_set_windows(struct dt_device *key, int val) |
629 |
+@@ -1267,7 +1240,7 @@ int lfsck_set_windows(struct dt_device *key, int val) |
630 |
} |
631 |
EXPORT_SYMBOL(lfsck_set_windows); |
632 |
|
633 |
@@ -386,7 +423,7 @@ index 3eb3a02..b949b8d 100644 |
634 |
{ |
635 |
struct lu_env env; |
636 |
struct lfsck_instance *lfsck; |
637 |
-@@ -1238,7 +1211,7 @@ int lfsck_dump(struct dt_device *key, void *buf, int len, enum lfsck_type type) |
638 |
+@@ -1283,7 +1256,7 @@ int lfsck_dump(struct dt_device *key, void *buf, int len, enum lfsck_type type) |
639 |
if (likely(lfsck != NULL)) { |
640 |
com = lfsck_component_find(lfsck, type); |
641 |
if (likely(com != NULL)) { |
642 |
@@ -619,10 +656,10 @@ index 40a4ee3..b0acecb 100644 |
643 |
LUSTRE_MDD_NAME, &mdd_device_type); |
644 |
if (rc) |
645 |
diff --git a/lustre/mdd/mdd_internal.h b/lustre/mdd/mdd_internal.h |
646 |
-index daa1dcb..5332b2c 100644 |
647 |
+index 0bfb2a2..bccef77 100644 |
648 |
--- a/lustre/mdd/mdd_internal.h |
649 |
+++ b/lustre/mdd/mdd_internal.h |
650 |
-@@ -340,7 +340,6 @@ int orph_declare_index_delete(const struct lu_env *, struct mdd_object *, |
651 |
+@@ -342,7 +342,6 @@ int orph_declare_index_delete(const struct lu_env *, struct mdd_object *, |
652 |
struct thandle *); |
653 |
|
654 |
/* mdd_lproc.c */ |
655 |
@@ -1047,7 +1084,7 @@ index de379b3..5714ee6 100644 |
656 |
} |
657 |
- |
658 |
diff --git a/lustre/obdclass/lprocfs_status.c b/lustre/obdclass/lprocfs_status.c |
659 |
-index 7cd7870..f9cb944 100644 |
660 |
+index 0ca58c5..5b72a5a 100644 |
661 |
--- a/lustre/obdclass/lprocfs_status.c |
662 |
+++ b/lustre/obdclass/lprocfs_status.c |
663 |
@@ -388,11 +388,10 @@ EXPORT_SYMBOL(lprocfs_evict_client_seq_write); |
664 |
@@ -1744,7 +1781,7 @@ index e303fd6..1759a7d 100644 |
665 |
{ |
666 |
LASSERT(stats && stats->ls_num >= LPROC_OFD_STATS_LAST); |
667 |
diff --git a/lustre/ofd/ofd_dev.c b/lustre/ofd/ofd_dev.c |
668 |
-index 6782e5d..1575972 100644 |
669 |
+index 9900bed..a9cc81f 100644 |
670 |
--- a/lustre/ofd/ofd_dev.c |
671 |
+++ b/lustre/ofd/ofd_dev.c |
672 |
@@ -240,8 +240,7 @@ static int ofd_process_config(const struct lu_env *env, struct lu_device *d, |
673 |
@@ -1767,7 +1804,7 @@ index 6782e5d..1575972 100644 |
674 |
d->ld_obd); |
675 |
if (rc > 0 || rc == -ENOSYS) { |
676 |
CDEBUG(D_CONFIG, "pass param %s down the stack.\n", |
677 |
-@@ -492,9 +490,10 @@ static struct lu_device_operations ofd_lu_ops = { |
678 |
+@@ -496,9 +494,10 @@ static struct lu_device_operations ofd_lu_ops = { |
679 |
.ldo_prepare = ofd_prepare, |
680 |
}; |
681 |
|
682 |
@@ -1779,7 +1816,7 @@ index 6782e5d..1575972 100644 |
683 |
struct obd_device *obd = ofd_obd(ofd); |
684 |
cfs_proc_dir_entry_t *entry; |
685 |
int rc = 0; |
686 |
-@@ -503,8 +502,8 @@ static int ofd_procfs_init(struct ofd_device *ofd) |
687 |
+@@ -507,8 +506,8 @@ static int ofd_procfs_init(struct ofd_device *ofd) |
688 |
|
689 |
/* lprocfs must be setup before the ofd so state can be safely added |
690 |
* to /proc incrementally as the ofd is setup */ |
691 |
@@ -1790,7 +1827,7 @@ index 6782e5d..1575972 100644 |
692 |
if (rc) { |
693 |
CERROR("%s: lprocfs_obd_setup failed: %d.\n", |
694 |
obd->obd_name, rc); |
695 |
-@@ -520,7 +519,7 @@ static int ofd_procfs_init(struct ofd_device *ofd) |
696 |
+@@ -524,7 +523,7 @@ static int ofd_procfs_init(struct ofd_device *ofd) |
697 |
|
698 |
obd->obd_uses_nid_stats = 1; |
699 |
|
700 |
@@ -1799,7 +1836,7 @@ index 6782e5d..1575972 100644 |
701 |
if (IS_ERR(entry)) { |
702 |
rc = PTR_ERR(entry); |
703 |
CERROR("%s: error %d setting up lprocfs for %s\n", |
704 |
-@@ -530,8 +529,10 @@ static int ofd_procfs_init(struct ofd_device *ofd) |
705 |
+@@ -534,8 +533,10 @@ static int ofd_procfs_init(struct ofd_device *ofd) |
706 |
obd->obd_proc_exports_entry = entry; |
707 |
|
708 |
entry = lprocfs_add_simple(obd->obd_proc_exports_entry, "clear", |
709 |
@@ -1812,7 +1849,7 @@ index 6782e5d..1575972 100644 |
710 |
if (IS_ERR(entry)) { |
711 |
rc = PTR_ERR(entry); |
712 |
CERROR("%s: add proc entry 'clear' failed: %d.\n", |
713 |
-@@ -547,7 +548,7 @@ static int ofd_procfs_init(struct ofd_device *ofd) |
714 |
+@@ -551,7 +552,7 @@ static int ofd_procfs_init(struct ofd_device *ofd) |
715 |
GOTO(remove_entry_clear, rc); |
716 |
RETURN(0); |
717 |
remove_entry_clear: |
718 |
@@ -1821,7 +1858,7 @@ index 6782e5d..1575972 100644 |
719 |
obd_cleanup: |
720 |
lprocfs_obd_cleanup(obd); |
721 |
lprocfs_free_obd_stats(obd); |
722 |
-@@ -560,29 +561,28 @@ static void ofd_procfs_add_brw_stats_symlink(struct ofd_device *ofd) |
723 |
+@@ -564,29 +565,28 @@ static void ofd_procfs_add_brw_stats_symlink(struct ofd_device *ofd) |
724 |
struct obd_device *obd = ofd_obd(ofd); |
725 |
struct obd_device *osd_obd = ofd->ofd_osd_exp->exp_obd; |
726 |
cfs_proc_dir_entry_t *osd_root = osd_obd->obd_type->typ_procroot; |
727 |
@@ -1856,7 +1893,7 @@ index 6782e5d..1575972 100644 |
728 |
lprocfs_add_symlink("writethrough_cache_enable", |
729 |
obd->obd_proc_entry, |
730 |
"../../%s/%s/writethrough_cache_enable", |
731 |
-@@ -593,13 +593,8 @@ static void ofd_procfs_fini(struct ofd_device *ofd) |
732 |
+@@ -597,13 +597,8 @@ static void ofd_procfs_fini(struct ofd_device *ofd) |
733 |
{ |
734 |
struct obd_device *obd = ofd_obd(ofd); |
735 |
|
736 |
@@ -1872,7 +1909,7 @@ index 6782e5d..1575972 100644 |
737 |
lprocfs_free_per_client_stats(obd); |
738 |
lprocfs_obd_cleanup(obd); |
739 |
lprocfs_free_obd_stats(obd); |
740 |
-@@ -2364,7 +2359,6 @@ static struct lu_device_type ofd_device_type = { |
741 |
+@@ -2368,7 +2363,6 @@ static struct lu_device_type ofd_device_type = { |
742 |
|
743 |
int __init ofd_init(void) |
744 |
{ |
745 |
@@ -1880,7 +1917,7 @@ index 6782e5d..1575972 100644 |
746 |
int rc; |
747 |
|
748 |
rc = lu_kmem_init(ofd_caches); |
749 |
-@@ -2377,11 +2371,9 @@ int __init ofd_init(void) |
750 |
+@@ -2381,11 +2375,9 @@ int __init ofd_init(void) |
751 |
return(rc); |
752 |
} |
753 |
|
754 |
@@ -1894,10 +1931,10 @@ index 6782e5d..1575972 100644 |
755 |
LUSTRE_OST_NAME, &ofd_device_type); |
756 |
return rc; |
757 |
diff --git a/lustre/ofd/ofd_internal.h b/lustre/ofd/ofd_internal.h |
758 |
-index b22ceec..79dfaa9 100644 |
759 |
+index ab041ce..60cfb50 100644 |
760 |
--- a/lustre/ofd/ofd_internal.h |
761 |
+++ b/lustre/ofd/ofd_internal.h |
762 |
-@@ -390,13 +390,9 @@ int ofd_txn_stop_cb(const struct lu_env *env, struct thandle *txn, |
763 |
+@@ -392,13 +392,9 @@ int ofd_txn_stop_cb(const struct lu_env *env, struct thandle *txn, |
764 |
|
765 |
/* lproc_ofd.c */ |
766 |
#ifdef LPROCFS |
767 |
@@ -1913,10 +1950,10 @@ index b22ceec..79dfaa9 100644 |
768 |
#endif |
769 |
|
770 |
diff --git a/lustre/osd-ldiskfs/osd_handler.c b/lustre/osd-ldiskfs/osd_handler.c |
771 |
-index 6f369d0..9027533 100644 |
772 |
+index a8022f0..4e1ec4a 100644 |
773 |
--- a/lustre/osd-ldiskfs/osd_handler.c |
774 |
+++ b/lustre/osd-ldiskfs/osd_handler.c |
775 |
-@@ -5882,6 +5882,7 @@ static int osd_obd_connect(const struct lu_env *env, struct obd_export **exp, |
776 |
+@@ -5892,6 +5892,7 @@ static int osd_obd_connect(const struct lu_env *env, struct obd_export **exp, |
777 |
osd->od_connects++; |
778 |
spin_unlock(&osd->od_osfs_lock); |
779 |
|
780 |
@@ -1925,10 +1962,10 @@ index 6f369d0..9027533 100644 |
781 |
} |
782 |
|
783 |
diff --git a/lustre/osd-zfs/osd_handler.c b/lustre/osd-zfs/osd_handler.c |
784 |
-index 36bf6a4..40d2c67 100644 |
785 |
+index c9bf49a..bd2463a 100644 |
786 |
--- a/lustre/osd-zfs/osd_handler.c |
787 |
+++ b/lustre/osd-zfs/osd_handler.c |
788 |
-@@ -813,6 +813,7 @@ static int osd_obd_connect(const struct lu_env *env, struct obd_export **exp, |
789 |
+@@ -816,6 +816,7 @@ static int osd_obd_connect(const struct lu_env *env, struct obd_export **exp, |
790 |
osd->od_connects++; |
791 |
spin_unlock(&osd->od_objset.lock); |
792 |
|
793 |
|
794 |
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 |
795 |
index a6a425b..c271eb7 100644 |
796 |
--- a/sys-cluster/lustre/files/0008-LU-3319-procfs-move-mdt-mds-proc-handling-to-seq_fil.patch |
797 |
+++ b/sys-cluster/lustre/files/0008-LU-3319-procfs-move-mdt-mds-proc-handling-to-seq_fil.patch |
798 |
@@ -1,4 +1,4 @@ |
799 |
-From 1013b4b997343de8530c4d4ef5380220d57f155a Mon Sep 17 00:00:00 2001 |
800 |
+From 9ab620dbc6aae86b9d39d97ba50912dc93b6e4e2 Mon Sep 17 00:00:00 2001 |
801 |
From: James Simmons <uja.ornl@×××××.com> |
802 |
Date: Sun, 9 Feb 2014 11:04:31 -0500 |
803 |
Subject: [PATCH 08/12] LU-3319 procfs: move mdt/mds proc handling to seq_files |
804 |
@@ -461,10 +461,10 @@ index 037bcbd..9bbcbd4 100644 |
805 |
{ 0 } |
806 |
}; |
807 |
diff --git a/lustre/mdt/mdt_handler.c b/lustre/mdt/mdt_handler.c |
808 |
-index 064fef1..c850356 100644 |
809 |
+index 17b7605..2b08be9 100644 |
810 |
--- a/lustre/mdt/mdt_handler.c |
811 |
+++ b/lustre/mdt/mdt_handler.c |
812 |
-@@ -4539,7 +4539,6 @@ static int mdt_process_config(const struct lu_env *env, |
813 |
+@@ -4584,7 +4584,6 @@ static int mdt_process_config(const struct lu_env *env, |
814 |
|
815 |
switch (cfg->lcfg_command) { |
816 |
case LCFG_PARAM: { |
817 |
@@ -472,7 +472,7 @@ index 064fef1..c850356 100644 |
818 |
struct obd_device *obd = d->ld_obd; |
819 |
|
820 |
/* For interoperability */ |
821 |
-@@ -4574,14 +4573,13 @@ static int mdt_process_config(const struct lu_env *env, |
822 |
+@@ -4619,14 +4618,13 @@ static int mdt_process_config(const struct lu_env *env, |
823 |
} |
824 |
} |
825 |
|
826 |
@@ -492,7 +492,7 @@ index 064fef1..c850356 100644 |
827 |
if (rc > 0 || rc == -ENOSYS) |
828 |
/* we don't understand; pass it on */ |
829 |
rc = next->ld_ops->ldo_process_config(env, next, |
830 |
-@@ -5762,7 +5760,6 @@ static struct lu_device_type mdt_device_type = { |
831 |
+@@ -5825,7 +5823,6 @@ static struct lu_device_type mdt_device_type = { |
832 |
|
833 |
static int __init mdt_mod_init(void) |
834 |
{ |
835 |
@@ -500,7 +500,7 @@ index 064fef1..c850356 100644 |
836 |
int rc; |
837 |
|
838 |
CLASSERT(sizeof("0x0123456789ABCDEF:0x01234567:0x01234567") == |
839 |
-@@ -5777,10 +5774,9 @@ static int __init mdt_mod_init(void) |
840 |
+@@ -5840,10 +5837,9 @@ static int __init mdt_mod_init(void) |
841 |
if (rc) |
842 |
GOTO(lu_fini, rc); |
843 |
|
844 |
@@ -578,10 +578,10 @@ index 1300861..3125dcc 100644 |
845 |
RETURN(rc); |
846 |
} |
847 |
diff --git a/lustre/mdt/mdt_internal.h b/lustre/mdt/mdt_internal.h |
848 |
-index d548988..e30d78d 100644 |
849 |
+index c3d4f7f..7b0381a 100644 |
850 |
--- a/lustre/mdt/mdt_internal.h |
851 |
+++ b/lustre/mdt/mdt_internal.h |
852 |
-@@ -784,9 +784,6 @@ void mdt_thread_info_init(struct ptlrpc_request *req, |
853 |
+@@ -787,9 +787,6 @@ void mdt_thread_info_init(struct ptlrpc_request *req, |
854 |
void mdt_thread_info_fini(struct mdt_thread_info *mti); |
855 |
struct mdt_thread_info *tsi2mdt_info(struct tgt_session_info *tsi); |
856 |
|
857 |
@@ -591,7 +591,7 @@ index d548988..e30d78d 100644 |
858 |
int mdt_hsm_attr_set(struct mdt_thread_info *info, struct mdt_object *obj, |
859 |
const struct md_hsm *mh); |
860 |
|
861 |
-@@ -919,13 +916,12 @@ int mdt_hsm_cdt_fini(struct mdt_device *mdt); |
862 |
+@@ -924,13 +921,12 @@ int mdt_hsm_cdt_fini(struct mdt_device *mdt); |
863 |
int mdt_hsm_cdt_wakeup(struct mdt_device *mdt); |
864 |
|
865 |
/* coordinator control /proc interface */ |
866 |
@@ -609,7 +609,7 @@ index d548988..e30d78d 100644 |
867 |
/* md_hsm helpers */ |
868 |
struct mdt_object *mdt_hsm_get_md_hsm(struct mdt_thread_info *mti, |
869 |
const struct lu_fid *fid, |
870 |
-@@ -1065,8 +1061,6 @@ enum { |
871 |
+@@ -1070,8 +1066,6 @@ enum { |
872 |
}; |
873 |
void mdt_counter_incr(struct ptlrpc_request *req, int opcode); |
874 |
void mdt_stats_counter_init(struct lprocfs_stats *stats); |
875 |
|
876 |
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 |
877 |
index 97b8e0e..7f9d4d7 100644 |
878 |
--- a/sys-cluster/lustre/files/0009-LU-3319-procfs-update-ldiskfs-proc-handling-to-seq_f.patch |
879 |
+++ b/sys-cluster/lustre/files/0009-LU-3319-procfs-update-ldiskfs-proc-handling-to-seq_f.patch |
880 |
@@ -1,4 +1,4 @@ |
881 |
-From adf3be9fe382564c4760b83a5843b7d5502bbe48 Mon Sep 17 00:00:00 2001 |
882 |
+From 98a6eee60a100d445d7533eeba907e4e75c36f18 Mon Sep 17 00:00:00 2001 |
883 |
From: James Simmons <uja.ornl@×××××.com> |
884 |
Date: Sun, 9 Feb 2014 10:45:37 -0500 |
885 |
Subject: [PATCH 09/12] LU-3319 procfs: update ldiskfs proc handling to |
886 |
@@ -19,10 +19,10 @@ Change-Id: Ia296a4682e2feda02bcfbe0100de8a89404cd731 |
887 |
5 files changed, 220 insertions(+), 217 deletions(-) |
888 |
|
889 |
diff --git a/lustre/osd-ldiskfs/osd_compat.c b/lustre/osd-ldiskfs/osd_compat.c |
890 |
-index b4a018c..6ca1304 100644 |
891 |
+index e693e8d..3fb6783 100644 |
892 |
--- a/lustre/osd-ldiskfs/osd_compat.c |
893 |
+++ b/lustre/osd-ldiskfs/osd_compat.c |
894 |
-@@ -1168,7 +1168,7 @@ int osd_obj_spec_update(struct osd_thread_info *info, struct osd_device *osd, |
895 |
+@@ -1164,7 +1164,7 @@ int osd_obj_spec_update(struct osd_thread_info *info, struct osd_device *osd, |
896 |
handle_t *th) |
897 |
{ |
898 |
struct dentry *root; |
899 |
@@ -31,7 +31,7 @@ index b4a018c..6ca1304 100644 |
900 |
int rc; |
901 |
ENTRY; |
902 |
|
903 |
-@@ -1189,7 +1189,7 @@ int osd_obj_spec_insert(struct osd_thread_info *info, struct osd_device *osd, |
904 |
+@@ -1185,7 +1185,7 @@ int osd_obj_spec_insert(struct osd_thread_info *info, struct osd_device *osd, |
905 |
handle_t *th) |
906 |
{ |
907 |
struct dentry *root; |
908 |
@@ -40,7 +40,7 @@ index b4a018c..6ca1304 100644 |
909 |
int rc; |
910 |
ENTRY; |
911 |
|
912 |
-@@ -1211,7 +1211,7 @@ int osd_obj_spec_lookup(struct osd_thread_info *info, struct osd_device *osd, |
913 |
+@@ -1207,7 +1207,7 @@ int osd_obj_spec_lookup(struct osd_thread_info *info, struct osd_device *osd, |
914 |
struct dentry *root; |
915 |
struct dentry *dentry; |
916 |
struct inode *inode; |
917 |
@@ -50,10 +50,10 @@ index b4a018c..6ca1304 100644 |
918 |
ENTRY; |
919 |
|
920 |
diff --git a/lustre/osd-ldiskfs/osd_handler.c b/lustre/osd-ldiskfs/osd_handler.c |
921 |
-index 9027533..dfaa542 100644 |
922 |
+index 4e1ec4a..1d9a2ba 100644 |
923 |
--- a/lustre/osd-ldiskfs/osd_handler.c |
924 |
+++ b/lustre/osd-ldiskfs/osd_handler.c |
925 |
-@@ -5814,6 +5814,7 @@ static struct lu_device *osd_device_free(const struct lu_env *env, |
926 |
+@@ -5824,6 +5824,7 @@ static struct lu_device *osd_device_free(const struct lu_env *env, |
927 |
static int osd_process_config(const struct lu_env *env, |
928 |
struct lu_device *d, struct lustre_cfg *cfg) |
929 |
{ |
930 |
@@ -61,7 +61,7 @@ index 9027533..dfaa542 100644 |
931 |
struct osd_device *o = osd_dev(d); |
932 |
int rc; |
933 |
ENTRY; |
934 |
-@@ -5828,12 +5829,12 @@ static int osd_process_config(const struct lu_env *env, |
935 |
+@@ -5838,12 +5839,12 @@ static int osd_process_config(const struct lu_env *env, |
936 |
break; |
937 |
case LCFG_PARAM: |
938 |
LASSERT(&o->od_dt_dev); |
939 |
@@ -79,7 +79,7 @@ index 9027533..dfaa542 100644 |
940 |
break; |
941 |
default: |
942 |
rc = -ENOSYS; |
943 |
-@@ -5981,9 +5982,10 @@ static int __init osd_mod_init(void) |
944 |
+@@ -5991,9 +5992,10 @@ static int __init osd_mod_init(void) |
945 |
if (rc) |
946 |
return rc; |
947 |
|
948 |
@@ -93,10 +93,10 @@ index 9027533..dfaa542 100644 |
949 |
LUSTRE_OSD_LDISKFS_NAME, &osd_device_type); |
950 |
if (rc) |
951 |
diff --git a/lustre/osd-ldiskfs/osd_internal.h b/lustre/osd-ldiskfs/osd_internal.h |
952 |
-index 8436d1f..c90147f 100644 |
953 |
+index dc52885..7d54162 100644 |
954 |
--- a/lustre/osd-ldiskfs/osd_internal.h |
955 |
+++ b/lustre/osd-ldiskfs/osd_internal.h |
956 |
-@@ -623,8 +623,8 @@ static inline int __osd_xattr_set(struct osd_thread_info *info, |
957 |
+@@ -616,8 +616,8 @@ static inline int __osd_xattr_set(struct osd_thread_info *info, |
958 |
|
959 |
#ifdef LPROCFS |
960 |
/* osd_lproc.c */ |
961 |
@@ -107,7 +107,7 @@ index 8436d1f..c90147f 100644 |
962 |
int osd_procfs_init(struct osd_device *osd, const char *name); |
963 |
int osd_procfs_fini(struct osd_device *osd); |
964 |
void osd_brw_stats_update(struct osd_device *osd, struct osd_iobuf *iobuf); |
965 |
-@@ -679,7 +679,7 @@ int osd_oii_insert(struct osd_device *dev, struct osd_idmap_cache *oic, |
966 |
+@@ -672,7 +672,7 @@ int osd_oii_insert(struct osd_device *dev, struct osd_idmap_cache *oic, |
967 |
int insert); |
968 |
int osd_oii_lookup(struct osd_device *dev, const struct lu_fid *fid, |
969 |
struct osd_inode_id *id); |
970 |
@@ -602,10 +602,10 @@ index b9b4e3d..947a4b9 100644 |
971 |
+} |
972 |
#endif |
973 |
diff --git a/lustre/osd-ldiskfs/osd_scrub.c b/lustre/osd-ldiskfs/osd_scrub.c |
974 |
-index cce33af..1002913 100644 |
975 |
+index e558163..b5b91c8 100644 |
976 |
--- a/lustre/osd-ldiskfs/osd_scrub.c |
977 |
+++ b/lustre/osd-ldiskfs/osd_scrub.c |
978 |
-@@ -2578,80 +2578,69 @@ static const char *scrub_param_names[] = { |
979 |
+@@ -2551,80 +2551,69 @@ static const char *scrub_param_names[] = { |
980 |
NULL |
981 |
}; |
982 |
|
983 |
@@ -700,7 +700,7 @@ index cce33af..1002913 100644 |
984 |
"name: OI_scrub\n" |
985 |
"magic: 0x%x\n" |
986 |
"oi_files: %d\n" |
987 |
-@@ -2661,51 +2650,48 @@ int osd_scrub_dump(struct osd_device *dev, char *buf, int len) |
988 |
+@@ -2634,51 +2623,48 @@ int osd_scrub_dump(struct osd_device *dev, char *buf, int len) |
989 |
if (rc <= 0) |
990 |
goto out; |
991 |
|
992 |
@@ -761,7 +761,7 @@ index cce33af..1002913 100644 |
993 |
"updated: "LPU64"\n" |
994 |
"failed: "LPU64"\n" |
995 |
"prior_updated: "LPU64"\n" |
996 |
-@@ -2718,8 +2704,6 @@ int osd_scrub_dump(struct osd_device *dev, char *buf, int len) |
997 |
+@@ -2691,8 +2677,6 @@ int osd_scrub_dump(struct osd_device *dev, char *buf, int len) |
998 |
if (rc <= 0) |
999 |
goto out; |
1000 |
|
1001 |
@@ -770,7 +770,7 @@ index cce33af..1002913 100644 |
1002 |
speed = checked; |
1003 |
if (thread_is_running(&scrub->os_thread)) { |
1004 |
cfs_duration_t duration = cfs_time_current() - |
1005 |
-@@ -2732,8 +2716,7 @@ int osd_scrub_dump(struct osd_device *dev, char *buf, int len) |
1006 |
+@@ -2705,8 +2689,7 @@ int osd_scrub_dump(struct osd_device *dev, char *buf, int len) |
1007 |
do_div(new_checked, duration); |
1008 |
if (rtime != 0) |
1009 |
do_div(speed, rtime); |
1010 |
@@ -780,7 +780,7 @@ index cce33af..1002913 100644 |
1011 |
"average_speed: "LPU64" objects/sec\n" |
1012 |
"real-time_speed: "LPU64" objects/sec\n" |
1013 |
"current_position: %u\n" |
1014 |
-@@ -2746,8 +2729,7 @@ int osd_scrub_dump(struct osd_device *dev, char *buf, int len) |
1015 |
+@@ -2719,8 +2702,7 @@ int osd_scrub_dump(struct osd_device *dev, char *buf, int len) |
1016 |
} else { |
1017 |
if (sf->sf_run_time != 0) |
1018 |
do_div(speed, sf->sf_run_time); |
1019 |
@@ -790,7 +790,7 @@ index cce33af..1002913 100644 |
1020 |
"average_speed: "LPU64" objects/sec\n" |
1021 |
"real-time_speed: N/A\n" |
1022 |
"current_position: N/A\n" |
1023 |
-@@ -2759,10 +2741,7 @@ int osd_scrub_dump(struct osd_device *dev, char *buf, int len) |
1024 |
+@@ -2732,10 +2714,7 @@ int osd_scrub_dump(struct osd_device *dev, char *buf, int len) |
1025 |
} |
1026 |
if (rc <= 0) |
1027 |
goto out; |
1028 |
|
1029 |
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 |
1030 |
index 1eed584..b076a3a 100644 |
1031 |
--- a/sys-cluster/lustre/files/0010-LU-3319-lprocfs-client-side-cleanups.patch |
1032 |
+++ b/sys-cluster/lustre/files/0010-LU-3319-lprocfs-client-side-cleanups.patch |
1033 |
@@ -1,4 +1,4 @@ |
1034 |
-From cd81037fa6ecc7f6b36d3c49205a3d6f3e7aa0de Mon Sep 17 00:00:00 2001 |
1035 |
+From 48d1258335516d5335567f11f5be91ceafbbac4e Mon Sep 17 00:00:00 2001 |
1036 |
From: James Simmons <uja.ornl@×××××.com> |
1037 |
Date: Tue, 21 Jan 2014 12:06:59 -0500 |
1038 |
Subject: [PATCH 10/12] LU-3319 lprocfs: client side cleanups |
1039 |
@@ -251,10 +251,10 @@ index 648b6e5..f818def 100644 |
1040 |
}; |
1041 |
#endif /* LPROCFS */ |
1042 |
diff --git a/lustre/obdclass/lprocfs_status.c b/lustre/obdclass/lprocfs_status.c |
1043 |
-index f9cb944..abe5d71 100644 |
1044 |
+index 5b72a5a..551f629 100644 |
1045 |
--- a/lustre/obdclass/lprocfs_status.c |
1046 |
+++ b/lustre/obdclass/lprocfs_status.c |
1047 |
-@@ -2581,7 +2581,6 @@ void lprocfs_init_ldlm_stats(struct lprocfs_stats *ldlm_stats) |
1048 |
+@@ -2583,7 +2583,6 @@ void lprocfs_init_ldlm_stats(struct lprocfs_stats *ldlm_stats) |
1049 |
EXPORT_SYMBOL(lprocfs_init_ldlm_stats); |
1050 |
|
1051 |
#ifdef HAVE_SERVER_SUPPORT |
1052 |
@@ -395,7 +395,7 @@ index b9d1b71..f95fb55 100644 |
1053 |
|
1054 |
static int osc_process_config(struct obd_device *obd, obd_count len, void *buf) |
1055 |
diff --git a/lustre/ost/ost_handler.c b/lustre/ost/ost_handler.c |
1056 |
-index d4da00d..d20a30f 100644 |
1057 |
+index a39381f..d5458b2 100644 |
1058 |
--- a/lustre/ost/ost_handler.c |
1059 |
+++ b/lustre/ost/ost_handler.c |
1060 |
@@ -75,7 +75,8 @@ static struct cfs_cpt_table *ost_io_cptable; |
1061 |
|
1062 |
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 |
1063 |
index 6f9b651..5b3983d 100644 |
1064 |
--- a/sys-cluster/lustre/files/0011-LU-3974-llite-use-new-struct-dir_context.patch |
1065 |
+++ b/sys-cluster/lustre/files/0011-LU-3974-llite-use-new-struct-dir_context.patch |
1066 |
@@ -1,4 +1,4 @@ |
1067 |
-From 5d386e041277db90dc2dc8c890d0f90705e443a7 Mon Sep 17 00:00:00 2001 |
1068 |
+From b3af9f9fde020df881b52b059a9e0d5d2c6ccfb9 Mon Sep 17 00:00:00 2001 |
1069 |
From: James Simmons <uja.ornl@×××××.com> |
1070 |
Date: Mon, 20 Jan 2014 21:23:00 -0500 |
1071 |
Subject: [PATCH 11/12] LU-3974 llite: use new struct dir_context |
1072 |
@@ -61,7 +61,7 @@ index e6207c9..f44a277 100644 |
1073 |
LC_HAVE_DCOUNT |
1074 |
|
1075 |
diff --git a/lustre/llite/dir.c b/lustre/llite/dir.c |
1076 |
-index dc5d623..eb09ef8 100644 |
1077 |
+index 6a1e3c5..05639f0 100644 |
1078 |
--- a/lustre/llite/dir.c |
1079 |
+++ b/lustre/llite/dir.c |
1080 |
@@ -195,9 +195,16 @@ struct lu_dirent *ll_dir_entry_next(struct inode *dir, |
1081 |
@@ -149,7 +149,7 @@ index dc5d623..eb09ef8 100644 |
1082 |
ll_finish_md_op_data(op_data); |
1083 |
filp->f_version = inode->i_version; |
1084 |
#ifdef HAVE_TOUCH_ATIME_1ARG |
1085 |
-@@ -1702,11 +1728,15 @@ int ll_dir_release(struct inode *inode, struct file *file) |
1086 |
+@@ -1809,11 +1835,15 @@ int ll_dir_release(struct inode *inode, struct file *file) |
1087 |
} |
1088 |
|
1089 |
struct file_operations ll_dir_operations = { |
1090 |
@@ -173,10 +173,10 @@ index dc5d623..eb09ef8 100644 |
1091 |
+ .fsync = ll_fsync, |
1092 |
}; |
1093 |
diff --git a/lustre/llite/llite_internal.h b/lustre/llite/llite_internal.h |
1094 |
-index 92b278e..c477b4c 100644 |
1095 |
+index 59ecdfb..148f6fa 100644 |
1096 |
--- a/lustre/llite/llite_internal.h |
1097 |
+++ b/lustre/llite/llite_internal.h |
1098 |
-@@ -91,9 +91,12 @@ extern struct file_operations ll_pgcache_seq_fops; |
1099 |
+@@ -92,9 +92,12 @@ extern struct file_operations ll_pgcache_seq_fops; |
1100 |
#define REMOTE_PERM_HASHSIZE 16 |
1101 |
|
1102 |
struct ll_getname_data { |
1103 |
@@ -192,7 +192,7 @@ index 92b278e..c477b4c 100644 |
1104 |
}; |
1105 |
|
1106 |
/* llite setxid/access permission for user on remote client */ |
1107 |
-@@ -719,8 +722,13 @@ static void ll_stats_ops_tally(struct ll_sb_info *sbi, int op, int count) {} |
1108 |
+@@ -726,8 +729,13 @@ static void ll_stats_ops_tally(struct ll_sb_info *sbi, int op, int count) {} |
1109 |
/* llite/dir.c */ |
1110 |
extern struct file_operations ll_dir_operations; |
1111 |
extern struct inode_operations ll_dir_inode_operations; |
1112 |
@@ -207,10 +207,10 @@ index 92b278e..c477b4c 100644 |
1113 |
|
1114 |
struct lu_dirent *ll_dir_entry_start(struct inode *dir, |
1115 |
diff --git a/lustre/llite/llite_nfs.c b/lustre/llite/llite_nfs.c |
1116 |
-index 68616e9..faad453 100644 |
1117 |
+index f96d17e..713e846 100644 |
1118 |
--- a/lustre/llite/llite_nfs.c |
1119 |
+++ b/lustre/llite/llite_nfs.c |
1120 |
-@@ -236,7 +236,14 @@ static int ll_get_name(struct dentry *dentry, char *name, |
1121 |
+@@ -230,7 +230,14 @@ static int ll_get_name(struct dentry *dentry, char *name, |
1122 |
struct dentry *child) |
1123 |
{ |
1124 |
struct inode *dir = dentry->d_inode; |
1125 |
@@ -226,7 +226,7 @@ index 68616e9..faad453 100644 |
1126 |
struct md_op_data *op_data; |
1127 |
int rc; |
1128 |
ENTRY; |
1129 |
-@@ -247,10 +254,6 @@ static int ll_get_name(struct dentry *dentry, char *name, |
1130 |
+@@ -241,10 +248,6 @@ static int ll_get_name(struct dentry *dentry, char *name, |
1131 |
if (!dir->i_fop) |
1132 |
GOTO(out, rc = -EINVAL); |
1133 |
|
1134 |
@@ -237,7 +237,7 @@ index 68616e9..faad453 100644 |
1135 |
op_data = ll_prep_md_op_data(NULL, dir, dir, NULL, 0, 0, |
1136 |
LUSTRE_OPC_ANY, dir); |
1137 |
if (IS_ERR(op_data)) |
1138 |
-@@ -260,7 +263,11 @@ static int ll_get_name(struct dentry *dentry, char *name, |
1139 |
+@@ -254,7 +257,11 @@ static int ll_get_name(struct dentry *dentry, char *name, |
1140 |
op_data->op_max_pages = |
1141 |
ll_i2sbi(dir)->ll_md_brw_size >> PAGE_CACHE_SHIFT; |
1142 |
mutex_lock(&dir->i_mutex); |
1143 |
|
1144 |
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 |
1145 |
index 21584ac..90e558e 100644 |
1146 |
--- a/sys-cluster/lustre/files/0012-LU-3974-llite-invalidatepage-api-changed.patch |
1147 |
+++ b/sys-cluster/lustre/files/0012-LU-3974-llite-invalidatepage-api-changed.patch |
1148 |
@@ -1,4 +1,4 @@ |
1149 |
-From 9ade0a01cf77e4ec0cbe26cd38c9c32d727fa74e Mon Sep 17 00:00:00 2001 |
1150 |
+From 95cacafafbc5bc0ec28bbf7898df28bb0f0295e6 Mon Sep 17 00:00:00 2001 |
1151 |
From: James Simmons <uja.ornl@×××××.com> |
1152 |
Date: Tue, 24 Sep 2013 12:29:47 -0400 |
1153 |
Subject: [PATCH 12/12] LU-3974 llite: invalidatepage api changed |