Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7f032d6e authored by Joe Perches's avatar Joe Perches Committed by Linus Torvalds
Browse files

ipc: remove use of seq_printf return value 



The seq_printf return value, because it's frequently misused,
will eventually be converted to void.

See: commit 1f33c41c ("seq_file: Rename seq_overflow() to
     seq_has_overflowed() and make public")

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 4395eb1f

ipc/msg.c

+18 −16
Original line number Diff line number Diff line
@@ -1015,7 +1015,7 @@ static int sysvipc_msg_proc_show(struct seq_file *s, void *it) 
	struct user_namespace *user_ns = seq_user_ns(s);

	struct msg_queue *msq = it;



	return seq_printf(s,

	seq_printf(s,

		   "%10d %10d  %4o  %10lu %10lu %5u %5u %5u %5u %5u %5u %10lu %10lu %10lu\n",

		   msq->q_perm.key,

		   msq->q_perm.id,
@@ -1031,6 +1031,8 @@ static int sysvipc_msg_proc_show(struct seq_file *s, void *it) 
		   msq->q_stime,

		   msq->q_rtime,

		   msq->q_ctime);



	return 0;

}

#endif

ipc/sem.c

+14 −12
Original line number Diff line number Diff line
@@ -2170,7 +2170,7 @@ static int sysvipc_sem_proc_show(struct seq_file *s, void *it) 


	sem_otime = get_semotime(sma);



	return seq_printf(s,

	seq_printf(s,

		   "%10d %10d  %4o %10u %5u %5u %5u %5u %10lu %10lu\n",

		   sma->sem_perm.key,

		   sma->sem_perm.id,
@@ -2182,5 +2182,7 @@ static int sysvipc_sem_proc_show(struct seq_file *s, void *it) 
		   from_kgid_munged(user_ns, sma->sem_perm.cgid),

		   sem_otime,

		   sma->sem_ctime);



	return 0;

}

#endif

ipc/shm.c

+22 −20
Original line number Diff line number Diff line
@@ -1342,7 +1342,7 @@ static int sysvipc_shm_proc_show(struct seq_file *s, void *it) 
#define SIZE_SPEC "%21lu"

#endif



	return seq_printf(s,

	seq_printf(s,

		   "%10d %10d  %4o " SIZE_SPEC " %5u %5u  "

		   "%5lu %5u %5u %5u %5u %10lu %10lu %10lu "

		   SIZE_SPEC " " SIZE_SPEC "\n",
@@ -1362,5 +1362,7 @@ static int sysvipc_shm_proc_show(struct seq_file *s, void *it) 
		   shp->shm_ctim,

		   rss * PAGE_SIZE,

		   swp * PAGE_SIZE);



	return 0;

}

#endif

ipc/util.c

+4 −2
Original line number Diff line number Diff line
@@ -837,8 +837,10 @@ static int sysvipc_proc_show(struct seq_file *s, void *it) 
	struct ipc_proc_iter *iter = s->private;

	struct ipc_proc_iface *iface = iter->iface;



	if (it == SEQ_START_TOKEN)

		return seq_puts(s, iface->header);

	if (it == SEQ_START_TOKEN) {

		seq_puts(s, iface->header);

		return 0;

	}



	return iface->show(s, it);

}