X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fobdclass%2Fscrub.c;h=fabb7bf64b39ca962586cd5acbbb6d913f440a39;hp=24cb64097db50f8f7d2bb0daa77987e92401369d;hb=ebc793d7d4407177a7876e03776fc3727c174ff1;hpb=a114f6b8c52bb97dcad093e5cb32b903ae9f602f

diff --git a/lustre/obdclass/scrub.c b/lustre/obdclass/scrub.c
index 24cb640..fabb7bf 100644
--- a/lustre/obdclass/scrub.c
+++ b/lustre/obdclass/scrub.c
@@ -41,7 +41,8 @@
 
 static inline struct dt_device *scrub_obj2dev(struct dt_object *obj)
 {
-	return container_of0(obj->do_lu.lo_dev, struct dt_device, dd_lu_dev);
+	return container_of_safe(obj->do_lu.lo_dev, struct dt_device,
+				 dd_lu_dev);
 }
 
 static void scrub_file_to_cpu(struct scrub_file *des, struct scrub_file *src)
@@ -375,7 +376,7 @@ static void scrub_bits_dump(struct seq_file *m, int bits, const char *names[],
 
 	seq_printf(m, "%s:%c", prefix, bits != 0 ? ' ' : '\n');
 
-	for (i = 0, flag = 1; bits != 0; i++, flag = 1 << i) {
+	for (i = 0, flag = 1; bits != 0; i++, flag = BIT(i)) {
 		if (flag & bits) {
 			bits &= ~flag;
 			seq_printf(m, "%s%c", names[i],