Message ID | d2f73c3e-a55f-5fb7-a8f8-0dc3ce8ff8a5@web.de (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | NFS: Less function calls in show_pnfs() | expand |
On Tue, 2 Jul 2019, Markus Elfring wrote: > From: Markus Elfring <elfring@users.sourceforge.net> > Date: Tue, 2 Jul 2019 16:30:53 +0200 > > Reduce function calls for data output into a sequence. > > This issue was detected by using the Coccinelle software. > > Signed-off-by: Markus Elfring <elfring@users.sourceforge.net> > --- > fs/nfs/super.c | 9 ++++----- > 1 file changed, 4 insertions(+), 5 deletions(-) > > diff --git a/fs/nfs/super.c b/fs/nfs/super.c > index f88ddac2dcdf..c301cd585b3b 100644 > --- a/fs/nfs/super.c > +++ b/fs/nfs/super.c > @@ -749,11 +749,10 @@ static void show_sessions(struct seq_file *m, struct nfs_server *server) {} > #ifdef CONFIG_NFS_V4_1 > static void show_pnfs(struct seq_file *m, struct nfs_server *server) > { > - seq_printf(m, ",pnfs="); > - if (server->pnfs_curr_ld) > - seq_printf(m, "%s", server->pnfs_curr_ld->name); > - else > - seq_printf(m, "not configured"); > + seq_printf(m, ",pnfs=%s", > + server->pnfs_curr_ld > + ? server->pnfs_curr_ld->name > + : "not configured"); Unreadable. julia > } > > static void show_implementation_id(struct seq_file *m, struct nfs_server *nfss) > -- > 2.22.0 > >
>> +++ b/fs/nfs/super.c >> @@ -749,11 +749,10 @@ static void show_sessions(struct seq_file *m, struct nfs_server *server) {} >> #ifdef CONFIG_NFS_V4_1 >> static void show_pnfs(struct seq_file *m, struct nfs_server *server) >> { >> - seq_printf(m, ",pnfs="); >> - if (server->pnfs_curr_ld) >> - seq_printf(m, "%s", server->pnfs_curr_ld->name); >> - else >> - seq_printf(m, "not configured"); >> + seq_printf(m, ",pnfs=%s", >> + server->pnfs_curr_ld >> + ? server->pnfs_curr_ld->name >> + : "not configured"); > > Unreadable. * Do you find any other source code formatting more readable for the usage of the ternary operator? * How do you think about the general software transformation possibility (at this place)? Regards, Markus
diff --git a/fs/nfs/super.c b/fs/nfs/super.c index f88ddac2dcdf..c301cd585b3b 100644 --- a/fs/nfs/super.c +++ b/fs/nfs/super.c @@ -749,11 +749,10 @@ static void show_sessions(struct seq_file *m, struct nfs_server *server) {} #ifdef CONFIG_NFS_V4_1 static void show_pnfs(struct seq_file *m, struct nfs_server *server) { - seq_printf(m, ",pnfs="); - if (server->pnfs_curr_ld) - seq_printf(m, "%s", server->pnfs_curr_ld->name); - else - seq_printf(m, "not configured"); + seq_printf(m, ",pnfs=%s", + server->pnfs_curr_ld + ? server->pnfs_curr_ld->name + : "not configured"); } static void show_implementation_id(struct seq_file *m, struct nfs_server *nfss)