ipmi: Remove incorrect use of seq_has_overflowed
PATCH 1/1 ipmi: Remove incorrect use of seq_has_overflowed
commit d6c5dc18d863 ("ipmi: Remove uses of return value of seq_printf") incorrectly changed the return value of various proc_show functions to use seq_has_overflowed().
These functions should return 0 on completion rather than 1/true on overflow. 1 is the same as #define SEQ_SKIP which would cause the output to not be emitted (skipped) instead.
This is a logical defect only as the length of these outputs are all smaller than the initial allocation done by the seq filesystem.
---
apologies for stuffing this up the first time.
drivers/char/ipmi/ipmi_msghandler.c | 4 ++-- drivers/char/ipmi/ipmi_si_intf.c | 4 ++-- drivers/char/ipmi/ipmi_ssif.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-)
drivers/char/ipmi/ipmi_msghandler.c +2 -2
@@ -2000,7 +2000,7 @@ static int smi_ipmb_proc_show(struct seq_file *m, void *v)seq_printf (m," %x" , intf->channels[i].address);seq_putc (m,'\n' ); -return seq_has_overflowed (m); +return 0 ; }static int smi_ipmb_proc_open (struct inode *inode,struct file *file)
@@ -2023,7 +2023,7 @@ static int smi_version_proc_show(struct seq_file *m, void *v)ipmi_version_major (&intf->bmc->id), ipmi_version_minor(&intf->bmc->id)); -return seq_has_overflowed (m); +return 0 ; }static int smi_version_proc_open (struct inode *inode,struct file *file)
drivers/char/ipmi/ipmi_si_intf.c +2 -2
@@ -2987,7 +2987,7 @@ static int smi_type_proc_show(struct seq_file *m, void *v)seq_printf (m,"%s\n" , si_to_str[smi->si_type]); -return seq_has_overflowed (m); +return 0 ; }static int smi_type_proc_open (struct inode *inode,struct file *file)
@@ -3060,7 +3060,7 @@ static int smi_params_proc_show(struct seq_file *m, void *v) smi->irq, smi->slave_addr); -return seq_has_overflowed (m); +return 0 ; }static int smi_params_proc_open (struct inode *inode,struct file *file)
drivers/char/ipmi/ipmi_ssif.c +1 -1
@@ -1198,7 +1198,7 @@ static int smi_type_proc_show(struct seq_file *m, void *v) {seq_puts (m,"ssif\n" ); -return seq_has_overflowed (m); +return 0 ; }static int smi_type_proc_open (struct inode *inode,struct file *file)
Ok, this looks correct. I'll probably target this for the rc2 release, along with anything else that comes along.
Thanks,
-corey
Quoted 80 lines · Joe Perches
commit
d6c5dc18d863("ipmi: Remove uses of return value ofseq_printf") incorrectly changed the return value of variousproc_showfunctions to useseq_has_overflowed().These functions should return 0 on completion rather than 1/true on overflow. 1 is the same as #define
SEQ_SKIPwhich would cause the output to not be emitted (skipped) instead.This is a logical defect only as the length of these outputs are all smaller than the initial allocation done by the seq filesystem.
Signed-off-by Joe Perches <[email protected]>---
apologies for stuffing this up the first time.
drivers/char/ipmi/ipmi_msghandler.c | 4 ++-- drivers/char/ipmi/ipmi_si_intf.c | 4 ++-- drivers/char/ipmi/ipmi_ssif.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-)drivers/char/ipmi/ipmi_msghandler.c +2
-2@@ -2000,7 +2000,7 @@ static int smi_ipmb_proc_show(struct seq_file *m, void *v)seq_printf (m," %x" , intf->channels[i].address);seq_putc (m,'\n' ); -return seq_has_overflowed (m); +return 0 ; }static int smi_ipmb_proc_open (struct inode *inode,struct file *file)@@ -2023,7 +2023,7 @@ static int smi_version_proc_show(struct seq_file *m, void *v)ipmi_version_major (&intf->bmc->id), ipmi_version_minor(&intf->bmc->id)); -return seq_has_overflowed (m); +return 0 ; }static int smi_version_proc_open (struct inode *inode,struct file *file)drivers/char/ipmi/ipmi_si_intf.c +2
-2@@ -2987,7 +2987,7 @@ static int smi_type_proc_show(struct seq_file *m, void *v)seq_printf (m,"%s\n" , si_to_str[smi->si_type]); -return seq_has_overflowed (m); +return 0 ; }static int smi_type_proc_open (struct inode *inode,struct file *file)@@ -3060,7 +3060,7 @@ static int smi_params_proc_show(struct seq_file *m, void *v) smi->irq, smi->slave_addr); -return seq_has_overflowed (m); +return 0 ; }static int smi_params_proc_open (struct inode *inode,struct file *file)drivers/char/ipmi/ipmi_ssif.c +1
-1@@ -1198,7 +1198,7 @@ static int smi_type_proc_show(struct seq_file *m, void *v) {seq_puts (m,"ssif\n" ); -return seq_has_overflowed (m); +return 0 ; }static int smi_type_proc_open (struct inode *inode,struct file *file)