1 /* 1 /*
2 * JFFS2 -- Journalling Flash File System, Ver 2 * JFFS2 -- Journalling Flash File System, Version 2.
3 * 3 *
4 * Copyright © 2006 NEC Corporation 4 * Copyright © 2006 NEC Corporation
5 * 5 *
6 * Created by KaiGai Kohei <kaigai@ak.jp.nec.c 6 * Created by KaiGai Kohei <kaigai@ak.jp.nec.com>
7 * 7 *
8 * For licensing information, see the file 'LI 8 * For licensing information, see the file 'LICENCE' in this directory.
9 * 9 *
10 */ 10 */
11 11
12 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt 12 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
13 13
14 #define JFFS2_XATTR_IS_CORRUPTED 1 14 #define JFFS2_XATTR_IS_CORRUPTED 1
15 15
16 #include <linux/kernel.h> 16 #include <linux/kernel.h>
17 #include <linux/slab.h> 17 #include <linux/slab.h>
18 #include <linux/fs.h> 18 #include <linux/fs.h>
19 #include <linux/time.h> 19 #include <linux/time.h>
20 #include <linux/pagemap.h> 20 #include <linux/pagemap.h>
21 #include <linux/highmem.h> 21 #include <linux/highmem.h>
22 #include <linux/crc32.h> 22 #include <linux/crc32.h>
23 #include <linux/jffs2.h> 23 #include <linux/jffs2.h>
24 #include <linux/xattr.h> 24 #include <linux/xattr.h>
25 #include <linux/posix_acl_xattr.h> <<
26 #include <linux/mtd/mtd.h> 25 #include <linux/mtd/mtd.h>
27 #include "nodelist.h" 26 #include "nodelist.h"
28 /* -------- xdatum related functions --------- 27 /* -------- xdatum related functions ----------------
29 * xattr_datum_hashkey(xprefix, xname, xvalue, 28 * xattr_datum_hashkey(xprefix, xname, xvalue, xsize)
30 * is used to calcurate xdatum hashkey. The 29 * is used to calcurate xdatum hashkey. The reminder of hashkey into XATTRINDEX_HASHSIZE is
31 * the index of the xattr name/value pair ca 30 * the index of the xattr name/value pair cache (c->xattrindex).
32 * is_xattr_datum_unchecked(c, xd) 31 * is_xattr_datum_unchecked(c, xd)
33 * returns 1, if xdatum contains any uncheck 32 * returns 1, if xdatum contains any unchecked raw nodes. if all raw nodes are not
34 * unchecked, it returns 0. 33 * unchecked, it returns 0.
35 * unload_xattr_datum(c, xd) 34 * unload_xattr_datum(c, xd)
36 * is used to release xattr name/value pair 35 * is used to release xattr name/value pair and detach from c->xattrindex.
37 * reclaim_xattr_datum(c) 36 * reclaim_xattr_datum(c)
38 * is used to reclaim xattr name/value pairs 37 * is used to reclaim xattr name/value pairs on the xattr name/value pair cache when
39 * memory usage by cache is over c->xdatum_m 38 * memory usage by cache is over c->xdatum_mem_threshold. Currently, this threshold
40 * is hard coded as 32KiB. 39 * is hard coded as 32KiB.
41 * do_verify_xattr_datum(c, xd) 40 * do_verify_xattr_datum(c, xd)
42 * is used to load the xdatum informations w 41 * is used to load the xdatum informations without name/value pair from the medium.
43 * It's necessary once, because those inform 42 * It's necessary once, because those informations are not collected during mounting
44 * process when EBS is enabled. 43 * process when EBS is enabled.
45 * 0 will be returned, if success. An negati 44 * 0 will be returned, if success. An negative return value means recoverable error, and
46 * positive return value means unrecoverable 45 * positive return value means unrecoverable error. Thus, caller must remove this xdatum
47 * and xref when it returned positive value. 46 * and xref when it returned positive value.
48 * do_load_xattr_datum(c, xd) 47 * do_load_xattr_datum(c, xd)
49 * is used to load name/value pair from the 48 * is used to load name/value pair from the medium.
50 * The meanings of return value is same as d 49 * The meanings of return value is same as do_verify_xattr_datum().
51 * load_xattr_datum(c, xd) 50 * load_xattr_datum(c, xd)
52 * is used to be as a wrapper of do_verify_x 51 * is used to be as a wrapper of do_verify_xattr_datum() and do_load_xattr_datum().
53 * If xd need to call do_verify_xattr_datum( 52 * If xd need to call do_verify_xattr_datum() at first, it's called before calling
54 * do_load_xattr_datum(). The meanings of re 53 * do_load_xattr_datum(). The meanings of return value is same as do_verify_xattr_datum().
55 * save_xattr_datum(c, xd) 54 * save_xattr_datum(c, xd)
56 * is used to write xdatum to medium. xd->ve 55 * is used to write xdatum to medium. xd->version will be incremented.
57 * create_xattr_datum(c, xprefix, xname, xvalu 56 * create_xattr_datum(c, xprefix, xname, xvalue, xsize)
58 * is used to create new xdatum and write to 57 * is used to create new xdatum and write to medium.
59 * unrefer_xattr_datum(c, xd) 58 * unrefer_xattr_datum(c, xd)
60 * is used to delete a xdatum. When nobody r 59 * is used to delete a xdatum. When nobody refers this xdatum, JFFS2_XFLAGS_DEAD
61 * is set on xd->flags and chained xattr_dea 60 * is set on xd->flags and chained xattr_dead_list or release it immediately.
62 * In the first case, the garbage collector 61 * In the first case, the garbage collector release it later.
63 * ------------------------------------------- 62 * -------------------------------------------------- */
64 static uint32_t xattr_datum_hashkey(int xprefi 63 static uint32_t xattr_datum_hashkey(int xprefix, const char *xname, const char *xvalue, int xsize)
65 { 64 {
66 int name_len = strlen(xname); 65 int name_len = strlen(xname);
67 66
68 return crc32(xprefix, xname, name_len) 67 return crc32(xprefix, xname, name_len) ^ crc32(xprefix, xvalue, xsize);
69 } 68 }
70 69
71 static int is_xattr_datum_unchecked(struct jff 70 static int is_xattr_datum_unchecked(struct jffs2_sb_info *c, struct jffs2_xattr_datum *xd)
72 { 71 {
73 struct jffs2_raw_node_ref *raw; 72 struct jffs2_raw_node_ref *raw;
74 int rc = 0; 73 int rc = 0;
75 74
76 spin_lock(&c->erase_completion_lock); 75 spin_lock(&c->erase_completion_lock);
77 for (raw=xd->node; raw != (void *)xd; 76 for (raw=xd->node; raw != (void *)xd; raw=raw->next_in_ino) {
78 if (ref_flags(raw) == REF_UNCH 77 if (ref_flags(raw) == REF_UNCHECKED) {
79 rc = 1; 78 rc = 1;
80 break; 79 break;
81 } 80 }
82 } 81 }
83 spin_unlock(&c->erase_completion_lock) 82 spin_unlock(&c->erase_completion_lock);
84 return rc; 83 return rc;
85 } 84 }
86 85
87 static void unload_xattr_datum(struct jffs2_sb 86 static void unload_xattr_datum(struct jffs2_sb_info *c, struct jffs2_xattr_datum *xd)
88 { 87 {
89 /* must be called under down_write(xat 88 /* must be called under down_write(xattr_sem) */
90 D1(dbg_xattr("%s: xid=%u, version=%u\n 89 D1(dbg_xattr("%s: xid=%u, version=%u\n", __func__, xd->xid, xd->version));
91 if (xd->xname) { 90 if (xd->xname) {
92 c->xdatum_mem_usage -= (xd->na 91 c->xdatum_mem_usage -= (xd->name_len + 1 + xd->value_len);
93 kfree(xd->xname); 92 kfree(xd->xname);
94 } 93 }
95 94
96 list_del_init(&xd->xindex); 95 list_del_init(&xd->xindex);
97 xd->hashkey = 0; 96 xd->hashkey = 0;
98 xd->xname = NULL; 97 xd->xname = NULL;
99 xd->xvalue = NULL; 98 xd->xvalue = NULL;
100 } 99 }
101 100
102 static void reclaim_xattr_datum(struct jffs2_s 101 static void reclaim_xattr_datum(struct jffs2_sb_info *c)
103 { 102 {
104 /* must be called under down_write(xat 103 /* must be called under down_write(xattr_sem) */
105 struct jffs2_xattr_datum *xd, *_xd; 104 struct jffs2_xattr_datum *xd, *_xd;
106 uint32_t target, before; 105 uint32_t target, before;
107 static int index = 0; 106 static int index = 0;
108 int count; 107 int count;
109 108
110 if (c->xdatum_mem_threshold > c->xdatu 109 if (c->xdatum_mem_threshold > c->xdatum_mem_usage)
111 return; 110 return;
112 111
113 before = c->xdatum_mem_usage; 112 before = c->xdatum_mem_usage;
114 target = c->xdatum_mem_usage * 4 / 5; 113 target = c->xdatum_mem_usage * 4 / 5; /* 20% reduction */
115 for (count = 0; count < XATTRINDEX_HAS 114 for (count = 0; count < XATTRINDEX_HASHSIZE; count++) {
116 list_for_each_entry_safe(xd, _ 115 list_for_each_entry_safe(xd, _xd, &c->xattrindex[index], xindex) {
117 if (xd->flags & JFFS2_ 116 if (xd->flags & JFFS2_XFLAGS_HOT) {
118 xd->flags &= ~ 117 xd->flags &= ~JFFS2_XFLAGS_HOT;
119 } else if (!(xd->flags 118 } else if (!(xd->flags & JFFS2_XFLAGS_BIND)) {
120 unload_xattr_d 119 unload_xattr_datum(c, xd);
121 } 120 }
122 if (c->xdatum_mem_usag 121 if (c->xdatum_mem_usage <= target)
123 goto out; 122 goto out;
124 } 123 }
125 index = (index+1) % XATTRINDEX 124 index = (index+1) % XATTRINDEX_HASHSIZE;
126 } 125 }
127 out: 126 out:
128 JFFS2_NOTICE("xdatum_mem_usage from %u 127 JFFS2_NOTICE("xdatum_mem_usage from %u byte to %u byte (%u byte reclaimed)\n",
129 before, c->xdatum_mem_usa 128 before, c->xdatum_mem_usage, before - c->xdatum_mem_usage);
130 } 129 }
131 130
132 static int do_verify_xattr_datum(struct jffs2_ 131 static int do_verify_xattr_datum(struct jffs2_sb_info *c, struct jffs2_xattr_datum *xd)
133 { 132 {
134 /* must be called under down_write(xat 133 /* must be called under down_write(xattr_sem) */
135 struct jffs2_eraseblock *jeb; 134 struct jffs2_eraseblock *jeb;
136 struct jffs2_raw_node_ref *raw; 135 struct jffs2_raw_node_ref *raw;
137 struct jffs2_raw_xattr rx; 136 struct jffs2_raw_xattr rx;
138 size_t readlen; 137 size_t readlen;
139 uint32_t crc, offset, totlen; 138 uint32_t crc, offset, totlen;
140 int rc; 139 int rc;
141 140
142 spin_lock(&c->erase_completion_lock); 141 spin_lock(&c->erase_completion_lock);
143 offset = ref_offset(xd->node); 142 offset = ref_offset(xd->node);
144 if (ref_flags(xd->node) == REF_PRISTIN 143 if (ref_flags(xd->node) == REF_PRISTINE)
145 goto complete; 144 goto complete;
146 spin_unlock(&c->erase_completion_lock) 145 spin_unlock(&c->erase_completion_lock);
147 146
148 rc = jffs2_flash_read(c, offset, sizeo 147 rc = jffs2_flash_read(c, offset, sizeof(rx), &readlen, (char *)&rx);
149 if (rc || readlen != sizeof(rx)) { 148 if (rc || readlen != sizeof(rx)) {
150 JFFS2_WARNING("jffs2_flash_rea 149 JFFS2_WARNING("jffs2_flash_read()=%d, req=%zu, read=%zu at %#08x\n",
151 rc, sizeof(rx), 150 rc, sizeof(rx), readlen, offset);
152 return rc ? rc : -EIO; 151 return rc ? rc : -EIO;
153 } 152 }
154 crc = crc32(0, &rx, sizeof(rx) - 4); 153 crc = crc32(0, &rx, sizeof(rx) - 4);
155 if (crc != je32_to_cpu(rx.node_crc)) { 154 if (crc != je32_to_cpu(rx.node_crc)) {
156 JFFS2_ERROR("node CRC failed a 155 JFFS2_ERROR("node CRC failed at %#08x, read=%#08x, calc=%#08x\n",
157 offset, je32_to_cp 156 offset, je32_to_cpu(rx.hdr_crc), crc);
158 xd->flags |= JFFS2_XFLAGS_INVA 157 xd->flags |= JFFS2_XFLAGS_INVALID;
159 return JFFS2_XATTR_IS_CORRUPTE 158 return JFFS2_XATTR_IS_CORRUPTED;
160 } 159 }
161 totlen = PAD(sizeof(rx) + rx.name_len 160 totlen = PAD(sizeof(rx) + rx.name_len + 1 + je16_to_cpu(rx.value_len));
162 if (je16_to_cpu(rx.magic) != JFFS2_MAG 161 if (je16_to_cpu(rx.magic) != JFFS2_MAGIC_BITMASK
163 || je16_to_cpu(rx.nodetype) != JFF 162 || je16_to_cpu(rx.nodetype) != JFFS2_NODETYPE_XATTR
164 || je32_to_cpu(rx.totlen) != totle 163 || je32_to_cpu(rx.totlen) != totlen
165 || je32_to_cpu(rx.xid) != xd->xid 164 || je32_to_cpu(rx.xid) != xd->xid
166 || je32_to_cpu(rx.version) != xd-> 165 || je32_to_cpu(rx.version) != xd->version) {
167 JFFS2_ERROR("inconsistent xdat 166 JFFS2_ERROR("inconsistent xdatum at %#08x, magic=%#04x/%#04x, "
168 "nodetype=%#04x/%# 167 "nodetype=%#04x/%#04x, totlen=%u/%u, xid=%u/%u, version=%u/%u\n",
169 offset, je16_to_cp 168 offset, je16_to_cpu(rx.magic), JFFS2_MAGIC_BITMASK,
170 je16_to_cpu(rx.nod 169 je16_to_cpu(rx.nodetype), JFFS2_NODETYPE_XATTR,
171 je32_to_cpu(rx.tot 170 je32_to_cpu(rx.totlen), totlen,
172 je32_to_cpu(rx.xid 171 je32_to_cpu(rx.xid), xd->xid,
173 je32_to_cpu(rx.ver 172 je32_to_cpu(rx.version), xd->version);
174 xd->flags |= JFFS2_XFLAGS_INVA 173 xd->flags |= JFFS2_XFLAGS_INVALID;
175 return JFFS2_XATTR_IS_CORRUPTE 174 return JFFS2_XATTR_IS_CORRUPTED;
176 } 175 }
177 xd->xprefix = rx.xprefix; 176 xd->xprefix = rx.xprefix;
178 xd->name_len = rx.name_len; 177 xd->name_len = rx.name_len;
179 xd->value_len = je16_to_cpu(rx.value_l 178 xd->value_len = je16_to_cpu(rx.value_len);
180 xd->data_crc = je32_to_cpu(rx.data_crc 179 xd->data_crc = je32_to_cpu(rx.data_crc);
181 180
182 spin_lock(&c->erase_completion_lock); 181 spin_lock(&c->erase_completion_lock);
183 complete: 182 complete:
184 for (raw=xd->node; raw != (void *)xd; 183 for (raw=xd->node; raw != (void *)xd; raw=raw->next_in_ino) {
185 jeb = &c->blocks[ref_offset(ra 184 jeb = &c->blocks[ref_offset(raw) / c->sector_size];
186 totlen = PAD(ref_totlen(c, jeb 185 totlen = PAD(ref_totlen(c, jeb, raw));
187 if (ref_flags(raw) == REF_UNCH 186 if (ref_flags(raw) == REF_UNCHECKED) {
188 c->unchecked_size -= t 187 c->unchecked_size -= totlen; c->used_size += totlen;
189 jeb->unchecked_size -= 188 jeb->unchecked_size -= totlen; jeb->used_size += totlen;
190 } 189 }
191 raw->flash_offset = ref_offset 190 raw->flash_offset = ref_offset(raw) | ((xd->node==raw) ? REF_PRISTINE : REF_NORMAL);
192 } 191 }
193 spin_unlock(&c->erase_completion_lock) 192 spin_unlock(&c->erase_completion_lock);
194 193
195 /* unchecked xdatum is chained with c- 194 /* unchecked xdatum is chained with c->xattr_unchecked */
196 list_del_init(&xd->xindex); 195 list_del_init(&xd->xindex);
197 196
198 dbg_xattr("success on verifying xdatum !! 197 dbg_xattr("success on verfying xdatum (xid=%u, version=%u)\n",
199 xd->xid, xd->version); 198 xd->xid, xd->version);
200 199
201 return 0; 200 return 0;
202 } 201 }
203 202
204 static int do_load_xattr_datum(struct jffs2_sb 203 static int do_load_xattr_datum(struct jffs2_sb_info *c, struct jffs2_xattr_datum *xd)
205 { 204 {
206 /* must be called under down_write(xat 205 /* must be called under down_write(xattr_sem) */
207 char *data; 206 char *data;
208 size_t readlen; 207 size_t readlen;
209 uint32_t crc, length; 208 uint32_t crc, length;
210 int i, ret, retry = 0; 209 int i, ret, retry = 0;
211 210
212 BUG_ON(ref_flags(xd->node) != REF_PRIS 211 BUG_ON(ref_flags(xd->node) != REF_PRISTINE);
213 BUG_ON(!list_empty(&xd->xindex)); 212 BUG_ON(!list_empty(&xd->xindex));
214 retry: 213 retry:
215 length = xd->name_len + 1 + xd->value_ 214 length = xd->name_len + 1 + xd->value_len;
216 data = kmalloc(length, GFP_KERNEL); 215 data = kmalloc(length, GFP_KERNEL);
217 if (!data) 216 if (!data)
218 return -ENOMEM; 217 return -ENOMEM;
219 218
220 ret = jffs2_flash_read(c, ref_offset(x 219 ret = jffs2_flash_read(c, ref_offset(xd->node)+sizeof(struct jffs2_raw_xattr),
221 length, &readle 220 length, &readlen, data);
222 221
223 if (ret || length!=readlen) { 222 if (ret || length!=readlen) {
224 JFFS2_WARNING("jffs2_flash_rea 223 JFFS2_WARNING("jffs2_flash_read() returned %d, request=%d, readlen=%zu, at %#08x\n",
225 ret, length, rea 224 ret, length, readlen, ref_offset(xd->node));
226 kfree(data); 225 kfree(data);
227 return ret ? ret : -EIO; 226 return ret ? ret : -EIO;
228 } 227 }
229 228
230 data[xd->name_len] = '\0'; 229 data[xd->name_len] = '\0';
231 crc = crc32(0, data, length); 230 crc = crc32(0, data, length);
232 if (crc != xd->data_crc) { 231 if (crc != xd->data_crc) {
233 JFFS2_WARNING("node CRC failed 232 JFFS2_WARNING("node CRC failed (JFFS2_NODETYPE_XATTR)"
234 " at %#08x, read 233 " at %#08x, read: 0x%08x calculated: 0x%08x\n",
235 ref_offset(xd->n 234 ref_offset(xd->node), xd->data_crc, crc);
236 kfree(data); 235 kfree(data);
237 xd->flags |= JFFS2_XFLAGS_INVA 236 xd->flags |= JFFS2_XFLAGS_INVALID;
238 return JFFS2_XATTR_IS_CORRUPTE 237 return JFFS2_XATTR_IS_CORRUPTED;
239 } 238 }
240 239
241 xd->flags |= JFFS2_XFLAGS_HOT; 240 xd->flags |= JFFS2_XFLAGS_HOT;
242 xd->xname = data; 241 xd->xname = data;
243 xd->xvalue = data + xd->name_len+1; 242 xd->xvalue = data + xd->name_len+1;
244 243
245 c->xdatum_mem_usage += length; 244 c->xdatum_mem_usage += length;
246 245
247 xd->hashkey = xattr_datum_hashkey(xd-> 246 xd->hashkey = xattr_datum_hashkey(xd->xprefix, xd->xname, xd->xvalue, xd->value_len);
248 i = xd->hashkey % XATTRINDEX_HASHSIZE; 247 i = xd->hashkey % XATTRINDEX_HASHSIZE;
249 list_add(&xd->xindex, &c->xattrindex[i 248 list_add(&xd->xindex, &c->xattrindex[i]);
250 if (!retry) { 249 if (!retry) {
251 retry = 1; 250 retry = 1;
252 reclaim_xattr_datum(c); 251 reclaim_xattr_datum(c);
253 if (!xd->xname) 252 if (!xd->xname)
254 goto retry; 253 goto retry;
255 } 254 }
256 255
257 dbg_xattr("success on loading xdatum ( 256 dbg_xattr("success on loading xdatum (xid=%u, xprefix=%u, xname='%s')\n",
258 xd->xid, xd->xprefix, xd->xn 257 xd->xid, xd->xprefix, xd->xname);
259 258
260 return 0; 259 return 0;
261 } 260 }
262 261
263 static int load_xattr_datum(struct jffs2_sb_in 262 static int load_xattr_datum(struct jffs2_sb_info *c, struct jffs2_xattr_datum *xd)
264 { 263 {
265 /* must be called under down_write(xat 264 /* must be called under down_write(xattr_sem);
266 * rc < 0 : recoverable error, try aga 265 * rc < 0 : recoverable error, try again
267 * rc = 0 : success 266 * rc = 0 : success
268 * rc > 0 : Unrecoverable error, this 267 * rc > 0 : Unrecoverable error, this node should be deleted.
269 */ 268 */
270 int rc = 0; 269 int rc = 0;
271 270
272 BUG_ON(xd->flags & JFFS2_XFLAGS_DEAD); 271 BUG_ON(xd->flags & JFFS2_XFLAGS_DEAD);
273 if (xd->xname) 272 if (xd->xname)
274 return 0; 273 return 0;
275 if (xd->flags & JFFS2_XFLAGS_INVALID) 274 if (xd->flags & JFFS2_XFLAGS_INVALID)
276 return JFFS2_XATTR_IS_CORRUPTE 275 return JFFS2_XATTR_IS_CORRUPTED;
277 if (unlikely(is_xattr_datum_unchecked( 276 if (unlikely(is_xattr_datum_unchecked(c, xd)))
278 rc = do_verify_xattr_datum(c, 277 rc = do_verify_xattr_datum(c, xd);
279 if (!rc) 278 if (!rc)
280 rc = do_load_xattr_datum(c, xd 279 rc = do_load_xattr_datum(c, xd);
281 return rc; 280 return rc;
282 } 281 }
283 282
284 static int save_xattr_datum(struct jffs2_sb_in 283 static int save_xattr_datum(struct jffs2_sb_info *c, struct jffs2_xattr_datum *xd)
285 { 284 {
286 /* must be called under down_write(xat 285 /* must be called under down_write(xattr_sem) */
287 struct jffs2_raw_xattr rx; 286 struct jffs2_raw_xattr rx;
288 struct kvec vecs[2]; 287 struct kvec vecs[2];
289 size_t length; 288 size_t length;
290 int rc, totlen; 289 int rc, totlen;
291 uint32_t phys_ofs = write_ofs(c); 290 uint32_t phys_ofs = write_ofs(c);
292 291
293 BUG_ON(!xd->xname); 292 BUG_ON(!xd->xname);
294 BUG_ON(xd->flags & (JFFS2_XFLAGS_DEAD| 293 BUG_ON(xd->flags & (JFFS2_XFLAGS_DEAD|JFFS2_XFLAGS_INVALID));
295 294
296 vecs[0].iov_base = ℞ 295 vecs[0].iov_base = ℞
297 vecs[0].iov_len = sizeof(rx); 296 vecs[0].iov_len = sizeof(rx);
298 vecs[1].iov_base = xd->xname; 297 vecs[1].iov_base = xd->xname;
299 vecs[1].iov_len = xd->name_len + 1 + x 298 vecs[1].iov_len = xd->name_len + 1 + xd->value_len;
300 totlen = vecs[0].iov_len + vecs[1].iov 299 totlen = vecs[0].iov_len + vecs[1].iov_len;
301 300
302 /* Setup raw-xattr */ 301 /* Setup raw-xattr */
303 memset(&rx, 0, sizeof(rx)); 302 memset(&rx, 0, sizeof(rx));
304 rx.magic = cpu_to_je16(JFFS2_MAGIC_BIT 303 rx.magic = cpu_to_je16(JFFS2_MAGIC_BITMASK);
305 rx.nodetype = cpu_to_je16(JFFS2_NODETY 304 rx.nodetype = cpu_to_je16(JFFS2_NODETYPE_XATTR);
306 rx.totlen = cpu_to_je32(PAD(totlen)); 305 rx.totlen = cpu_to_je32(PAD(totlen));
307 rx.hdr_crc = cpu_to_je32(crc32(0, &rx, 306 rx.hdr_crc = cpu_to_je32(crc32(0, &rx, sizeof(struct jffs2_unknown_node) - 4));
308 307
309 rx.xid = cpu_to_je32(xd->xid); 308 rx.xid = cpu_to_je32(xd->xid);
310 rx.version = cpu_to_je32(++xd->version 309 rx.version = cpu_to_je32(++xd->version);
311 rx.xprefix = xd->xprefix; 310 rx.xprefix = xd->xprefix;
312 rx.name_len = xd->name_len; 311 rx.name_len = xd->name_len;
313 rx.value_len = cpu_to_je16(xd->value_l 312 rx.value_len = cpu_to_je16(xd->value_len);
314 rx.data_crc = cpu_to_je32(crc32(0, vec 313 rx.data_crc = cpu_to_je32(crc32(0, vecs[1].iov_base, vecs[1].iov_len));
315 rx.node_crc = cpu_to_je32(crc32(0, &rx 314 rx.node_crc = cpu_to_je32(crc32(0, &rx, sizeof(struct jffs2_raw_xattr) - 4));
316 315
317 rc = jffs2_flash_writev(c, vecs, 2, ph 316 rc = jffs2_flash_writev(c, vecs, 2, phys_ofs, &length, 0);
318 if (rc || totlen != length) { 317 if (rc || totlen != length) {
319 JFFS2_WARNING("jffs2_flash_wri 318 JFFS2_WARNING("jffs2_flash_writev()=%d, req=%u, wrote=%zu, at %#08x\n",
320 rc, totlen, leng 319 rc, totlen, length, phys_ofs);
321 rc = rc ? rc : -EIO; 320 rc = rc ? rc : -EIO;
322 if (length) 321 if (length)
323 jffs2_add_physical_nod 322 jffs2_add_physical_node_ref(c, phys_ofs | REF_OBSOLETE, PAD(totlen), NULL);
324 323
325 return rc; 324 return rc;
326 } 325 }
327 /* success */ 326 /* success */
328 jffs2_add_physical_node_ref(c, phys_of 327 jffs2_add_physical_node_ref(c, phys_ofs | REF_PRISTINE, PAD(totlen), (void *)xd);
329 328
330 dbg_xattr("success on saving xdatum (x 329 dbg_xattr("success on saving xdatum (xid=%u, version=%u, xprefix=%u, xname='%s')\n",
331 xd->xid, xd->version, xd->xp 330 xd->xid, xd->version, xd->xprefix, xd->xname);
332 331
333 return 0; 332 return 0;
334 } 333 }
335 334
336 static struct jffs2_xattr_datum *create_xattr_ 335 static struct jffs2_xattr_datum *create_xattr_datum(struct jffs2_sb_info *c,
337 336 int xprefix, const char *xname,
338 337 const char *xvalue, int xsize)
339 { 338 {
340 /* must be called under down_write(xat 339 /* must be called under down_write(xattr_sem) */
341 struct jffs2_xattr_datum *xd; 340 struct jffs2_xattr_datum *xd;
342 uint32_t hashkey, name_len; 341 uint32_t hashkey, name_len;
343 char *data; 342 char *data;
344 int i, rc; 343 int i, rc;
345 344
346 /* Search xattr_datum has same xname/x 345 /* Search xattr_datum has same xname/xvalue by index */
347 hashkey = xattr_datum_hashkey(xprefix, 346 hashkey = xattr_datum_hashkey(xprefix, xname, xvalue, xsize);
348 i = hashkey % XATTRINDEX_HASHSIZE; 347 i = hashkey % XATTRINDEX_HASHSIZE;
349 list_for_each_entry(xd, &c->xattrindex 348 list_for_each_entry(xd, &c->xattrindex[i], xindex) {
350 if (xd->hashkey==hashkey 349 if (xd->hashkey==hashkey
351 && xd->xprefix==xprefix 350 && xd->xprefix==xprefix
352 && xd->value_len==xsize 351 && xd->value_len==xsize
353 && !strcmp(xd->xname, xnam 352 && !strcmp(xd->xname, xname)
354 && !memcmp(xd->xvalue, xva 353 && !memcmp(xd->xvalue, xvalue, xsize)) {
355 atomic_inc(&xd->refcnt 354 atomic_inc(&xd->refcnt);
356 return xd; 355 return xd;
357 } 356 }
358 } 357 }
359 358
360 /* Not found, Create NEW XATTR-Cache * 359 /* Not found, Create NEW XATTR-Cache */
361 name_len = strlen(xname); 360 name_len = strlen(xname);
362 361
363 xd = jffs2_alloc_xattr_datum(); 362 xd = jffs2_alloc_xattr_datum();
364 if (!xd) 363 if (!xd)
365 return ERR_PTR(-ENOMEM); 364 return ERR_PTR(-ENOMEM);
366 365
367 data = kmalloc(name_len + 1 + xsize, G 366 data = kmalloc(name_len + 1 + xsize, GFP_KERNEL);
368 if (!data) { 367 if (!data) {
369 jffs2_free_xattr_datum(xd); 368 jffs2_free_xattr_datum(xd);
370 return ERR_PTR(-ENOMEM); 369 return ERR_PTR(-ENOMEM);
371 } 370 }
372 strcpy(data, xname); 371 strcpy(data, xname);
373 memcpy(data + name_len + 1, xvalue, xs 372 memcpy(data + name_len + 1, xvalue, xsize);
374 373
375 atomic_set(&xd->refcnt, 1); 374 atomic_set(&xd->refcnt, 1);
376 xd->xid = ++c->highest_xid; 375 xd->xid = ++c->highest_xid;
377 xd->flags |= JFFS2_XFLAGS_HOT; 376 xd->flags |= JFFS2_XFLAGS_HOT;
378 xd->xprefix = xprefix; 377 xd->xprefix = xprefix;
379 378
380 xd->hashkey = hashkey; 379 xd->hashkey = hashkey;
381 xd->xname = data; 380 xd->xname = data;
382 xd->xvalue = data + name_len + 1; 381 xd->xvalue = data + name_len + 1;
383 xd->name_len = name_len; 382 xd->name_len = name_len;
384 xd->value_len = xsize; 383 xd->value_len = xsize;
385 xd->data_crc = crc32(0, data, xd->name 384 xd->data_crc = crc32(0, data, xd->name_len + 1 + xd->value_len);
386 385
387 rc = save_xattr_datum(c, xd); 386 rc = save_xattr_datum(c, xd);
388 if (rc) { 387 if (rc) {
389 kfree(xd->xname); 388 kfree(xd->xname);
390 jffs2_free_xattr_datum(xd); 389 jffs2_free_xattr_datum(xd);
391 return ERR_PTR(rc); 390 return ERR_PTR(rc);
392 } 391 }
393 392
394 /* Insert Hash Index */ 393 /* Insert Hash Index */
395 i = hashkey % XATTRINDEX_HASHSIZE; 394 i = hashkey % XATTRINDEX_HASHSIZE;
396 list_add(&xd->xindex, &c->xattrindex[i 395 list_add(&xd->xindex, &c->xattrindex[i]);
397 396
398 c->xdatum_mem_usage += (xd->name_len + 397 c->xdatum_mem_usage += (xd->name_len + 1 + xd->value_len);
399 reclaim_xattr_datum(c); 398 reclaim_xattr_datum(c);
400 399
401 return xd; 400 return xd;
402 } 401 }
403 402
404 static void unrefer_xattr_datum(struct jffs2_s 403 static void unrefer_xattr_datum(struct jffs2_sb_info *c, struct jffs2_xattr_datum *xd)
405 { 404 {
406 /* must be called under down_write(xat 405 /* must be called under down_write(xattr_sem) */
407 if (atomic_dec_and_lock(&xd->refcnt, & 406 if (atomic_dec_and_lock(&xd->refcnt, &c->erase_completion_lock)) {
408 unload_xattr_datum(c, xd); 407 unload_xattr_datum(c, xd);
409 xd->flags |= JFFS2_XFLAGS_DEAD 408 xd->flags |= JFFS2_XFLAGS_DEAD;
410 if (xd->node == (void *)xd) { 409 if (xd->node == (void *)xd) {
411 BUG_ON(!(xd->flags & J 410 BUG_ON(!(xd->flags & JFFS2_XFLAGS_INVALID));
412 jffs2_free_xattr_datum 411 jffs2_free_xattr_datum(xd);
413 } else { 412 } else {
414 list_add(&xd->xindex, 413 list_add(&xd->xindex, &c->xattr_dead_list);
415 } 414 }
416 spin_unlock(&c->erase_completi 415 spin_unlock(&c->erase_completion_lock);
417 416
418 dbg_xattr("xdatum(xid=%u, vers 417 dbg_xattr("xdatum(xid=%u, version=%u) was removed.\n",
419 xd->xid, xd->version 418 xd->xid, xd->version);
420 } 419 }
421 } 420 }
422 421
423 /* -------- xref related functions ----------- 422 /* -------- xref related functions ------------------
424 * verify_xattr_ref(c, ref) 423 * verify_xattr_ref(c, ref)
425 * is used to load xref information from med 424 * is used to load xref information from medium. Because summary data does not
426 * contain xid/ino, it's necessary to verify 425 * contain xid/ino, it's necessary to verify once while mounting process.
427 * save_xattr_ref(c, ref) 426 * save_xattr_ref(c, ref)
428 * is used to write xref to medium. If delet 427 * is used to write xref to medium. If delete marker is marked, it write
429 * a delete marker of xref into medium. 428 * a delete marker of xref into medium.
430 * create_xattr_ref(c, ic, xd) 429 * create_xattr_ref(c, ic, xd)
431 * is used to create a new xref and write to 430 * is used to create a new xref and write to medium.
432 * delete_xattr_ref(c, ref) 431 * delete_xattr_ref(c, ref)
433 * is used to delete jffs2_xattr_ref. It mar 432 * is used to delete jffs2_xattr_ref. It marks xref XREF_DELETE_MARKER,
434 * and allows GC to reclaim those physical n 433 * and allows GC to reclaim those physical nodes.
435 * jffs2_xattr_delete_inode(c, ic) 434 * jffs2_xattr_delete_inode(c, ic)
436 * is called to remove xrefs related to obso 435 * is called to remove xrefs related to obsolete inode when inode is unlinked.
437 * jffs2_xattr_free_inode(c, ic) 436 * jffs2_xattr_free_inode(c, ic)
438 * is called to release xattr related object 437 * is called to release xattr related objects when unmounting.
439 * check_xattr_ref_inode(c, ic) 438 * check_xattr_ref_inode(c, ic)
440 * is used to confirm inode does not have du 439 * is used to confirm inode does not have duplicate xattr name/value pair.
441 * jffs2_xattr_do_crccheck_inode(c, ic) 440 * jffs2_xattr_do_crccheck_inode(c, ic)
442 * is used to force xattr data integrity che 441 * is used to force xattr data integrity check during the initial gc scan.
443 * ------------------------------------------- 442 * -------------------------------------------------- */
444 static int verify_xattr_ref(struct jffs2_sb_in 443 static int verify_xattr_ref(struct jffs2_sb_info *c, struct jffs2_xattr_ref *ref)
445 { 444 {
446 struct jffs2_eraseblock *jeb; 445 struct jffs2_eraseblock *jeb;
447 struct jffs2_raw_node_ref *raw; 446 struct jffs2_raw_node_ref *raw;
448 struct jffs2_raw_xref rr; 447 struct jffs2_raw_xref rr;
449 size_t readlen; 448 size_t readlen;
450 uint32_t crc, offset, totlen; 449 uint32_t crc, offset, totlen;
451 int rc; 450 int rc;
452 451
453 spin_lock(&c->erase_completion_lock); 452 spin_lock(&c->erase_completion_lock);
454 if (ref_flags(ref->node) != REF_UNCHEC 453 if (ref_flags(ref->node) != REF_UNCHECKED)
455 goto complete; 454 goto complete;
456 offset = ref_offset(ref->node); 455 offset = ref_offset(ref->node);
457 spin_unlock(&c->erase_completion_lock) 456 spin_unlock(&c->erase_completion_lock);
458 457
459 rc = jffs2_flash_read(c, offset, sizeo 458 rc = jffs2_flash_read(c, offset, sizeof(rr), &readlen, (char *)&rr);
460 if (rc || sizeof(rr) != readlen) { 459 if (rc || sizeof(rr) != readlen) {
461 JFFS2_WARNING("jffs2_flash_rea 460 JFFS2_WARNING("jffs2_flash_read()=%d, req=%zu, read=%zu, at %#08x\n",
462 rc, sizeof(rr), 461 rc, sizeof(rr), readlen, offset);
463 return rc ? rc : -EIO; 462 return rc ? rc : -EIO;
464 } 463 }
465 /* obsolete node */ 464 /* obsolete node */
466 crc = crc32(0, &rr, sizeof(rr) - 4); 465 crc = crc32(0, &rr, sizeof(rr) - 4);
467 if (crc != je32_to_cpu(rr.node_crc)) { 466 if (crc != je32_to_cpu(rr.node_crc)) {
468 JFFS2_ERROR("node CRC failed a 467 JFFS2_ERROR("node CRC failed at %#08x, read=%#08x, calc=%#08x\n",
469 offset, je32_to_cp 468 offset, je32_to_cpu(rr.node_crc), crc);
470 return JFFS2_XATTR_IS_CORRUPTE 469 return JFFS2_XATTR_IS_CORRUPTED;
471 } 470 }
472 if (je16_to_cpu(rr.magic) != JFFS2_MAG 471 if (je16_to_cpu(rr.magic) != JFFS2_MAGIC_BITMASK
473 || je16_to_cpu(rr.nodetype) != JFF 472 || je16_to_cpu(rr.nodetype) != JFFS2_NODETYPE_XREF
474 || je32_to_cpu(rr.totlen) != PAD(s 473 || je32_to_cpu(rr.totlen) != PAD(sizeof(rr))) {
475 JFFS2_ERROR("inconsistent xref 474 JFFS2_ERROR("inconsistent xref at %#08x, magic=%#04x/%#04x, "
476 "nodetype=%#04x/%# 475 "nodetype=%#04x/%#04x, totlen=%u/%zu\n",
477 offset, je16_to_cp 476 offset, je16_to_cpu(rr.magic), JFFS2_MAGIC_BITMASK,
478 je16_to_cpu(rr.nod 477 je16_to_cpu(rr.nodetype), JFFS2_NODETYPE_XREF,
479 je32_to_cpu(rr.tot 478 je32_to_cpu(rr.totlen), PAD(sizeof(rr)));
480 return JFFS2_XATTR_IS_CORRUPTE 479 return JFFS2_XATTR_IS_CORRUPTED;
481 } 480 }
482 ref->ino = je32_to_cpu(rr.ino); 481 ref->ino = je32_to_cpu(rr.ino);
483 ref->xid = je32_to_cpu(rr.xid); 482 ref->xid = je32_to_cpu(rr.xid);
484 ref->xseqno = je32_to_cpu(rr.xseqno); 483 ref->xseqno = je32_to_cpu(rr.xseqno);
485 if (ref->xseqno > c->highest_xseqno) 484 if (ref->xseqno > c->highest_xseqno)
486 c->highest_xseqno = (ref->xseq 485 c->highest_xseqno = (ref->xseqno & ~XREF_DELETE_MARKER);
487 486
488 spin_lock(&c->erase_completion_lock); 487 spin_lock(&c->erase_completion_lock);
489 complete: 488 complete:
490 for (raw=ref->node; raw != (void *)ref 489 for (raw=ref->node; raw != (void *)ref; raw=raw->next_in_ino) {
491 jeb = &c->blocks[ref_offset(ra 490 jeb = &c->blocks[ref_offset(raw) / c->sector_size];
492 totlen = PAD(ref_totlen(c, jeb 491 totlen = PAD(ref_totlen(c, jeb, raw));
493 if (ref_flags(raw) == REF_UNCH 492 if (ref_flags(raw) == REF_UNCHECKED) {
494 c->unchecked_size -= t 493 c->unchecked_size -= totlen; c->used_size += totlen;
495 jeb->unchecked_size -= 494 jeb->unchecked_size -= totlen; jeb->used_size += totlen;
496 } 495 }
497 raw->flash_offset = ref_offset 496 raw->flash_offset = ref_offset(raw) | ((ref->node==raw) ? REF_PRISTINE : REF_NORMAL);
498 } 497 }
499 spin_unlock(&c->erase_completion_lock) 498 spin_unlock(&c->erase_completion_lock);
500 499
501 dbg_xattr("success on verifying xref ( 500 dbg_xattr("success on verifying xref (ino=%u, xid=%u) at %#08x\n",
502 ref->ino, ref->xid, ref_offs 501 ref->ino, ref->xid, ref_offset(ref->node));
503 return 0; 502 return 0;
504 } 503 }
505 504
506 static int save_xattr_ref(struct jffs2_sb_info 505 static int save_xattr_ref(struct jffs2_sb_info *c, struct jffs2_xattr_ref *ref)
507 { 506 {
508 /* must be called under down_write(xat 507 /* must be called under down_write(xattr_sem) */
509 struct jffs2_raw_xref rr; 508 struct jffs2_raw_xref rr;
510 size_t length; 509 size_t length;
511 uint32_t xseqno, phys_ofs = write_ofs( 510 uint32_t xseqno, phys_ofs = write_ofs(c);
512 int ret; 511 int ret;
513 512
514 rr.magic = cpu_to_je16(JFFS2_MAGIC_BIT 513 rr.magic = cpu_to_je16(JFFS2_MAGIC_BITMASK);
515 rr.nodetype = cpu_to_je16(JFFS2_NODETY 514 rr.nodetype = cpu_to_je16(JFFS2_NODETYPE_XREF);
516 rr.totlen = cpu_to_je32(PAD(sizeof(rr) 515 rr.totlen = cpu_to_je32(PAD(sizeof(rr)));
517 rr.hdr_crc = cpu_to_je32(crc32(0, &rr, 516 rr.hdr_crc = cpu_to_je32(crc32(0, &rr, sizeof(struct jffs2_unknown_node) - 4));
518 517
519 xseqno = (c->highest_xseqno += 2); 518 xseqno = (c->highest_xseqno += 2);
520 if (is_xattr_ref_dead(ref)) { 519 if (is_xattr_ref_dead(ref)) {
521 xseqno |= XREF_DELETE_MARKER; 520 xseqno |= XREF_DELETE_MARKER;
522 rr.ino = cpu_to_je32(ref->ino) 521 rr.ino = cpu_to_je32(ref->ino);
523 rr.xid = cpu_to_je32(ref->xid) 522 rr.xid = cpu_to_je32(ref->xid);
524 } else { 523 } else {
525 rr.ino = cpu_to_je32(ref->ic-> 524 rr.ino = cpu_to_je32(ref->ic->ino);
526 rr.xid = cpu_to_je32(ref->xd-> 525 rr.xid = cpu_to_je32(ref->xd->xid);
527 } 526 }
528 rr.xseqno = cpu_to_je32(xseqno); 527 rr.xseqno = cpu_to_je32(xseqno);
529 rr.node_crc = cpu_to_je32(crc32(0, &rr 528 rr.node_crc = cpu_to_je32(crc32(0, &rr, sizeof(rr) - 4));
530 529
531 ret = jffs2_flash_write(c, phys_ofs, s 530 ret = jffs2_flash_write(c, phys_ofs, sizeof(rr), &length, (char *)&rr);
532 if (ret || sizeof(rr) != length) { 531 if (ret || sizeof(rr) != length) {
533 JFFS2_WARNING("jffs2_flash_wri 532 JFFS2_WARNING("jffs2_flash_write() returned %d, request=%zu, retlen=%zu, at %#08x\n",
534 ret, sizeof(rr), 533 ret, sizeof(rr), length, phys_ofs);
535 ret = ret ? ret : -EIO; 534 ret = ret ? ret : -EIO;
536 if (length) 535 if (length)
537 jffs2_add_physical_nod 536 jffs2_add_physical_node_ref(c, phys_ofs | REF_OBSOLETE, PAD(sizeof(rr)), NULL);
538 537
539 return ret; 538 return ret;
540 } 539 }
541 /* success */ 540 /* success */
542 ref->xseqno = xseqno; 541 ref->xseqno = xseqno;
543 jffs2_add_physical_node_ref(c, phys_of 542 jffs2_add_physical_node_ref(c, phys_ofs | REF_PRISTINE, PAD(sizeof(rr)), (void *)ref);
544 543
545 dbg_xattr("success on saving xref (ino 544 dbg_xattr("success on saving xref (ino=%u, xid=%u)\n", ref->ic->ino, ref->xd->xid);
546 545
547 return 0; 546 return 0;
548 } 547 }
549 548
550 static struct jffs2_xattr_ref *create_xattr_re 549 static struct jffs2_xattr_ref *create_xattr_ref(struct jffs2_sb_info *c, struct jffs2_inode_cache *ic,
551 550 struct jffs2_xattr_datum *xd)
552 { 551 {
553 /* must be called under down_write(xat 552 /* must be called under down_write(xattr_sem) */
554 struct jffs2_xattr_ref *ref; 553 struct jffs2_xattr_ref *ref;
555 int ret; 554 int ret;
556 555
557 ref = jffs2_alloc_xattr_ref(); 556 ref = jffs2_alloc_xattr_ref();
558 if (!ref) 557 if (!ref)
559 return ERR_PTR(-ENOMEM); 558 return ERR_PTR(-ENOMEM);
560 ref->ic = ic; 559 ref->ic = ic;
561 ref->xd = xd; 560 ref->xd = xd;
562 561
563 ret = save_xattr_ref(c, ref); 562 ret = save_xattr_ref(c, ref);
564 if (ret) { 563 if (ret) {
565 jffs2_free_xattr_ref(ref); 564 jffs2_free_xattr_ref(ref);
566 return ERR_PTR(ret); 565 return ERR_PTR(ret);
567 } 566 }
568 567
569 /* Chain to inode */ 568 /* Chain to inode */
570 ref->next = ic->xref; 569 ref->next = ic->xref;
571 ic->xref = ref; 570 ic->xref = ref;
572 571
573 return ref; /* success */ 572 return ref; /* success */
574 } 573 }
575 574
576 static void delete_xattr_ref(struct jffs2_sb_i 575 static void delete_xattr_ref(struct jffs2_sb_info *c, struct jffs2_xattr_ref *ref)
577 { 576 {
578 /* must be called under down_write(xat 577 /* must be called under down_write(xattr_sem) */
579 struct jffs2_xattr_datum *xd; 578 struct jffs2_xattr_datum *xd;
580 579
581 xd = ref->xd; 580 xd = ref->xd;
582 ref->xseqno |= XREF_DELETE_MARKER; 581 ref->xseqno |= XREF_DELETE_MARKER;
583 ref->ino = ref->ic->ino; 582 ref->ino = ref->ic->ino;
584 ref->xid = ref->xd->xid; 583 ref->xid = ref->xd->xid;
585 spin_lock(&c->erase_completion_lock); 584 spin_lock(&c->erase_completion_lock);
586 ref->next = c->xref_dead_list; 585 ref->next = c->xref_dead_list;
587 c->xref_dead_list = ref; 586 c->xref_dead_list = ref;
588 spin_unlock(&c->erase_completion_lock) 587 spin_unlock(&c->erase_completion_lock);
589 588
590 dbg_xattr("xref(ino=%u, xid=%u, xseqno 589 dbg_xattr("xref(ino=%u, xid=%u, xseqno=%u) was removed.\n",
591 ref->ino, ref->xid, ref->xse 590 ref->ino, ref->xid, ref->xseqno);
592 591
593 unrefer_xattr_datum(c, xd); 592 unrefer_xattr_datum(c, xd);
594 } 593 }
595 594
596 void jffs2_xattr_delete_inode(struct jffs2_sb_ 595 void jffs2_xattr_delete_inode(struct jffs2_sb_info *c, struct jffs2_inode_cache *ic)
597 { 596 {
598 /* It's called from jffs2_evict_inode( 597 /* It's called from jffs2_evict_inode() on inode removing.
599 When an inode with XATTR is removed 598 When an inode with XATTR is removed, those XATTRs must be removed. */
600 struct jffs2_xattr_ref *ref, *_ref; 599 struct jffs2_xattr_ref *ref, *_ref;
601 600
602 if (!ic || ic->pino_nlink > 0) 601 if (!ic || ic->pino_nlink > 0)
603 return; 602 return;
604 603
605 down_write(&c->xattr_sem); 604 down_write(&c->xattr_sem);
606 for (ref = ic->xref; ref; ref = _ref) 605 for (ref = ic->xref; ref; ref = _ref) {
607 _ref = ref->next; 606 _ref = ref->next;
608 delete_xattr_ref(c, ref); 607 delete_xattr_ref(c, ref);
609 } 608 }
610 ic->xref = NULL; 609 ic->xref = NULL;
611 up_write(&c->xattr_sem); 610 up_write(&c->xattr_sem);
612 } 611 }
613 612
614 void jffs2_xattr_free_inode(struct jffs2_sb_in 613 void jffs2_xattr_free_inode(struct jffs2_sb_info *c, struct jffs2_inode_cache *ic)
615 { 614 {
616 /* It's called from jffs2_free_ino_cac 615 /* It's called from jffs2_free_ino_caches() until unmounting FS. */
617 struct jffs2_xattr_datum *xd; 616 struct jffs2_xattr_datum *xd;
618 struct jffs2_xattr_ref *ref, *_ref; 617 struct jffs2_xattr_ref *ref, *_ref;
619 618
620 down_write(&c->xattr_sem); 619 down_write(&c->xattr_sem);
621 for (ref = ic->xref; ref; ref = _ref) 620 for (ref = ic->xref; ref; ref = _ref) {
622 _ref = ref->next; 621 _ref = ref->next;
623 xd = ref->xd; 622 xd = ref->xd;
624 if (atomic_dec_and_test(&xd->r 623 if (atomic_dec_and_test(&xd->refcnt)) {
625 unload_xattr_datum(c, 624 unload_xattr_datum(c, xd);
626 jffs2_free_xattr_datum 625 jffs2_free_xattr_datum(xd);
627 } 626 }
628 jffs2_free_xattr_ref(ref); 627 jffs2_free_xattr_ref(ref);
629 } 628 }
630 ic->xref = NULL; 629 ic->xref = NULL;
631 up_write(&c->xattr_sem); 630 up_write(&c->xattr_sem);
632 } 631 }
633 632
634 static int check_xattr_ref_inode(struct jffs2_ 633 static int check_xattr_ref_inode(struct jffs2_sb_info *c, struct jffs2_inode_cache *ic)
635 { 634 {
636 /* success of check_xattr_ref_inode() 635 /* success of check_xattr_ref_inode() means that inode (ic) dose not have
637 * duplicate name/value pairs. If dupl 636 * duplicate name/value pairs. If duplicate name/value pair would be found,
638 * one will be removed. 637 * one will be removed.
639 */ 638 */
640 struct jffs2_xattr_ref *ref, *cmp, **p 639 struct jffs2_xattr_ref *ref, *cmp, **pref, **pcmp;
641 int rc = 0; 640 int rc = 0;
642 641
643 if (likely(ic->flags & INO_FLAGS_XATTR 642 if (likely(ic->flags & INO_FLAGS_XATTR_CHECKED))
644 return 0; 643 return 0;
645 down_write(&c->xattr_sem); 644 down_write(&c->xattr_sem);
646 retry: 645 retry:
647 rc = 0; 646 rc = 0;
648 for (ref=ic->xref, pref=&ic->xref; ref 647 for (ref=ic->xref, pref=&ic->xref; ref; pref=&ref->next, ref=ref->next) {
649 if (!ref->xd->xname) { 648 if (!ref->xd->xname) {
650 rc = load_xattr_datum( 649 rc = load_xattr_datum(c, ref->xd);
651 if (unlikely(rc > 0)) 650 if (unlikely(rc > 0)) {
652 *pref = ref->n 651 *pref = ref->next;
653 delete_xattr_r 652 delete_xattr_ref(c, ref);
654 goto retry; 653 goto retry;
655 } else if (unlikely(rc 654 } else if (unlikely(rc < 0))
656 goto out; 655 goto out;
657 } 656 }
658 for (cmp=ref->next, pcmp=&ref- 657 for (cmp=ref->next, pcmp=&ref->next; cmp; pcmp=&cmp->next, cmp=cmp->next) {
659 if (!cmp->xd->xname) { 658 if (!cmp->xd->xname) {
660 ref->xd->flags 659 ref->xd->flags |= JFFS2_XFLAGS_BIND;
661 rc = load_xatt 660 rc = load_xattr_datum(c, cmp->xd);
662 ref->xd->flags 661 ref->xd->flags &= ~JFFS2_XFLAGS_BIND;
663 if (unlikely(r 662 if (unlikely(rc > 0)) {
664 *pcmp 663 *pcmp = cmp->next;
665 delete 664 delete_xattr_ref(c, cmp);
666 goto r 665 goto retry;
667 } else if (unl 666 } else if (unlikely(rc < 0))
668 goto o 667 goto out;
669 } 668 }
670 if (ref->xd->xprefix = 669 if (ref->xd->xprefix == cmp->xd->xprefix
671 && !strcmp(ref->xd 670 && !strcmp(ref->xd->xname, cmp->xd->xname)) {
672 if (ref->xseqn 671 if (ref->xseqno > cmp->xseqno) {
673 *pcmp 672 *pcmp = cmp->next;
674 delete 673 delete_xattr_ref(c, cmp);
675 } else { 674 } else {
676 *pref 675 *pref = ref->next;
677 delete 676 delete_xattr_ref(c, ref);
678 } 677 }
679 goto retry; 678 goto retry;
680 } 679 }
681 } 680 }
682 } 681 }
683 ic->flags |= INO_FLAGS_XATTR_CHECKED; 682 ic->flags |= INO_FLAGS_XATTR_CHECKED;
684 out: 683 out:
685 up_write(&c->xattr_sem); 684 up_write(&c->xattr_sem);
686 685
687 return rc; 686 return rc;
688 } 687 }
689 688
690 void jffs2_xattr_do_crccheck_inode(struct jffs 689 void jffs2_xattr_do_crccheck_inode(struct jffs2_sb_info *c, struct jffs2_inode_cache *ic)
691 { 690 {
692 check_xattr_ref_inode(c, ic); 691 check_xattr_ref_inode(c, ic);
693 } 692 }
694 693
695 /* -------- xattr subsystem functions -------- 694 /* -------- xattr subsystem functions ---------------
696 * jffs2_init_xattr_subsystem(c) 695 * jffs2_init_xattr_subsystem(c)
697 * is used to initialize semaphore and list_ 696 * is used to initialize semaphore and list_head, and some variables.
698 * jffs2_find_xattr_datum(c, xid) 697 * jffs2_find_xattr_datum(c, xid)
699 * is used to lookup xdatum while scanning p 698 * is used to lookup xdatum while scanning process.
700 * jffs2_clear_xattr_subsystem(c) 699 * jffs2_clear_xattr_subsystem(c)
701 * is used to release any xattr related obje 700 * is used to release any xattr related objects.
702 * jffs2_build_xattr_subsystem(c) 701 * jffs2_build_xattr_subsystem(c)
703 * is used to associate xdatum and xref whil 702 * is used to associate xdatum and xref while super block building process.
704 * jffs2_setup_xattr_datum(c, xid, version) 703 * jffs2_setup_xattr_datum(c, xid, version)
705 * is used to insert xdatum while scanning p 704 * is used to insert xdatum while scanning process.
706 * ------------------------------------------- 705 * -------------------------------------------------- */
707 void jffs2_init_xattr_subsystem(struct jffs2_s 706 void jffs2_init_xattr_subsystem(struct jffs2_sb_info *c)
708 { 707 {
709 int i; 708 int i;
710 709
711 for (i=0; i < XATTRINDEX_HASHSIZE; i++ 710 for (i=0; i < XATTRINDEX_HASHSIZE; i++)
712 INIT_LIST_HEAD(&c->xattrindex[ 711 INIT_LIST_HEAD(&c->xattrindex[i]);
713 INIT_LIST_HEAD(&c->xattr_unchecked); 712 INIT_LIST_HEAD(&c->xattr_unchecked);
714 INIT_LIST_HEAD(&c->xattr_dead_list); 713 INIT_LIST_HEAD(&c->xattr_dead_list);
715 c->xref_dead_list = NULL; 714 c->xref_dead_list = NULL;
716 c->xref_temp = NULL; 715 c->xref_temp = NULL;
717 716
718 init_rwsem(&c->xattr_sem); 717 init_rwsem(&c->xattr_sem);
719 c->highest_xid = 0; 718 c->highest_xid = 0;
720 c->highest_xseqno = 0; 719 c->highest_xseqno = 0;
721 c->xdatum_mem_usage = 0; 720 c->xdatum_mem_usage = 0;
722 c->xdatum_mem_threshold = 32 * 1024; 721 c->xdatum_mem_threshold = 32 * 1024; /* Default 32KB */
723 } 722 }
724 723
725 static struct jffs2_xattr_datum *jffs2_find_xa 724 static struct jffs2_xattr_datum *jffs2_find_xattr_datum(struct jffs2_sb_info *c, uint32_t xid)
726 { 725 {
727 struct jffs2_xattr_datum *xd; 726 struct jffs2_xattr_datum *xd;
728 int i = xid % XATTRINDEX_HASHSIZE; 727 int i = xid % XATTRINDEX_HASHSIZE;
729 728
730 /* It's only used in scanning/building 729 /* It's only used in scanning/building process. */
731 BUG_ON(!(c->flags & (JFFS2_SB_FLAG_SCA 730 BUG_ON(!(c->flags & (JFFS2_SB_FLAG_SCANNING|JFFS2_SB_FLAG_BUILDING)));
732 731
733 list_for_each_entry(xd, &c->xattrindex 732 list_for_each_entry(xd, &c->xattrindex[i], xindex) {
734 if (xd->xid==xid) 733 if (xd->xid==xid)
735 return xd; 734 return xd;
736 } 735 }
737 return NULL; 736 return NULL;
738 } 737 }
739 738
740 void jffs2_clear_xattr_subsystem(struct jffs2_ 739 void jffs2_clear_xattr_subsystem(struct jffs2_sb_info *c)
741 { 740 {
742 struct jffs2_xattr_datum *xd, *_xd; 741 struct jffs2_xattr_datum *xd, *_xd;
743 struct jffs2_xattr_ref *ref, *_ref; 742 struct jffs2_xattr_ref *ref, *_ref;
744 int i; 743 int i;
745 744
746 for (ref=c->xref_temp; ref; ref = _ref 745 for (ref=c->xref_temp; ref; ref = _ref) {
747 _ref = ref->next; 746 _ref = ref->next;
748 jffs2_free_xattr_ref(ref); 747 jffs2_free_xattr_ref(ref);
749 } 748 }
750 749
751 for (ref=c->xref_dead_list; ref; ref = 750 for (ref=c->xref_dead_list; ref; ref = _ref) {
752 _ref = ref->next; 751 _ref = ref->next;
753 jffs2_free_xattr_ref(ref); 752 jffs2_free_xattr_ref(ref);
754 } 753 }
755 754
756 for (i=0; i < XATTRINDEX_HASHSIZE; i++ 755 for (i=0; i < XATTRINDEX_HASHSIZE; i++) {
757 list_for_each_entry_safe(xd, _ 756 list_for_each_entry_safe(xd, _xd, &c->xattrindex[i], xindex) {
758 list_del(&xd->xindex); 757 list_del(&xd->xindex);
759 kfree(xd->xname); !! 758 if (xd->xname)
>> 759 kfree(xd->xname);
760 jffs2_free_xattr_datum 760 jffs2_free_xattr_datum(xd);
761 } 761 }
762 } 762 }
763 763
764 list_for_each_entry_safe(xd, _xd, &c-> 764 list_for_each_entry_safe(xd, _xd, &c->xattr_dead_list, xindex) {
765 list_del(&xd->xindex); 765 list_del(&xd->xindex);
766 jffs2_free_xattr_datum(xd); 766 jffs2_free_xattr_datum(xd);
767 } 767 }
768 list_for_each_entry_safe(xd, _xd, &c-> 768 list_for_each_entry_safe(xd, _xd, &c->xattr_unchecked, xindex) {
769 list_del(&xd->xindex); 769 list_del(&xd->xindex);
770 jffs2_free_xattr_datum(xd); 770 jffs2_free_xattr_datum(xd);
771 } 771 }
772 } 772 }
773 773
774 #define XREF_TMPHASH_SIZE (128) 774 #define XREF_TMPHASH_SIZE (128)
775 int jffs2_build_xattr_subsystem(struct jffs2_s !! 775 void jffs2_build_xattr_subsystem(struct jffs2_sb_info *c)
776 { 776 {
777 struct jffs2_xattr_ref *ref, *_ref; 777 struct jffs2_xattr_ref *ref, *_ref;
778 struct jffs2_xattr_ref **xref_tmphash; !! 778 struct jffs2_xattr_ref *xref_tmphash[XREF_TMPHASH_SIZE];
779 struct jffs2_xattr_datum *xd, *_xd; 779 struct jffs2_xattr_datum *xd, *_xd;
780 struct jffs2_inode_cache *ic; 780 struct jffs2_inode_cache *ic;
781 struct jffs2_raw_node_ref *raw; 781 struct jffs2_raw_node_ref *raw;
782 int i, xdatum_count = 0, xdatum_unchec 782 int i, xdatum_count = 0, xdatum_unchecked_count = 0, xref_count = 0;
783 int xdatum_orphan_count = 0, xref_orph 783 int xdatum_orphan_count = 0, xref_orphan_count = 0, xref_dead_count = 0;
784 784
785 BUG_ON(!(c->flags & JFFS2_SB_FLAG_BUIL 785 BUG_ON(!(c->flags & JFFS2_SB_FLAG_BUILDING));
786 786
787 xref_tmphash = kcalloc(XREF_TMPHASH_SI <<
788 sizeof(struct j <<
789 if (!xref_tmphash) <<
790 return -ENOMEM; <<
791 <<
792 /* Phase.1 : Merge same xref */ 787 /* Phase.1 : Merge same xref */
>> 788 for (i=0; i < XREF_TMPHASH_SIZE; i++)
>> 789 xref_tmphash[i] = NULL;
793 for (ref=c->xref_temp; ref; ref=_ref) 790 for (ref=c->xref_temp; ref; ref=_ref) {
794 struct jffs2_xattr_ref *tmp; 791 struct jffs2_xattr_ref *tmp;
795 792
796 _ref = ref->next; 793 _ref = ref->next;
797 if (ref_flags(ref->node) != RE 794 if (ref_flags(ref->node) != REF_PRISTINE) {
798 if (verify_xattr_ref(c 795 if (verify_xattr_ref(c, ref)) {
799 BUG_ON(ref->no 796 BUG_ON(ref->node->next_in_ino != (void *)ref);
800 ref->node->nex 797 ref->node->next_in_ino = NULL;
801 jffs2_mark_nod 798 jffs2_mark_node_obsolete(c, ref->node);
802 jffs2_free_xat 799 jffs2_free_xattr_ref(ref);
803 continue; 800 continue;
804 } 801 }
805 } 802 }
806 803
807 i = (ref->ino ^ ref->xid) % XR 804 i = (ref->ino ^ ref->xid) % XREF_TMPHASH_SIZE;
808 for (tmp=xref_tmphash[i]; tmp; 805 for (tmp=xref_tmphash[i]; tmp; tmp=tmp->next) {
809 if (tmp->ino == ref->i 806 if (tmp->ino == ref->ino && tmp->xid == ref->xid)
810 break; 807 break;
811 } 808 }
812 if (tmp) { 809 if (tmp) {
813 raw = ref->node; 810 raw = ref->node;
814 if (ref->xseqno > tmp- 811 if (ref->xseqno > tmp->xseqno) {
815 tmp->xseqno = 812 tmp->xseqno = ref->xseqno;
816 raw->next_in_i 813 raw->next_in_ino = tmp->node;
817 tmp->node = ra 814 tmp->node = raw;
818 } else { 815 } else {
819 raw->next_in_i 816 raw->next_in_ino = tmp->node->next_in_ino;
820 tmp->node->nex 817 tmp->node->next_in_ino = raw;
821 } 818 }
822 jffs2_free_xattr_ref(r 819 jffs2_free_xattr_ref(ref);
823 continue; 820 continue;
824 } else { 821 } else {
825 ref->next = xref_tmpha 822 ref->next = xref_tmphash[i];
826 xref_tmphash[i] = ref; 823 xref_tmphash[i] = ref;
827 } 824 }
828 } 825 }
829 c->xref_temp = NULL; 826 c->xref_temp = NULL;
830 827
831 /* Phase.2 : Bind xref with inode_cach 828 /* Phase.2 : Bind xref with inode_cache and xattr_datum */
832 for (i=0; i < XREF_TMPHASH_SIZE; i++) 829 for (i=0; i < XREF_TMPHASH_SIZE; i++) {
833 for (ref=xref_tmphash[i]; ref; 830 for (ref=xref_tmphash[i]; ref; ref=_ref) {
834 xref_count++; 831 xref_count++;
835 _ref = ref->next; 832 _ref = ref->next;
836 if (is_xattr_ref_dead( 833 if (is_xattr_ref_dead(ref)) {
837 ref->next = c- 834 ref->next = c->xref_dead_list;
838 c->xref_dead_l 835 c->xref_dead_list = ref;
839 xref_dead_coun 836 xref_dead_count++;
840 continue; 837 continue;
841 } 838 }
842 /* At this point, ref- 839 /* At this point, ref->xid and ref->ino contain XID and inode number.
843 ref->xd and ref->ic 840 ref->xd and ref->ic are not valid yet. */
844 xd = jffs2_find_xattr_ 841 xd = jffs2_find_xattr_datum(c, ref->xid);
845 ic = jffs2_get_ino_cac 842 ic = jffs2_get_ino_cache(c, ref->ino);
846 if (!xd || !ic || !ic- 843 if (!xd || !ic || !ic->pino_nlink) {
847 dbg_xattr("xre 844 dbg_xattr("xref(ino=%u, xid=%u, xseqno=%u) is orphan.\n",
848 ref- 845 ref->ino, ref->xid, ref->xseqno);
849 ref->xseqno |= 846 ref->xseqno |= XREF_DELETE_MARKER;
850 ref->next = c- 847 ref->next = c->xref_dead_list;
851 c->xref_dead_l 848 c->xref_dead_list = ref;
852 xref_orphan_co 849 xref_orphan_count++;
853 continue; 850 continue;
854 } 851 }
855 ref->xd = xd; 852 ref->xd = xd;
856 ref->ic = ic; 853 ref->ic = ic;
857 atomic_inc(&xd->refcnt 854 atomic_inc(&xd->refcnt);
858 ref->next = ic->xref; 855 ref->next = ic->xref;
859 ic->xref = ref; 856 ic->xref = ref;
860 } 857 }
861 } 858 }
862 859
863 /* Phase.3 : Link unchecked xdatum to 860 /* Phase.3 : Link unchecked xdatum to xattr_unchecked list */
864 for (i=0; i < XATTRINDEX_HASHSIZE; i++ 861 for (i=0; i < XATTRINDEX_HASHSIZE; i++) {
865 list_for_each_entry_safe(xd, _ 862 list_for_each_entry_safe(xd, _xd, &c->xattrindex[i], xindex) {
866 xdatum_count++; 863 xdatum_count++;
867 list_del_init(&xd->xin 864 list_del_init(&xd->xindex);
868 if (!atomic_read(&xd-> 865 if (!atomic_read(&xd->refcnt)) {
869 dbg_xattr("xda 866 dbg_xattr("xdatum(xid=%u, version=%u) is orphan.\n",
870 xd-> 867 xd->xid, xd->version);
871 xd->flags |= J 868 xd->flags |= JFFS2_XFLAGS_DEAD;
872 list_add(&xd-> 869 list_add(&xd->xindex, &c->xattr_unchecked);
873 xdatum_orphan_ 870 xdatum_orphan_count++;
874 continue; 871 continue;
875 } 872 }
876 if (is_xattr_datum_unc 873 if (is_xattr_datum_unchecked(c, xd)) {
877 dbg_xattr("unc 874 dbg_xattr("unchecked xdatum(xid=%u, version=%u)\n",
878 xd-> 875 xd->xid, xd->version);
879 list_add(&xd-> 876 list_add(&xd->xindex, &c->xattr_unchecked);
880 xdatum_uncheck 877 xdatum_unchecked_count++;
881 } 878 }
882 } 879 }
883 } 880 }
884 /* build complete */ 881 /* build complete */
885 JFFS2_NOTICE("complete building xattr 882 JFFS2_NOTICE("complete building xattr subsystem, %u of xdatum"
886 " (%u unchecked, %u orpha 883 " (%u unchecked, %u orphan) and "
887 "%u of xref (%u dead, %u 884 "%u of xref (%u dead, %u orphan) found.\n",
888 xdatum_count, xdatum_unch 885 xdatum_count, xdatum_unchecked_count, xdatum_orphan_count,
889 xref_count, xref_dead_cou 886 xref_count, xref_dead_count, xref_orphan_count);
890 kfree(xref_tmphash); <<
891 return 0; <<
892 } 887 }
893 888
894 struct jffs2_xattr_datum *jffs2_setup_xattr_da 889 struct jffs2_xattr_datum *jffs2_setup_xattr_datum(struct jffs2_sb_info *c,
895 890 uint32_t xid, uint32_t version)
896 { 891 {
897 struct jffs2_xattr_datum *xd; 892 struct jffs2_xattr_datum *xd;
898 893
899 xd = jffs2_find_xattr_datum(c, xid); 894 xd = jffs2_find_xattr_datum(c, xid);
900 if (!xd) { 895 if (!xd) {
901 xd = jffs2_alloc_xattr_datum() 896 xd = jffs2_alloc_xattr_datum();
902 if (!xd) 897 if (!xd)
903 return ERR_PTR(-ENOMEM 898 return ERR_PTR(-ENOMEM);
904 xd->xid = xid; 899 xd->xid = xid;
905 xd->version = version; 900 xd->version = version;
906 if (xd->xid > c->highest_xid) 901 if (xd->xid > c->highest_xid)
907 c->highest_xid = xd->x 902 c->highest_xid = xd->xid;
908 list_add_tail(&xd->xindex, &c- 903 list_add_tail(&xd->xindex, &c->xattrindex[xid % XATTRINDEX_HASHSIZE]);
909 } 904 }
910 return xd; 905 return xd;
911 } 906 }
912 907
913 /* -------- xattr subsystem functions -------- 908 /* -------- xattr subsystem functions ---------------
914 * xprefix_to_handler(xprefix) 909 * xprefix_to_handler(xprefix)
915 * is used to translate xprefix into xattr_h 910 * is used to translate xprefix into xattr_handler.
916 * jffs2_listxattr(dentry, buffer, size) 911 * jffs2_listxattr(dentry, buffer, size)
917 * is an implementation of listxattr handler 912 * is an implementation of listxattr handler on jffs2.
918 * do_jffs2_getxattr(inode, xprefix, xname, bu 913 * do_jffs2_getxattr(inode, xprefix, xname, buffer, size)
919 * is an implementation of getxattr handler 914 * is an implementation of getxattr handler on jffs2.
920 * do_jffs2_setxattr(inode, xprefix, xname, bu 915 * do_jffs2_setxattr(inode, xprefix, xname, buffer, size, flags)
921 * is an implementation of setxattr handler 916 * is an implementation of setxattr handler on jffs2.
922 * ------------------------------------------- 917 * -------------------------------------------------- */
923 const struct xattr_handler * const jffs2_xattr !! 918 const struct xattr_handler *jffs2_xattr_handlers[] = {
924 &jffs2_user_xattr_handler, 919 &jffs2_user_xattr_handler,
925 #ifdef CONFIG_JFFS2_FS_SECURITY 920 #ifdef CONFIG_JFFS2_FS_SECURITY
926 &jffs2_security_xattr_handler, 921 &jffs2_security_xattr_handler,
927 #endif 922 #endif
>> 923 #ifdef CONFIG_JFFS2_FS_POSIX_ACL
>> 924 &jffs2_acl_access_xattr_handler,
>> 925 &jffs2_acl_default_xattr_handler,
>> 926 #endif
928 &jffs2_trusted_xattr_handler, 927 &jffs2_trusted_xattr_handler,
929 NULL 928 NULL
930 }; 929 };
931 930
932 static const char *jffs2_xattr_prefix(int xpre !! 931 static const struct xattr_handler *xprefix_to_handler(int xprefix) {
933 { !! 932 const struct xattr_handler *ret;
934 const struct xattr_handler *ret = NULL <<
935 933
936 switch (xprefix) { 934 switch (xprefix) {
937 case JFFS2_XPREFIX_USER: 935 case JFFS2_XPREFIX_USER:
938 ret = &jffs2_user_xattr_handle 936 ret = &jffs2_user_xattr_handler;
939 break; 937 break;
940 #ifdef CONFIG_JFFS2_FS_SECURITY 938 #ifdef CONFIG_JFFS2_FS_SECURITY
941 case JFFS2_XPREFIX_SECURITY: 939 case JFFS2_XPREFIX_SECURITY:
942 ret = &jffs2_security_xattr_ha 940 ret = &jffs2_security_xattr_handler;
943 break; 941 break;
944 #endif 942 #endif
945 #ifdef CONFIG_JFFS2_FS_POSIX_ACL 943 #ifdef CONFIG_JFFS2_FS_POSIX_ACL
946 case JFFS2_XPREFIX_ACL_ACCESS: 944 case JFFS2_XPREFIX_ACL_ACCESS:
947 ret = &nop_posix_acl_access; !! 945 ret = &jffs2_acl_access_xattr_handler;
948 break; 946 break;
949 case JFFS2_XPREFIX_ACL_DEFAULT: 947 case JFFS2_XPREFIX_ACL_DEFAULT:
950 ret = &nop_posix_acl_default; !! 948 ret = &jffs2_acl_default_xattr_handler;
951 break; 949 break;
952 #endif 950 #endif
953 case JFFS2_XPREFIX_TRUSTED: 951 case JFFS2_XPREFIX_TRUSTED:
954 ret = &jffs2_trusted_xattr_han 952 ret = &jffs2_trusted_xattr_handler;
955 break; 953 break;
956 default: 954 default:
957 return NULL; !! 955 ret = NULL;
>> 956 break;
958 } 957 }
959 !! 958 return ret;
960 if (!xattr_handler_can_list(ret, dentr <<
961 return NULL; <<
962 <<
963 return xattr_prefix(ret); <<
964 } 959 }
965 960
966 ssize_t jffs2_listxattr(struct dentry *dentry, 961 ssize_t jffs2_listxattr(struct dentry *dentry, char *buffer, size_t size)
967 { 962 {
968 struct inode *inode = d_inode(dentry); !! 963 struct inode *inode = dentry->d_inode;
969 struct jffs2_inode_info *f = JFFS2_INO 964 struct jffs2_inode_info *f = JFFS2_INODE_INFO(inode);
970 struct jffs2_sb_info *c = JFFS2_SB_INF 965 struct jffs2_sb_info *c = JFFS2_SB_INFO(inode->i_sb);
971 struct jffs2_inode_cache *ic = f->inoc 966 struct jffs2_inode_cache *ic = f->inocache;
972 struct jffs2_xattr_ref *ref, **pref; 967 struct jffs2_xattr_ref *ref, **pref;
973 struct jffs2_xattr_datum *xd; 968 struct jffs2_xattr_datum *xd;
974 const char *prefix; !! 969 const struct xattr_handler *xhandle;
975 ssize_t prefix_len, len, rc; !! 970 ssize_t len, rc;
976 int retry = 0; 971 int retry = 0;
977 972
978 rc = check_xattr_ref_inode(c, ic); 973 rc = check_xattr_ref_inode(c, ic);
979 if (unlikely(rc)) 974 if (unlikely(rc))
980 return rc; 975 return rc;
981 976
982 down_read(&c->xattr_sem); 977 down_read(&c->xattr_sem);
983 retry: 978 retry:
984 len = 0; 979 len = 0;
985 for (ref=ic->xref, pref=&ic->xref; ref 980 for (ref=ic->xref, pref=&ic->xref; ref; pref=&ref->next, ref=ref->next) {
986 BUG_ON(ref->ic != ic); 981 BUG_ON(ref->ic != ic);
987 xd = ref->xd; 982 xd = ref->xd;
988 if (!xd->xname) { 983 if (!xd->xname) {
989 /* xdatum is unchached 984 /* xdatum is unchached */
990 if (!retry) { 985 if (!retry) {
991 retry = 1; 986 retry = 1;
992 up_read(&c->xa 987 up_read(&c->xattr_sem);
993 down_write(&c- 988 down_write(&c->xattr_sem);
994 goto retry; 989 goto retry;
995 } else { 990 } else {
996 rc = load_xatt 991 rc = load_xattr_datum(c, xd);
997 if (unlikely(r 992 if (unlikely(rc > 0)) {
998 *pref 993 *pref = ref->next;
999 delete 994 delete_xattr_ref(c, ref);
1000 goto 995 goto retry;
1001 } else if (un 996 } else if (unlikely(rc < 0))
1002 goto 997 goto out;
1003 } 998 }
1004 } 999 }
1005 !! 1000 xhandle = xprefix_to_handler(xd->xprefix);
1006 prefix = jffs2_xattr_prefix(x !! 1001 if (!xhandle)
1007 if (!prefix) <<
1008 continue; 1002 continue;
1009 prefix_len = strlen(prefix); <<
1010 rc = prefix_len + xd->name_le <<
1011 <<
1012 if (buffer) { 1003 if (buffer) {
1013 if (rc > size - len) !! 1004 rc = xhandle->list(dentry, buffer+len, size-len,
1014 rc = -ERANGE; !! 1005 xd->xname, xd->name_len, xd->flags);
1015 goto out; !! 1006 } else {
1016 } !! 1007 rc = xhandle->list(dentry, NULL, 0, xd->xname,
1017 memcpy(buffer, prefix !! 1008 xd->name_len, xd->flags);
1018 buffer += prefix_len; <<
1019 memcpy(buffer, xd->xn <<
1020 buffer += xd->name_le <<
1021 *buffer++ = 0; <<
1022 } 1009 }
>> 1010 if (rc < 0)
>> 1011 goto out;
1023 len += rc; 1012 len += rc;
1024 } 1013 }
1025 rc = len; 1014 rc = len;
1026 out: 1015 out:
1027 if (!retry) { 1016 if (!retry) {
1028 up_read(&c->xattr_sem); 1017 up_read(&c->xattr_sem);
1029 } else { 1018 } else {
1030 up_write(&c->xattr_sem); 1019 up_write(&c->xattr_sem);
1031 } 1020 }
1032 return rc; 1021 return rc;
1033 } 1022 }
1034 1023
1035 int do_jffs2_getxattr(struct inode *inode, in 1024 int do_jffs2_getxattr(struct inode *inode, int xprefix, const char *xname,
1036 char *buffer, size_t si 1025 char *buffer, size_t size)
1037 { 1026 {
1038 struct jffs2_inode_info *f = JFFS2_IN 1027 struct jffs2_inode_info *f = JFFS2_INODE_INFO(inode);
1039 struct jffs2_sb_info *c = JFFS2_SB_IN 1028 struct jffs2_sb_info *c = JFFS2_SB_INFO(inode->i_sb);
1040 struct jffs2_inode_cache *ic = f->ino 1029 struct jffs2_inode_cache *ic = f->inocache;
1041 struct jffs2_xattr_datum *xd; 1030 struct jffs2_xattr_datum *xd;
1042 struct jffs2_xattr_ref *ref, **pref; 1031 struct jffs2_xattr_ref *ref, **pref;
1043 int rc, retry = 0; 1032 int rc, retry = 0;
1044 1033
1045 rc = check_xattr_ref_inode(c, ic); 1034 rc = check_xattr_ref_inode(c, ic);
1046 if (unlikely(rc)) 1035 if (unlikely(rc))
1047 return rc; 1036 return rc;
1048 1037
1049 down_read(&c->xattr_sem); 1038 down_read(&c->xattr_sem);
1050 retry: 1039 retry:
1051 for (ref=ic->xref, pref=&ic->xref; re 1040 for (ref=ic->xref, pref=&ic->xref; ref; pref=&ref->next, ref=ref->next) {
1052 BUG_ON(ref->ic!=ic); 1041 BUG_ON(ref->ic!=ic);
1053 1042
1054 xd = ref->xd; 1043 xd = ref->xd;
1055 if (xd->xprefix != xprefix) 1044 if (xd->xprefix != xprefix)
1056 continue; 1045 continue;
1057 if (!xd->xname) { 1046 if (!xd->xname) {
1058 /* xdatum is unchache 1047 /* xdatum is unchached */
1059 if (!retry) { 1048 if (!retry) {
1060 retry = 1; 1049 retry = 1;
1061 up_read(&c->x 1050 up_read(&c->xattr_sem);
1062 down_write(&c 1051 down_write(&c->xattr_sem);
1063 goto retry; 1052 goto retry;
1064 } else { 1053 } else {
1065 rc = load_xat 1054 rc = load_xattr_datum(c, xd);
1066 if (unlikely( 1055 if (unlikely(rc > 0)) {
1067 *pref 1056 *pref = ref->next;
1068 delet 1057 delete_xattr_ref(c, ref);
1069 goto 1058 goto retry;
1070 } else if (un 1059 } else if (unlikely(rc < 0)) {
1071 goto 1060 goto out;
1072 } 1061 }
1073 } 1062 }
1074 } 1063 }
1075 if (!strcmp(xname, xd->xname) 1064 if (!strcmp(xname, xd->xname)) {
1076 rc = xd->value_len; 1065 rc = xd->value_len;
1077 if (buffer) { 1066 if (buffer) {
1078 if (size < rc 1067 if (size < rc) {
1079 rc = 1068 rc = -ERANGE;
1080 } else { 1069 } else {
1081 memcp 1070 memcpy(buffer, xd->xvalue, rc);
1082 } 1071 }
1083 } 1072 }
1084 goto out; 1073 goto out;
1085 } 1074 }
1086 } 1075 }
1087 rc = -ENODATA; 1076 rc = -ENODATA;
1088 out: 1077 out:
1089 if (!retry) { 1078 if (!retry) {
1090 up_read(&c->xattr_sem); 1079 up_read(&c->xattr_sem);
1091 } else { 1080 } else {
1092 up_write(&c->xattr_sem); 1081 up_write(&c->xattr_sem);
1093 } 1082 }
1094 return rc; 1083 return rc;
1095 } 1084 }
1096 1085
1097 int do_jffs2_setxattr(struct inode *inode, in 1086 int do_jffs2_setxattr(struct inode *inode, int xprefix, const char *xname,
1098 const char *buffer, siz 1087 const char *buffer, size_t size, int flags)
1099 { 1088 {
1100 struct jffs2_inode_info *f = JFFS2_IN 1089 struct jffs2_inode_info *f = JFFS2_INODE_INFO(inode);
1101 struct jffs2_sb_info *c = JFFS2_SB_IN 1090 struct jffs2_sb_info *c = JFFS2_SB_INFO(inode->i_sb);
1102 struct jffs2_inode_cache *ic = f->ino 1091 struct jffs2_inode_cache *ic = f->inocache;
1103 struct jffs2_xattr_datum *xd; 1092 struct jffs2_xattr_datum *xd;
1104 struct jffs2_xattr_ref *ref, *newref, 1093 struct jffs2_xattr_ref *ref, *newref, **pref;
1105 uint32_t length, request; 1094 uint32_t length, request;
1106 int rc; 1095 int rc;
1107 1096
1108 rc = check_xattr_ref_inode(c, ic); 1097 rc = check_xattr_ref_inode(c, ic);
1109 if (unlikely(rc)) 1098 if (unlikely(rc))
1110 return rc; 1099 return rc;
1111 1100
1112 request = PAD(sizeof(struct jffs2_raw 1101 request = PAD(sizeof(struct jffs2_raw_xattr) + strlen(xname) + 1 + size);
1113 if (request > c->sector_size - c->cle <<
1114 return -ERANGE; <<
1115 <<
1116 rc = jffs2_reserve_space(c, request, 1102 rc = jffs2_reserve_space(c, request, &length,
1117 ALLOC_NORMAL 1103 ALLOC_NORMAL, JFFS2_SUMMARY_XATTR_SIZE);
1118 if (rc) { 1104 if (rc) {
1119 JFFS2_WARNING("jffs2_reserve_ 1105 JFFS2_WARNING("jffs2_reserve_space()=%d, request=%u\n", rc, request);
1120 return rc; 1106 return rc;
1121 } 1107 }
1122 1108
1123 /* Find existing xattr */ 1109 /* Find existing xattr */
1124 down_write(&c->xattr_sem); 1110 down_write(&c->xattr_sem);
1125 retry: 1111 retry:
1126 for (ref=ic->xref, pref=&ic->xref; re 1112 for (ref=ic->xref, pref=&ic->xref; ref; pref=&ref->next, ref=ref->next) {
1127 xd = ref->xd; 1113 xd = ref->xd;
1128 if (xd->xprefix != xprefix) 1114 if (xd->xprefix != xprefix)
1129 continue; 1115 continue;
1130 if (!xd->xname) { 1116 if (!xd->xname) {
1131 rc = load_xattr_datum 1117 rc = load_xattr_datum(c, xd);
1132 if (unlikely(rc > 0)) 1118 if (unlikely(rc > 0)) {
1133 *pref = ref-> 1119 *pref = ref->next;
1134 delete_xattr_ 1120 delete_xattr_ref(c, ref);
1135 goto retry; 1121 goto retry;
1136 } else if (unlikely(r 1122 } else if (unlikely(rc < 0))
1137 goto out; 1123 goto out;
1138 } 1124 }
1139 if (!strcmp(xd->xname, xname) 1125 if (!strcmp(xd->xname, xname)) {
1140 if (flags & XATTR_CRE 1126 if (flags & XATTR_CREATE) {
1141 rc = -EEXIST; 1127 rc = -EEXIST;
1142 goto out; 1128 goto out;
1143 } 1129 }
1144 if (!buffer) { 1130 if (!buffer) {
1145 ref->ino = ic 1131 ref->ino = ic->ino;
1146 ref->xid = xd 1132 ref->xid = xd->xid;
1147 ref->xseqno | 1133 ref->xseqno |= XREF_DELETE_MARKER;
1148 rc = save_xat 1134 rc = save_xattr_ref(c, ref);
1149 if (!rc) { 1135 if (!rc) {
1150 *pref 1136 *pref = ref->next;
1151 spin_ 1137 spin_lock(&c->erase_completion_lock);
1152 ref-> 1138 ref->next = c->xref_dead_list;
1153 c->xr 1139 c->xref_dead_list = ref;
1154 spin_ 1140 spin_unlock(&c->erase_completion_lock);
1155 unref 1141 unrefer_xattr_datum(c, xd);
1156 } else { 1142 } else {
1157 ref-> 1143 ref->ic = ic;
1158 ref-> 1144 ref->xd = xd;
1159 ref-> 1145 ref->xseqno &= ~XREF_DELETE_MARKER;
1160 } 1146 }
1161 goto out; 1147 goto out;
1162 } 1148 }
1163 goto found; 1149 goto found;
1164 } 1150 }
1165 } 1151 }
1166 /* not found */ 1152 /* not found */
1167 if (flags & XATTR_REPLACE) { 1153 if (flags & XATTR_REPLACE) {
1168 rc = -ENODATA; 1154 rc = -ENODATA;
1169 goto out; 1155 goto out;
1170 } 1156 }
1171 if (!buffer) { 1157 if (!buffer) {
1172 rc = -ENODATA; 1158 rc = -ENODATA;
1173 goto out; 1159 goto out;
1174 } 1160 }
1175 found: 1161 found:
1176 xd = create_xattr_datum(c, xprefix, x 1162 xd = create_xattr_datum(c, xprefix, xname, buffer, size);
1177 if (IS_ERR(xd)) { 1163 if (IS_ERR(xd)) {
1178 rc = PTR_ERR(xd); 1164 rc = PTR_ERR(xd);
1179 goto out; 1165 goto out;
1180 } 1166 }
1181 up_write(&c->xattr_sem); 1167 up_write(&c->xattr_sem);
1182 jffs2_complete_reservation(c); 1168 jffs2_complete_reservation(c);
1183 1169
1184 /* create xattr_ref */ 1170 /* create xattr_ref */
1185 request = PAD(sizeof(struct jffs2_raw 1171 request = PAD(sizeof(struct jffs2_raw_xref));
1186 rc = jffs2_reserve_space(c, request, 1172 rc = jffs2_reserve_space(c, request, &length,
1187 ALLOC_NORMAL 1173 ALLOC_NORMAL, JFFS2_SUMMARY_XREF_SIZE);
1188 down_write(&c->xattr_sem); 1174 down_write(&c->xattr_sem);
1189 if (rc) { 1175 if (rc) {
1190 JFFS2_WARNING("jffs2_reserve_ 1176 JFFS2_WARNING("jffs2_reserve_space()=%d, request=%u\n", rc, request);
1191 unrefer_xattr_datum(c, xd); 1177 unrefer_xattr_datum(c, xd);
1192 up_write(&c->xattr_sem); 1178 up_write(&c->xattr_sem);
1193 return rc; 1179 return rc;
1194 } 1180 }
1195 if (ref) 1181 if (ref)
1196 *pref = ref->next; 1182 *pref = ref->next;
1197 newref = create_xattr_ref(c, ic, xd); 1183 newref = create_xattr_ref(c, ic, xd);
1198 if (IS_ERR(newref)) { 1184 if (IS_ERR(newref)) {
1199 if (ref) { 1185 if (ref) {
1200 ref->next = ic->xref; 1186 ref->next = ic->xref;
1201 ic->xref = ref; 1187 ic->xref = ref;
1202 } 1188 }
1203 rc = PTR_ERR(newref); 1189 rc = PTR_ERR(newref);
1204 unrefer_xattr_datum(c, xd); 1190 unrefer_xattr_datum(c, xd);
1205 } else if (ref) { 1191 } else if (ref) {
1206 delete_xattr_ref(c, ref); 1192 delete_xattr_ref(c, ref);
1207 } 1193 }
1208 out: 1194 out:
1209 up_write(&c->xattr_sem); 1195 up_write(&c->xattr_sem);
1210 jffs2_complete_reservation(c); 1196 jffs2_complete_reservation(c);
1211 return rc; 1197 return rc;
1212 } 1198 }
1213 1199
1214 /* -------- garbage collector functions ----- 1200 /* -------- garbage collector functions -------------
1215 * jffs2_garbage_collect_xattr_datum(c, xd, r 1201 * jffs2_garbage_collect_xattr_datum(c, xd, raw)
1216 * is used to move xdatum into new node. 1202 * is used to move xdatum into new node.
1217 * jffs2_garbage_collect_xattr_ref(c, ref, ra 1203 * jffs2_garbage_collect_xattr_ref(c, ref, raw)
1218 * is used to move xref into new node. 1204 * is used to move xref into new node.
1219 * jffs2_verify_xattr(c) 1205 * jffs2_verify_xattr(c)
1220 * is used to call do_verify_xattr_datum() 1206 * is used to call do_verify_xattr_datum() before garbage collecting.
1221 * jffs2_release_xattr_datum(c, xd) 1207 * jffs2_release_xattr_datum(c, xd)
1222 * is used to release an in-memory object o 1208 * is used to release an in-memory object of xdatum.
1223 * jffs2_release_xattr_ref(c, ref) 1209 * jffs2_release_xattr_ref(c, ref)
1224 * is used to release an in-memory object o 1210 * is used to release an in-memory object of xref.
1225 * ------------------------------------------ 1211 * -------------------------------------------------- */
1226 int jffs2_garbage_collect_xattr_datum(struct 1212 int jffs2_garbage_collect_xattr_datum(struct jffs2_sb_info *c, struct jffs2_xattr_datum *xd,
1227 struct 1213 struct jffs2_raw_node_ref *raw)
1228 { 1214 {
1229 uint32_t totlen, length, old_ofs; 1215 uint32_t totlen, length, old_ofs;
1230 int rc = 0; 1216 int rc = 0;
1231 1217
1232 down_write(&c->xattr_sem); 1218 down_write(&c->xattr_sem);
1233 if (xd->node != raw) 1219 if (xd->node != raw)
1234 goto out; 1220 goto out;
1235 if (xd->flags & (JFFS2_XFLAGS_DEAD|JF 1221 if (xd->flags & (JFFS2_XFLAGS_DEAD|JFFS2_XFLAGS_INVALID))
1236 goto out; 1222 goto out;
1237 1223
1238 rc = load_xattr_datum(c, xd); 1224 rc = load_xattr_datum(c, xd);
1239 if (unlikely(rc)) { 1225 if (unlikely(rc)) {
1240 rc = (rc > 0) ? 0 : rc; 1226 rc = (rc > 0) ? 0 : rc;
1241 goto out; 1227 goto out;
1242 } 1228 }
1243 old_ofs = ref_offset(xd->node); 1229 old_ofs = ref_offset(xd->node);
1244 totlen = PAD(sizeof(struct jffs2_raw_ 1230 totlen = PAD(sizeof(struct jffs2_raw_xattr)
1245 + xd->name_len + 1 + 1231 + xd->name_len + 1 + xd->value_len);
1246 rc = jffs2_reserve_space_gc(c, totlen 1232 rc = jffs2_reserve_space_gc(c, totlen, &length, JFFS2_SUMMARY_XATTR_SIZE);
1247 if (rc) { 1233 if (rc) {
1248 JFFS2_WARNING("jffs2_reserve_ 1234 JFFS2_WARNING("jffs2_reserve_space_gc()=%d, request=%u\n", rc, totlen);
1249 goto out; 1235 goto out;
1250 } 1236 }
1251 rc = save_xattr_datum(c, xd); 1237 rc = save_xattr_datum(c, xd);
1252 if (!rc) 1238 if (!rc)
1253 dbg_xattr("xdatum (xid=%u, ve 1239 dbg_xattr("xdatum (xid=%u, version=%u) GC'ed from %#08x to %08x\n",
1254 xd->xid, xd->versio 1240 xd->xid, xd->version, old_ofs, ref_offset(xd->node));
1255 out: 1241 out:
1256 if (!rc) 1242 if (!rc)
1257 jffs2_mark_node_obsolete(c, r 1243 jffs2_mark_node_obsolete(c, raw);
1258 up_write(&c->xattr_sem); 1244 up_write(&c->xattr_sem);
1259 return rc; 1245 return rc;
1260 } 1246 }
1261 1247
1262 int jffs2_garbage_collect_xattr_ref(struct jf 1248 int jffs2_garbage_collect_xattr_ref(struct jffs2_sb_info *c, struct jffs2_xattr_ref *ref,
1263 struct jf 1249 struct jffs2_raw_node_ref *raw)
1264 { 1250 {
1265 uint32_t totlen, length, old_ofs; 1251 uint32_t totlen, length, old_ofs;
1266 int rc = 0; 1252 int rc = 0;
1267 1253
1268 down_write(&c->xattr_sem); 1254 down_write(&c->xattr_sem);
1269 BUG_ON(!ref->node); 1255 BUG_ON(!ref->node);
1270 1256
1271 if (ref->node != raw) 1257 if (ref->node != raw)
1272 goto out; 1258 goto out;
1273 if (is_xattr_ref_dead(ref) && (raw->n 1259 if (is_xattr_ref_dead(ref) && (raw->next_in_ino == (void *)ref))
1274 goto out; 1260 goto out;
1275 1261
1276 old_ofs = ref_offset(ref->node); 1262 old_ofs = ref_offset(ref->node);
1277 totlen = ref_totlen(c, c->gcblock, re 1263 totlen = ref_totlen(c, c->gcblock, ref->node);
1278 1264
1279 rc = jffs2_reserve_space_gc(c, totlen 1265 rc = jffs2_reserve_space_gc(c, totlen, &length, JFFS2_SUMMARY_XREF_SIZE);
1280 if (rc) { 1266 if (rc) {
1281 JFFS2_WARNING("%s: jffs2_rese 1267 JFFS2_WARNING("%s: jffs2_reserve_space_gc() = %d, request = %u\n",
1282 __func__, rc, t 1268 __func__, rc, totlen);
>> 1269 rc = rc ? rc : -EBADFD;
1283 goto out; 1270 goto out;
1284 } 1271 }
1285 rc = save_xattr_ref(c, ref); 1272 rc = save_xattr_ref(c, ref);
1286 if (!rc) 1273 if (!rc)
1287 dbg_xattr("xref (ino=%u, xid= 1274 dbg_xattr("xref (ino=%u, xid=%u) GC'ed from %#08x to %08x\n",
1288 ref->ic->ino, ref-> 1275 ref->ic->ino, ref->xd->xid, old_ofs, ref_offset(ref->node));
1289 out: 1276 out:
1290 if (!rc) 1277 if (!rc)
1291 jffs2_mark_node_obsolete(c, r 1278 jffs2_mark_node_obsolete(c, raw);
1292 up_write(&c->xattr_sem); 1279 up_write(&c->xattr_sem);
1293 return rc; 1280 return rc;
1294 } 1281 }
1295 1282
1296 int jffs2_verify_xattr(struct jffs2_sb_info * 1283 int jffs2_verify_xattr(struct jffs2_sb_info *c)
1297 { 1284 {
1298 struct jffs2_xattr_datum *xd, *_xd; 1285 struct jffs2_xattr_datum *xd, *_xd;
1299 struct jffs2_eraseblock *jeb; 1286 struct jffs2_eraseblock *jeb;
1300 struct jffs2_raw_node_ref *raw; 1287 struct jffs2_raw_node_ref *raw;
1301 uint32_t totlen; 1288 uint32_t totlen;
1302 int rc; 1289 int rc;
1303 1290
1304 down_write(&c->xattr_sem); 1291 down_write(&c->xattr_sem);
1305 list_for_each_entry_safe(xd, _xd, &c- 1292 list_for_each_entry_safe(xd, _xd, &c->xattr_unchecked, xindex) {
1306 rc = do_verify_xattr_datum(c, 1293 rc = do_verify_xattr_datum(c, xd);
1307 if (rc < 0) 1294 if (rc < 0)
1308 continue; 1295 continue;
1309 list_del_init(&xd->xindex); 1296 list_del_init(&xd->xindex);
1310 spin_lock(&c->erase_completio 1297 spin_lock(&c->erase_completion_lock);
1311 for (raw=xd->node; raw != (vo 1298 for (raw=xd->node; raw != (void *)xd; raw=raw->next_in_ino) {
1312 if (ref_flags(raw) != 1299 if (ref_flags(raw) != REF_UNCHECKED)
1313 continue; 1300 continue;
1314 jeb = &c->blocks[ref_ 1301 jeb = &c->blocks[ref_offset(raw) / c->sector_size];
1315 totlen = PAD(ref_totl 1302 totlen = PAD(ref_totlen(c, jeb, raw));
1316 c->unchecked_size -= 1303 c->unchecked_size -= totlen; c->used_size += totlen;
1317 jeb->unchecked_size - 1304 jeb->unchecked_size -= totlen; jeb->used_size += totlen;
1318 raw->flash_offset = r 1305 raw->flash_offset = ref_offset(raw)
1319 | ((xd->node 1306 | ((xd->node == (void *)raw) ? REF_PRISTINE : REF_NORMAL);
1320 } 1307 }
1321 if (xd->flags & JFFS2_XFLAGS_ 1308 if (xd->flags & JFFS2_XFLAGS_DEAD)
1322 list_add(&xd->xindex, 1309 list_add(&xd->xindex, &c->xattr_dead_list);
1323 spin_unlock(&c->erase_complet 1310 spin_unlock(&c->erase_completion_lock);
1324 } 1311 }
1325 up_write(&c->xattr_sem); 1312 up_write(&c->xattr_sem);
1326 return list_empty(&c->xattr_unchecked 1313 return list_empty(&c->xattr_unchecked) ? 1 : 0;
1327 } 1314 }
1328 1315
1329 void jffs2_release_xattr_datum(struct jffs2_s 1316 void jffs2_release_xattr_datum(struct jffs2_sb_info *c, struct jffs2_xattr_datum *xd)
1330 { 1317 {
1331 /* must be called under spin_lock(&c- 1318 /* must be called under spin_lock(&c->erase_completion_lock) */
1332 if (atomic_read(&xd->refcnt) || xd->n 1319 if (atomic_read(&xd->refcnt) || xd->node != (void *)xd)
1333 return; 1320 return;
1334 1321
1335 list_del(&xd->xindex); 1322 list_del(&xd->xindex);
1336 jffs2_free_xattr_datum(xd); 1323 jffs2_free_xattr_datum(xd);
1337 } 1324 }
1338 1325
1339 void jffs2_release_xattr_ref(struct jffs2_sb_ 1326 void jffs2_release_xattr_ref(struct jffs2_sb_info *c, struct jffs2_xattr_ref *ref)
1340 { 1327 {
1341 /* must be called under spin_lock(&c- 1328 /* must be called under spin_lock(&c->erase_completion_lock) */
1342 struct jffs2_xattr_ref *tmp, **ptmp; 1329 struct jffs2_xattr_ref *tmp, **ptmp;
1343 1330
1344 if (ref->node != (void *)ref) 1331 if (ref->node != (void *)ref)
1345 return; 1332 return;
1346 1333
1347 for (tmp=c->xref_dead_list, ptmp=&c-> 1334 for (tmp=c->xref_dead_list, ptmp=&c->xref_dead_list; tmp; ptmp=&tmp->next, tmp=tmp->next) {
1348 if (ref == tmp) { 1335 if (ref == tmp) {
1349 *ptmp = tmp->next; 1336 *ptmp = tmp->next;
1350 break; 1337 break;
1351 } 1338 }
1352 } 1339 }
1353 jffs2_free_xattr_ref(ref); 1340 jffs2_free_xattr_ref(ref);
1354 } 1341 }
1355 1342
Linux® is a registered trademark of Linus Torvalds in the United States and other countries.
TOMOYO® is a registered trademark of NTT DATA CORPORATION.