| Message ID | 20210402101631.561-1-changfengnan@vivo.com |
|---|---|
| State | Awaiting Upstream |
| Headers | show |
| Series | [v2] ext4: fix error code in ext4_commit_super | expand |
On Apr 2, 2021, at 4:16 AM, Fengnan Chang <changfengnan@vivo.com> wrote: > > We should set the error code when ext4_commit_super check argument failed. > Found in code review. > Fixes: c4be0c1dc4cdc ("filesystem freeze: add error handling of write_super_lockfs/unlockfs"). > > Signed-off-by: Fengnan Chang <changfengnan@vivo.com> Reviewed-by: Andreas Dilger <adilger@dilger.ca> > --- > fs/ext4/super.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/fs/ext4/super.c b/fs/ext4/super.c > index 03373471131c..1130599c87dc 100644 > --- a/fs/ext4/super.c > +++ b/fs/ext4/super.c > @@ -5500,8 +5500,10 @@ static int ext4_commit_super(struct super_block *sb, int sync) > struct buffer_head *sbh = EXT4_SB(sb)->s_sbh; > int error = 0; > > - if (!sbh || block_device_ejected(sb)) > - return error; > + if (!sbh) > + return -EINVAL; > + if (block_device_ejected(sb)) > + return -ENODEV; > > /* > * If the file system is mounted read-only, don't update the > -- > 2.29.0 > Cheers, Andreas
On Sat, Apr 03, 2021 at 12:34:50PM -0600, Andreas Dilger wrote: > On Apr 2, 2021, at 4:16 AM, Fengnan Chang <changfengnan@vivo.com> wrote: > > > > We should set the error code when ext4_commit_super check argument failed. > > Found in code review. > > Fixes: c4be0c1dc4cdc ("filesystem freeze: add error handling of write_super_lockfs/unlockfs"). > > > > Signed-off-by: Fengnan Chang <changfengnan@vivo.com> > > Reviewed-by: Andreas Dilger <adilger@dilger.ca> Thanks, applied. - Ted
diff --git a/fs/ext4/super.c b/fs/ext4/super.c index 03373471131c..1130599c87dc 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -5500,8 +5500,10 @@ static int ext4_commit_super(struct super_block *sb, int sync) struct buffer_head *sbh = EXT4_SB(sb)->s_sbh; int error = 0; - if (!sbh || block_device_ejected(sb)) - return error; + if (!sbh) + return -EINVAL; + if (block_device_ejected(sb)) + return -ENODEV; /* * If the file system is mounted read-only, don't update the
We should set the error code when ext4_commit_super check argument failed. Found in code review. Fixes: c4be0c1dc4cdc ("filesystem freeze: add error handling of write_super_lockfs/unlockfs"). Signed-off-by: Fengnan Chang <changfengnan@vivo.com> --- fs/ext4/super.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) -- 2.29.0