diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 12:12:14 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 12:12:14 -0400 |
| commit | fac56c2df51bc29b07b3c2dcfabf32a015a0522c (patch) | |
| tree | 1ff5d84ecf4ea0bcbd42e2ef9624b5ade3810890 /fs/jffs2/summary.c | |
| parent | 6caa15d0b84d2ea688fd31f4f172c8353463e109 (diff) | |
| parent | a6360dd37e1a144ed11e6548371bade559a1e4df (diff) | |
Merge commit 'v2.6.39-rc3' into for-2.6.39
Diffstat (limited to 'fs/jffs2/summary.c')
| -rw-r--r-- | fs/jffs2/summary.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/jffs2/summary.c b/fs/jffs2/summary.c index 800171dca53b..e537fb0e0184 100644 --- a/fs/jffs2/summary.c +++ b/fs/jffs2/summary.c | |||
| @@ -121,7 +121,7 @@ int jffs2_sum_add_inode_mem(struct jffs2_summary *s, struct jffs2_raw_inode *ri, | |||
| 121 | temp->nodetype = ri->nodetype; | 121 | temp->nodetype = ri->nodetype; |
| 122 | temp->inode = ri->ino; | 122 | temp->inode = ri->ino; |
| 123 | temp->version = ri->version; | 123 | temp->version = ri->version; |
| 124 | temp->offset = cpu_to_je32(ofs); /* relative offset from the begining of the jeb */ | 124 | temp->offset = cpu_to_je32(ofs); /* relative offset from the beginning of the jeb */ |
| 125 | temp->totlen = ri->totlen; | 125 | temp->totlen = ri->totlen; |
| 126 | temp->next = NULL; | 126 | temp->next = NULL; |
| 127 | 127 | ||
| @@ -139,7 +139,7 @@ int jffs2_sum_add_dirent_mem(struct jffs2_summary *s, struct jffs2_raw_dirent *r | |||
| 139 | 139 | ||
| 140 | temp->nodetype = rd->nodetype; | 140 | temp->nodetype = rd->nodetype; |
| 141 | temp->totlen = rd->totlen; | 141 | temp->totlen = rd->totlen; |
| 142 | temp->offset = cpu_to_je32(ofs); /* relative from the begining of the jeb */ | 142 | temp->offset = cpu_to_je32(ofs); /* relative from the beginning of the jeb */ |
| 143 | temp->pino = rd->pino; | 143 | temp->pino = rd->pino; |
| 144 | temp->version = rd->version; | 144 | temp->version = rd->version; |
| 145 | temp->ino = rd->ino; | 145 | temp->ino = rd->ino; |