1 files changed, 117 insertions, 134 deletions

diff --git a/fs/dlm/debug_fs.c b/fs/dlm/debug_fs.c
index 1323c568e362..3bf460894088 100644
--- a/fs/dlm/debug_fs.c
+++ b/fs/dlm/debug_fs.c
@@ -48,8 +48,8 @@ static char *print_lockmode(int mode)
         }
 }
 
-static int print_format1_lock(struct seq_file *s, struct dlm_lkb *lkb,
-                              struct dlm_rsb *res)
+static void print_format1_lock(struct seq_file *s, struct dlm_lkb *lkb,
+                               struct dlm_rsb *res)
 {
         seq_printf(s, "%08x %s", lkb->lkb_id, print_lockmode(lkb->lkb_grmode));
 
@@ -68,21 +68,17 @@ static int print_format1_lock(struct seq_file *s, struct dlm_lkb *lkb,
         if (lkb->lkb_wait_type)
                 seq_printf(s, " wait_type: %d", lkb->lkb_wait_type);
 
-        return seq_puts(s, "\n");
+        seq_puts(s, "\n");
 }
 
-static int print_format1(struct dlm_rsb *res, struct seq_file *s)
+static void print_format1(struct dlm_rsb *res, struct seq_file *s)
 {
         struct dlm_lkb *lkb;
         int i, lvblen = res->res_ls->ls_lvblen, recover_list, root_list;
-        int rv;
 
         lock_rsb(res);
 
-        rv = seq_printf(s, "\nResource %p Name (len=%d) \"",
-                        res, res->res_length);
-        if (rv)
-                goto out;
+        seq_printf(s, "\nResource %p Name (len=%d) \"", res, res->res_length);
 
         for (i = 0; i < res->res_length; i++) {
                 if (isprint(res->res_name[i]))
@@ -92,17 +88,16 @@ static int print_format1(struct dlm_rsb *res, struct seq_file *s)
         }
 
         if (res->res_nodeid > 0)
-                rv = seq_printf(s, "\"\nLocal Copy, Master is node %d\n",
-                                res->res_nodeid);
+                seq_printf(s, "\"\nLocal Copy, Master is node %d\n",
+                           res->res_nodeid);
         else if (res->res_nodeid == 0)
-                rv = seq_puts(s, "\"\nMaster Copy\n");
+                seq_puts(s, "\"\nMaster Copy\n");
         else if (res->res_nodeid == -1)
-                rv = seq_printf(s, "\"\nLooking up master (lkid %x)\n",
-                                res->res_first_lkid);
+                seq_printf(s, "\"\nLooking up master (lkid %x)\n",
+                           res->res_first_lkid);
         else
-                rv = seq_printf(s, "\"\nInvalid master %d\n",
-                                res->res_nodeid);
-        if (rv)
+                seq_printf(s, "\"\nInvalid master %d\n", res->res_nodeid);
+        if (seq_has_overflowed(s))
                 goto out;
 
         /* Print the LVB: */
@@ -116,8 +111,8 @@ static int print_format1(struct dlm_rsb *res, struct seq_file *s)
                 }
                 if (rsb_flag(res, RSB_VALNOTVALID))
                         seq_puts(s, " (INVALID)");
-                rv = seq_puts(s, "\n");
-                if (rv)
+                seq_puts(s, "\n");
+                if (seq_has_overflowed(s))
                         goto out;
         }
 
@@ -125,32 +120,30 @@ static int print_format1(struct dlm_rsb *res, struct seq_file *s)
         recover_list = !list_empty(&res->res_recover_list);
 
         if (root_list || recover_list) {
-                rv = seq_printf(s, "Recovery: root %d recover %d flags %lx "
-                                "count %d\n", root_list, recover_list,
-                                res->res_flags, res->res_recover_locks_count);
-                if (rv)
-                        goto out;
+                seq_printf(s, "Recovery: root %d recover %d flags %lx count %d\n",
+                           root_list, recover_list,
+                           res->res_flags, res->res_recover_locks_count);
         }
 
         /* Print the locks attached to this resource */
         seq_puts(s, "Granted Queue\n");
         list_for_each_entry(lkb, &res->res_grantqueue, lkb_statequeue) {
-                rv = print_format1_lock(s, lkb, res);
-                if (rv)
+                print_format1_lock(s, lkb, res);
+                if (seq_has_overflowed(s))
                         goto out;
         }
 
         seq_puts(s, "Conversion Queue\n");
         list_for_each_entry(lkb, &res->res_convertqueue, lkb_statequeue) {
-                rv = print_format1_lock(s, lkb, res);
-                if (rv)
+                print_format1_lock(s, lkb, res);
+                if (seq_has_overflowed(s))
                         goto out;
         }
 
         seq_puts(s, "Waiting Queue\n");
         list_for_each_entry(lkb, &res->res_waitqueue, lkb_statequeue) {
-                rv = print_format1_lock(s, lkb, res);
-                if (rv)
+                print_format1_lock(s, lkb, res);
+                if (seq_has_overflowed(s))
                         goto out;
         }
 
@@ -159,23 +152,23 @@ static int print_format1(struct dlm_rsb *res, struct seq_file *s)
 
         seq_puts(s, "Lookup Queue\n");
         list_for_each_entry(lkb, &res->res_lookup, lkb_rsb_lookup) {
-                rv = seq_printf(s, "%08x %s", lkb->lkb_id,
-                                print_lockmode(lkb->lkb_rqmode));
+                seq_printf(s, "%08x %s",
+                           lkb->lkb_id, print_lockmode(lkb->lkb_rqmode));
                 if (lkb->lkb_wait_type)
                         seq_printf(s, " wait_type: %d", lkb->lkb_wait_type);
-                rv = seq_puts(s, "\n");
+                seq_puts(s, "\n");
+                if (seq_has_overflowed(s))
+                        goto out;
         }
  out:
         unlock_rsb(res);
-        return rv;
 }
 
-static int print_format2_lock(struct seq_file *s, struct dlm_lkb *lkb,
-                              struct dlm_rsb *r)
+static void print_format2_lock(struct seq_file *s, struct dlm_lkb *lkb,
+                               struct dlm_rsb *r)
 {
         u64 xid = 0;
         u64 us;
-        int rv;
 
         if (lkb->lkb_flags & DLM_IFL_USER) {
                 if (lkb->lkb_ua)
@@ -188,103 +181,97 @@ static int print_format2_lock(struct seq_file *s, struct dlm_lkb *lkb,
         /* id nodeid remid pid xid exflags flags sts grmode rqmode time_us
            r_nodeid r_len r_name */
 
-        rv = seq_printf(s, "%x %d %x %u %llu %x %x %d %d %d %llu %u %d \"%s\"\n",
-                        lkb->lkb_id,
-                        lkb->lkb_nodeid,
-                        lkb->lkb_remid,
-                        lkb->lkb_ownpid,
-                        (unsigned long long)xid,
-                        lkb->lkb_exflags,
-                        lkb->lkb_flags,
-                        lkb->lkb_status,
-                        lkb->lkb_grmode,
-                        lkb->lkb_rqmode,
-                        (unsigned long long)us,
-                        r->res_nodeid,
-                        r->res_length,
-                        r->res_name);
-        return rv;
+        seq_printf(s, "%x %d %x %u %llu %x %x %d %d %d %llu %u %d \"%s\"\n",
+                   lkb->lkb_id,
+                   lkb->lkb_nodeid,
+                   lkb->lkb_remid,
+                   lkb->lkb_ownpid,
+                   (unsigned long long)xid,
+                   lkb->lkb_exflags,
+                   lkb->lkb_flags,
+                   lkb->lkb_status,
+                   lkb->lkb_grmode,
+                   lkb->lkb_rqmode,
+                   (unsigned long long)us,
+                   r->res_nodeid,
+                   r->res_length,
+                   r->res_name);
 }
 
-static int print_format2(struct dlm_rsb *r, struct seq_file *s)
+static void print_format2(struct dlm_rsb *r, struct seq_file *s)
 {
         struct dlm_lkb *lkb;
-        int rv = 0;
 
         lock_rsb(r);
 
         list_for_each_entry(lkb, &r->res_grantqueue, lkb_statequeue) {
-                rv = print_format2_lock(s, lkb, r);
-                if (rv)
+                print_format2_lock(s, lkb, r);
+                if (seq_has_overflowed(s))