提交 7f032d6e 编写于 作者: J Joe Perches 提交者: Linus Torvalds

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: NJoe Perches <joe@perches.com>
Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
上级 4395eb1f
...@@ -1015,22 +1015,24 @@ static int sysvipc_msg_proc_show(struct seq_file *s, void *it) ...@@ -1015,22 +1015,24 @@ static int sysvipc_msg_proc_show(struct seq_file *s, void *it)
struct user_namespace *user_ns = seq_user_ns(s); struct user_namespace *user_ns = seq_user_ns(s);
struct msg_queue *msq = it; 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", "%10d %10d %4o %10lu %10lu %5u %5u %5u %5u %5u %5u %10lu %10lu %10lu\n",
msq->q_perm.key, msq->q_perm.key,
msq->q_perm.id, msq->q_perm.id,
msq->q_perm.mode, msq->q_perm.mode,
msq->q_cbytes, msq->q_cbytes,
msq->q_qnum, msq->q_qnum,
msq->q_lspid, msq->q_lspid,
msq->q_lrpid, msq->q_lrpid,
from_kuid_munged(user_ns, msq->q_perm.uid), from_kuid_munged(user_ns, msq->q_perm.uid),
from_kgid_munged(user_ns, msq->q_perm.gid), from_kgid_munged(user_ns, msq->q_perm.gid),
from_kuid_munged(user_ns, msq->q_perm.cuid), from_kuid_munged(user_ns, msq->q_perm.cuid),
from_kgid_munged(user_ns, msq->q_perm.cgid), from_kgid_munged(user_ns, msq->q_perm.cgid),
msq->q_stime, msq->q_stime,
msq->q_rtime, msq->q_rtime,
msq->q_ctime); msq->q_ctime);
return 0;
} }
#endif #endif
......
...@@ -2170,17 +2170,19 @@ static int sysvipc_sem_proc_show(struct seq_file *s, void *it) ...@@ -2170,17 +2170,19 @@ static int sysvipc_sem_proc_show(struct seq_file *s, void *it)
sem_otime = get_semotime(sma); sem_otime = get_semotime(sma);
return seq_printf(s, seq_printf(s,
"%10d %10d %4o %10u %5u %5u %5u %5u %10lu %10lu\n", "%10d %10d %4o %10u %5u %5u %5u %5u %10lu %10lu\n",
sma->sem_perm.key, sma->sem_perm.key,
sma->sem_perm.id, sma->sem_perm.id,
sma->sem_perm.mode, sma->sem_perm.mode,
sma->sem_nsems, sma->sem_nsems,
from_kuid_munged(user_ns, sma->sem_perm.uid), from_kuid_munged(user_ns, sma->sem_perm.uid),
from_kgid_munged(user_ns, sma->sem_perm.gid), from_kgid_munged(user_ns, sma->sem_perm.gid),
from_kuid_munged(user_ns, sma->sem_perm.cuid), from_kuid_munged(user_ns, sma->sem_perm.cuid),
from_kgid_munged(user_ns, sma->sem_perm.cgid), from_kgid_munged(user_ns, sma->sem_perm.cgid),
sem_otime, sem_otime,
sma->sem_ctime); sma->sem_ctime);
return 0;
} }
#endif #endif
...@@ -1342,25 +1342,27 @@ static int sysvipc_shm_proc_show(struct seq_file *s, void *it) ...@@ -1342,25 +1342,27 @@ static int sysvipc_shm_proc_show(struct seq_file *s, void *it)
#define SIZE_SPEC "%21lu" #define SIZE_SPEC "%21lu"
#endif #endif
return seq_printf(s, seq_printf(s,
"%10d %10d %4o " SIZE_SPEC " %5u %5u " "%10d %10d %4o " SIZE_SPEC " %5u %5u "
"%5lu %5u %5u %5u %5u %10lu %10lu %10lu " "%5lu %5u %5u %5u %5u %10lu %10lu %10lu "
SIZE_SPEC " " SIZE_SPEC "\n", SIZE_SPEC " " SIZE_SPEC "\n",
shp->shm_perm.key, shp->shm_perm.key,
shp->shm_perm.id, shp->shm_perm.id,
shp->shm_perm.mode, shp->shm_perm.mode,
shp->shm_segsz, shp->shm_segsz,
shp->shm_cprid, shp->shm_cprid,
shp->shm_lprid, shp->shm_lprid,
shp->shm_nattch, shp->shm_nattch,
from_kuid_munged(user_ns, shp->shm_perm.uid), from_kuid_munged(user_ns, shp->shm_perm.uid),
from_kgid_munged(user_ns, shp->shm_perm.gid), from_kgid_munged(user_ns, shp->shm_perm.gid),
from_kuid_munged(user_ns, shp->shm_perm.cuid), from_kuid_munged(user_ns, shp->shm_perm.cuid),
from_kgid_munged(user_ns, shp->shm_perm.cgid), from_kgid_munged(user_ns, shp->shm_perm.cgid),
shp->shm_atim, shp->shm_atim,
shp->shm_dtim, shp->shm_dtim,
shp->shm_ctim, shp->shm_ctim,
rss * PAGE_SIZE, rss * PAGE_SIZE,
swp * PAGE_SIZE); swp * PAGE_SIZE);
return 0;
} }
#endif #endif
...@@ -837,8 +837,10 @@ static int sysvipc_proc_show(struct seq_file *s, void *it) ...@@ -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_iter *iter = s->private;
struct ipc_proc_iface *iface = iter->iface; struct ipc_proc_iface *iface = iter->iface;
if (it == SEQ_START_TOKEN) if (it == SEQ_START_TOKEN) {
return seq_puts(s, iface->header); seq_puts(s, iface->header);
return 0;
}
return iface->show(s, it); return iface->show(s, it);
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册