Skip to content

Commit c1d4518

Browse files
Fabian Fredericktorvalds
authored andcommitted
fs/dlm/debug_fs.c: replace seq_printf by seq_puts
Replace seq_printf where possible. This patch also fixes the following checkpatch warning "unnecessary whitespace before a quoted newline" Signed-off-by: Fabian Frederick <[email protected]> Cc: Christine Caulfield <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
1 parent 6edb568 commit c1d4518

File tree

1 file changed

+17
-17
lines changed

1 file changed

+17
-17
lines changed

fs/dlm/debug_fs.c

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ static int print_format1_lock(struct seq_file *s, struct dlm_lkb *lkb,
6868
if (lkb->lkb_wait_type)
6969
seq_printf(s, " wait_type: %d", lkb->lkb_wait_type);
7070

71-
return seq_printf(s, "\n");
71+
return seq_puts(s, "\n");
7272
}
7373

7474
static int print_format1(struct dlm_rsb *res, struct seq_file *s)
@@ -92,31 +92,31 @@ static int print_format1(struct dlm_rsb *res, struct seq_file *s)
9292
}
9393

9494
if (res->res_nodeid > 0)
95-
rv = seq_printf(s, "\" \nLocal Copy, Master is node %d\n",
95+
rv = seq_printf(s, "\"\nLocal Copy, Master is node %d\n",
9696
res->res_nodeid);
9797
else if (res->res_nodeid == 0)
98-
rv = seq_printf(s, "\" \nMaster Copy\n");
98+
rv = seq_puts(s, "\"\nMaster Copy\n");
9999
else if (res->res_nodeid == -1)
100-
rv = seq_printf(s, "\" \nLooking up master (lkid %x)\n",
100+
rv = seq_printf(s, "\"\nLooking up master (lkid %x)\n",
101101
res->res_first_lkid);
102102
else
103-
rv = seq_printf(s, "\" \nInvalid master %d\n",
103+
rv = seq_printf(s, "\"\nInvalid master %d\n",
104104
res->res_nodeid);
105105
if (rv)
106106
goto out;
107107

108108
/* Print the LVB: */
109109
if (res->res_lvbptr) {
110-
seq_printf(s, "LVB: ");
110+
seq_puts(s, "LVB: ");
111111
for (i = 0; i < lvblen; i++) {
112112
if (i == lvblen / 2)
113-
seq_printf(s, "\n ");
113+
seq_puts(s, "\n ");
114114
seq_printf(s, "%02x ",
115115
(unsigned char) res->res_lvbptr[i]);
116116
}
117117
if (rsb_flag(res, RSB_VALNOTVALID))
118-
seq_printf(s, " (INVALID)");
119-
rv = seq_printf(s, "\n");
118+
seq_puts(s, " (INVALID)");
119+
rv = seq_puts(s, "\n");
120120
if (rv)
121121
goto out;
122122
}
@@ -133,21 +133,21 @@ static int print_format1(struct dlm_rsb *res, struct seq_file *s)
133133
}
134134

135135
/* Print the locks attached to this resource */
136-
seq_printf(s, "Granted Queue\n");
136+
seq_puts(s, "Granted Queue\n");
137137
list_for_each_entry(lkb, &res->res_grantqueue, lkb_statequeue) {
138138
rv = print_format1_lock(s, lkb, res);
139139
if (rv)
140140
goto out;
141141
}
142142

143-
seq_printf(s, "Conversion Queue\n");
143+
seq_puts(s, "Conversion Queue\n");
144144
list_for_each_entry(lkb, &res->res_convertqueue, lkb_statequeue) {
145145
rv = print_format1_lock(s, lkb, res);
146146
if (rv)
147147
goto out;
148148
}
149149

150-
seq_printf(s, "Waiting Queue\n");
150+
seq_puts(s, "Waiting Queue\n");
151151
list_for_each_entry(lkb, &res->res_waitqueue, lkb_statequeue) {
152152
rv = print_format1_lock(s, lkb, res);
153153
if (rv)
@@ -157,13 +157,13 @@ static int print_format1(struct dlm_rsb *res, struct seq_file *s)
157157
if (list_empty(&res->res_lookup))
158158
goto out;
159159

160-
seq_printf(s, "Lookup Queue\n");
160+
seq_puts(s, "Lookup Queue\n");
161161
list_for_each_entry(lkb, &res->res_lookup, lkb_rsb_lookup) {
162162
rv = seq_printf(s, "%08x %s", lkb->lkb_id,
163163
print_lockmode(lkb->lkb_rqmode));
164164
if (lkb->lkb_wait_type)
165165
seq_printf(s, " wait_type: %d", lkb->lkb_wait_type);
166-
rv = seq_printf(s, "\n");
166+
rv = seq_puts(s, "\n");
167167
}
168168
out:
169169
unlock_rsb(res);
@@ -300,7 +300,7 @@ static int print_format3(struct dlm_rsb *r, struct seq_file *s)
300300
else
301301
seq_printf(s, " %02x", (unsigned char)r->res_name[i]);
302302
}
303-
rv = seq_printf(s, "\n");
303+
rv = seq_puts(s, "\n");
304304
if (rv)
305305
goto out;
306306

@@ -311,7 +311,7 @@ static int print_format3(struct dlm_rsb *r, struct seq_file *s)
311311

312312
for (i = 0; i < lvblen; i++)
313313
seq_printf(s, " %02x", (unsigned char)r->res_lvbptr[i]);
314-
rv = seq_printf(s, "\n");
314+
rv = seq_puts(s, "\n");
315315
if (rv)
316316
goto out;
317317

@@ -377,7 +377,7 @@ static int print_format4(struct dlm_rsb *r, struct seq_file *s)
377377
else
378378
seq_printf(s, " %02x", (unsigned char)r->res_name[i]);
379379
}
380-
rv = seq_printf(s, "\n");
380+
rv = seq_puts(s, "\n");
381381
out:
382382
unlock_rsb(r);
383383
return rv;

0 commit comments

Comments
 (0)