| Message ID | 1439972932-12116-1-git-send-email-yangds.fnst@cn.fujitsu.com |
|---|---|
| State | Accepted |
| Commit | d583d1da01eb0a3e38f18dfc8eec0dde07be8320 |
| Headers | show |
On Wed, Aug 19, 2015 at 04:28:52PM +0800, Dongsheng Yang wrote: > There is a typo in lpt to memset nnode by the > size in sizeof(stuct ubifs_pnode). > > Signed-off-by: Dongsheng Yang <yangds.fnst@cn.fujitsu.com> Pushed to mtd-utils.git, as it's obvious. Good catch! I'll take a look at your restructuring patches eventually. But I'll usually just defer UBIFS stuff to Richard/Artem/others. > --- > mkfs.ubifs/lpt.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/mkfs.ubifs/lpt.c b/mkfs.ubifs/lpt.c > index f6d4352..6aa0b88 100644 > --- a/mkfs.ubifs/lpt.c > +++ b/mkfs.ubifs/lpt.c > @@ -384,7 +384,7 @@ int create_lpt(struct ubifs_info *c) > goto out; > } > memset(pnode, 0 , sizeof(struct ubifs_pnode)); > - memset(nnode, 0 , sizeof(struct ubifs_pnode)); > + memset(nnode, 0 , sizeof(struct ubifs_nnode)); FWIW, struct ubifs_pnode and struct ubifs_nnode look like they would be the same size when using 32-bit pointers, but a bit different (see the third field in structs ubifs_nbranch and ubifs_lprops) with 64-bit. > > c->lscan_lnum = c->main_first; > > -- > 1.8.4.2 Brian
On 08/20/2015 12:29 AM, Brian Norris wrote: > On Wed, Aug 19, 2015 at 04:28:52PM +0800, Dongsheng Yang wrote: >> There is a typo in lpt to memset nnode by the >> size in sizeof(stuct ubifs_pnode). >> >> Signed-off-by: Dongsheng Yang <yangds.fnst@cn.fujitsu.com> > > Pushed to mtd-utils.git, as it's obvious. Good catch! > > I'll take a look at your restructuring patches eventually. But I'll > usually just defer UBIFS stuff to Richard/Artem/others. Great, thanx a lot, Brian. > >> --- >> mkfs.ubifs/lpt.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/mkfs.ubifs/lpt.c b/mkfs.ubifs/lpt.c >> index f6d4352..6aa0b88 100644 >> --- a/mkfs.ubifs/lpt.c >> +++ b/mkfs.ubifs/lpt.c >> @@ -384,7 +384,7 @@ int create_lpt(struct ubifs_info *c) >> goto out; >> } >> memset(pnode, 0 , sizeof(struct ubifs_pnode)); >> - memset(nnode, 0 , sizeof(struct ubifs_pnode)); >> + memset(nnode, 0 , sizeof(struct ubifs_nnode)); > > FWIW, struct ubifs_pnode and struct ubifs_nnode look like they would be > the same size when using 32-bit pointers, but a bit different (see the > third field in structs ubifs_nbranch and ubifs_lprops) with 64-bit. Yes, but in the latest ubifs.h in kernel, they are more different. And when I updated the ubifs.h, I found the bug. Thanx Yang > >> >> c->lscan_lnum = c->main_first; >> >> -- >> 1.8.4.2 > > Brian > . >
diff --git a/mkfs.ubifs/lpt.c b/mkfs.ubifs/lpt.c index f6d4352..6aa0b88 100644 --- a/mkfs.ubifs/lpt.c +++ b/mkfs.ubifs/lpt.c @@ -384,7 +384,7 @@ int create_lpt(struct ubifs_info *c) goto out; } memset(pnode, 0 , sizeof(struct ubifs_pnode)); - memset(nnode, 0 , sizeof(struct ubifs_pnode)); + memset(nnode, 0 , sizeof(struct ubifs_nnode)); c->lscan_lnum = c->main_first;
There is a typo in lpt to memset nnode by the size in sizeof(stuct ubifs_pnode). Signed-off-by: Dongsheng Yang <yangds.fnst@cn.fujitsu.com> --- mkfs.ubifs/lpt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)