nls: have register_nls() set ->owner · tjh.dev/kernel@479e64c

-1

fs/nls/mac-celtic.c

··· 583 583 .char2uni = char2uni, 584 584 .charset2lower = charset2lower, 585 585 .charset2upper = charset2upper, 586 - .owner = THIS_MODULE, 587 586 }; 588 587 589 588 static int __init init_nls_macceltic(void)

-1

fs/nls/mac-centeuro.c

··· 513 513 .char2uni = char2uni, 514 514 .charset2lower = charset2lower, 515 515 .charset2upper = charset2upper, 516 - .owner = THIS_MODULE, 517 516 }; 518 517 519 518 static int __init init_nls_maccenteuro(void)

-1

fs/nls/mac-croatian.c

··· 583 583 .char2uni = char2uni, 584 584 .charset2lower = charset2lower, 585 585 .charset2upper = charset2upper, 586 - .owner = THIS_MODULE, 587 586 }; 588 587 589 588 static int __init init_nls_maccroatian(void)

-1

fs/nls/mac-cyrillic.c

··· 478 478 .char2uni = char2uni, 479 479 .charset2lower = charset2lower, 480 480 .charset2upper = charset2upper, 481 - .owner = THIS_MODULE, 482 481 }; 483 482 484 483 static int __init init_nls_maccyrillic(void)

-1

fs/nls/mac-gaelic.c

··· 548 548 .char2uni = char2uni, 549 549 .charset2lower = charset2lower, 550 550 .charset2upper = charset2upper, 551 - .owner = THIS_MODULE, 552 551 }; 553 552 554 553 static int __init init_nls_macgaelic(void)

-1

fs/nls/mac-greek.c

··· 478 478 .char2uni = char2uni, 479 479 .charset2lower = charset2lower, 480 480 .charset2upper = charset2upper, 481 - .owner = THIS_MODULE, 482 481 }; 483 482 484 483 static int __init init_nls_macgreek(void)

-1

fs/nls/mac-iceland.c

··· 583 583 .char2uni = char2uni, 584 584 .charset2lower = charset2lower, 585 585 .charset2upper = charset2upper, 586 - .owner = THIS_MODULE, 587 586 }; 588 587 589 588 static int __init init_nls_maciceland(void)

-1

fs/nls/mac-inuit.c

··· 513 513 .char2uni = char2uni, 514 514 .charset2lower = charset2lower, 515 515 .charset2upper = charset2upper, 516 - .owner = THIS_MODULE, 517 516 }; 518 517 519 518 static int __init init_nls_macinuit(void)

-1

fs/nls/mac-roman.c

··· 618 618 .char2uni = char2uni, 619 619 .charset2lower = charset2lower, 620 620 .charset2upper = charset2upper, 621 - .owner = THIS_MODULE, 622 621 }; 623 622 624 623 static int __init init_nls_macroman(void)

-1

fs/nls/mac-romanian.c

··· 583 583 .char2uni = char2uni, 584 584 .charset2lower = charset2lower, 585 585 .charset2upper = charset2upper, 586 - .owner = THIS_MODULE, 587 586 }; 588 587 589 588 static int __init init_nls_macromanian(void)

-1

fs/nls/mac-turkish.c

··· 583 583 .char2uni = char2uni, 584 584 .charset2lower = charset2lower, 585 585 .charset2upper = charset2upper, 586 - .owner = THIS_MODULE, 587 586 }; 588 587 589 588 static int __init init_nls_macturkish(void)

-1

fs/nls/nls_ascii.c

··· 148 148 .char2uni = char2uni, 149 149 .charset2lower = charset2lower, 150 150 .charset2upper = charset2upper, 151 - .owner = THIS_MODULE, 152 151 }; 153 152 154 153 static int __init init_nls_ascii(void)

+3 -2

fs/nls/nls_base.c

··· 232 232 } 233 233 EXPORT_SYMBOL(utf16s_to_utf8s); 234 234 235 - int register_nls(struct nls_table * nls) 235 + int __register_nls(struct nls_table *nls, struct module *owner) 236 236 { 237 237 struct nls_table ** tmp = &tables; 238 238 239 239 if (nls->next) 240 240 return -EBUSY; 241 241 242 + nls->owner = owner; 242 243 spin_lock(&nls_lock); 243 244 while (*tmp) { 244 245 if (nls == *tmp) { ··· 253 252 spin_unlock(&nls_lock); 254 253 return 0; 255 254 } 255 + EXPORT_SYMBOL(__register_nls); 256 256 257 257 int unregister_nls(struct nls_table * nls) 258 258 { ··· 540 538 return &default_table; 541 539 } 542 540 543 - EXPORT_SYMBOL(register_nls); 544 541 EXPORT_SYMBOL(unregister_nls); 545 542 EXPORT_SYMBOL(unload_nls); 546 543 EXPORT_SYMBOL(load_nls);

-1

fs/nls/nls_cp1250.c

··· 329 329 .char2uni = char2uni, 330 330 .charset2lower = charset2lower, 331 331 .charset2upper = charset2upper, 332 - .owner = THIS_MODULE, 333 332 }; 334 333 335 334 static int __init init_nls_cp1250(void)

-1

fs/nls/nls_cp1251.c

··· 283 283 .char2uni = char2uni, 284 284 .charset2lower = charset2lower, 285 285 .charset2upper = charset2upper, 286 - .owner = THIS_MODULE, 287 286 }; 288 287 289 288 static int __init init_nls_cp1251(void)

-1

fs/nls/nls_cp1255.c

··· 365 365 .char2uni = char2uni, 366 366 .charset2lower = charset2lower, 367 367 .charset2upper = charset2upper, 368 - .owner = THIS_MODULE, 369 368 }; 370 369 371 370 static int __init init_nls_cp1255(void)

-1

fs/nls/nls_cp437.c

··· 369 369 .char2uni = char2uni, 370 370 .charset2lower = charset2lower, 371 371 .charset2upper = charset2upper, 372 - .owner = THIS_MODULE, 373 372 }; 374 373 375 374 static int __init init_nls_cp437(void)

-1

fs/nls/nls_cp737.c

··· 332 332 .char2uni = char2uni, 333 333 .charset2lower = charset2lower, 334 334 .charset2upper = charset2upper, 335 - .owner = THIS_MODULE, 336 335 }; 337 336 338 337 static int __init init_nls_cp737(void)

-1

fs/nls/nls_cp775.c

··· 301 301 .char2uni = char2uni, 302 302 .charset2lower = charset2lower, 303 303 .charset2upper = charset2upper, 304 - .owner = THIS_MODULE, 305 304 }; 306 305 307 306 static int __init init_nls_cp775(void)

-1

fs/nls/nls_cp850.c

··· 297 297 .char2uni = char2uni, 298 298 .charset2lower = charset2lower, 299 299 .charset2upper = charset2upper, 300 - .owner = THIS_MODULE, 301 300 }; 302 301 303 302 static int __init init_nls_cp850(void)

-1

fs/nls/nls_cp852.c

··· 319 319 .char2uni = char2uni, 320 320 .charset2lower = charset2lower, 321 321 .charset2upper = charset2upper, 322 - .owner = THIS_MODULE, 323 322 }; 324 323 325 324 static int __init init_nls_cp852(void)

-1

fs/nls/nls_cp855.c

··· 281 281 .char2uni = char2uni, 282 282 .charset2lower = charset2lower, 283 283 .charset2upper = charset2upper, 284 - .owner = THIS_MODULE, 285 284 }; 286 285 287 286 static int __init init_nls_cp855(void)

-1

fs/nls/nls_cp857.c

··· 283 283 .char2uni = char2uni, 284 284 .charset2lower = charset2lower, 285 285 .charset2upper = charset2upper, 286 - .owner = THIS_MODULE, 287 286 }; 288 287 289 288 static int __init init_nls_cp857(void)

-1

fs/nls/nls_cp860.c

··· 346 346 .char2uni = char2uni, 347 347 .charset2lower = charset2lower, 348 348 .charset2upper = charset2upper, 349 - .owner = THIS_MODULE, 350 349 }; 351 350 352 351 static int __init init_nls_cp860(void)

-1

fs/nls/nls_cp861.c

··· 369 369 .char2uni = char2uni, 370 370 .charset2lower = charset2lower, 371 371 .charset2upper = charset2upper, 372 - .owner = THIS_MODULE, 373 372 }; 374 373 375 374 static int __init init_nls_cp861(void)

-1

fs/nls/nls_cp862.c

··· 403 403 .char2uni = char2uni, 404 404 .charset2lower = charset2lower, 405 405 .charset2upper = charset2upper, 406 - .owner = THIS_MODULE, 407 406 }; 408 407 409 408 static int __init init_nls_cp862(void)

-1

fs/nls/nls_cp863.c

··· 363 363 .char2uni = char2uni, 364 364 .charset2lower = charset2lower, 365 365 .charset2upper = charset2upper, 366 - .owner = THIS_MODULE, 367 366 }; 368 367 369 368 static int __init init_nls_cp863(void)

-1

fs/nls/nls_cp864.c

··· 389 389 .char2uni = char2uni, 390 390 .charset2lower = charset2lower, 391 391 .charset2upper = charset2upper, 392 - .owner = THIS_MODULE, 393 392 }; 394 393 395 394 static int __init init_nls_cp864(void)

-1

fs/nls/nls_cp865.c

··· 369 369 .char2uni = char2uni, 370 370 .charset2lower = charset2lower, 371 371 .charset2upper = charset2upper, 372 - .owner = THIS_MODULE, 373 372 }; 374 373 375 374 static int __init init_nls_cp865(void)

-1

fs/nls/nls_cp866.c

··· 287 287 .char2uni = char2uni, 288 288 .charset2lower = charset2lower, 289 289 .charset2upper = charset2upper, 290 - .owner = THIS_MODULE, 291 290 }; 292 291 293 292 static int __init init_nls_cp866(void)

-1

fs/nls/nls_cp869.c

··· 297 297 .char2uni = char2uni, 298 298 .charset2lower = charset2lower, 299 299 .charset2upper = charset2upper, 300 - .owner = THIS_MODULE, 301 300 }; 302 301 303 302 static int __init init_nls_cp869(void)

-1

fs/nls/nls_cp874.c

··· 256 256 .char2uni = char2uni, 257 257 .charset2lower = charset2lower, 258 258 .charset2upper = charset2upper, 259 - .owner = THIS_MODULE, 260 259 }; 261 260 262 261 static int __init init_nls_cp874(void)

-1

fs/nls/nls_cp932.c

··· 7914 7914 .char2uni = char2uni, 7915 7915 .charset2lower = charset2lower, 7916 7916 .charset2upper = charset2upper, 7917 - .owner = THIS_MODULE, 7918 7917 }; 7919 7918 7920 7919 static int __init init_nls_cp932(void)

-1

fs/nls/nls_cp936.c

··· 11092 11092 .char2uni = char2uni, 11093 11093 .charset2lower = charset2lower, 11094 11094 .charset2upper = charset2upper, 11095 - .owner = THIS_MODULE, 11096 11095 }; 11097 11096 11098 11097 static int __init init_nls_cp936(void)

-1

fs/nls/nls_cp949.c

··· 13927 13927 .char2uni = char2uni, 13928 13928 .charset2lower = charset2lower, 13929 13929 .charset2upper = charset2upper, 13930 - .owner = THIS_MODULE, 13931 13930 }; 13932 13931 13933 13932 static int __init init_nls_cp949(void)

-1

fs/nls/nls_cp950.c

··· 9463 9463 .char2uni = char2uni, 9464 9464 .charset2lower = charset2lower, 9465 9465 .charset2upper = charset2upper, 9466 - .owner = THIS_MODULE, 9467 9466 }; 9468 9467 9469 9468 static int __init init_nls_cp950(void)

-1

fs/nls/nls_euc-jp.c

··· 553 553 .charset = "euc-jp", 554 554 .uni2char = uni2char, 555 555 .char2uni = char2uni, 556 - .owner = THIS_MODULE, 557 556 }; 558 557 559 558 static int __init init_nls_euc_jp(void)

-1

fs/nls/nls_iso8859-1.c

··· 239 239 .char2uni = char2uni, 240 240 .charset2lower = charset2lower, 241 241 .charset2upper = charset2upper, 242 - .owner = THIS_MODULE, 243 242 }; 244 243 245 244 static int __init init_nls_iso8859_1(void)

-1

fs/nls/nls_iso8859-13.c

··· 267 267 .char2uni = char2uni, 268 268 .charset2lower = charset2lower, 269 269 .charset2upper = charset2upper, 270 - .owner = THIS_MODULE, 271 270 }; 272 271 273 272 static int __init init_nls_iso8859_13(void)

-1

fs/nls/nls_iso8859-14.c

··· 323 323 .char2uni = char2uni, 324 324 .charset2lower = charset2lower, 325 325 .charset2upper = charset2upper, 326 - .owner = THIS_MODULE, 327 326 }; 328 327 329 328 static int __init init_nls_iso8859_14(void)

-1

fs/nls/nls_iso8859-15.c

··· 289 289 .char2uni = char2uni, 290 290 .charset2lower = charset2lower, 291 291 .charset2upper = charset2upper, 292 - .owner = THIS_MODULE, 293 292 }; 294 293 295 294 static int __init init_nls_iso8859_15(void)

-1

fs/nls/nls_iso8859-2.c

··· 290 290 .char2uni = char2uni, 291 291 .charset2lower = charset2lower, 292 292 .charset2upper = charset2upper, 293 - .owner = THIS_MODULE, 294 293 }; 295 294 296 295 static int __init init_nls_iso8859_2(void)

-1

fs/nls/nls_iso8859-3.c

··· 290 290 .char2uni = char2uni, 291 291 .charset2lower = charset2lower, 292 292 .charset2upper = charset2upper, 293 - .owner = THIS_MODULE, 294 293 }; 295 294 296 295 static int __init init_nls_iso8859_3(void)

-1

fs/nls/nls_iso8859-4.c

··· 290 290 .char2uni = char2uni, 291 291 .charset2lower = charset2lower, 292 292 .charset2upper = charset2upper, 293 - .owner = THIS_MODULE, 294 293 }; 295 294 296 295 static int __init init_nls_iso8859_4(void)

-1

fs/nls/nls_iso8859-5.c

··· 254 254 .char2uni = char2uni, 255 255 .charset2lower = charset2lower, 256 256 .charset2upper = charset2upper, 257 - .owner = THIS_MODULE, 258 257 }; 259 258 260 259 static int __init init_nls_iso8859_5(void)

-1

fs/nls/nls_iso8859-6.c

··· 245 245 .char2uni = char2uni, 246 246 .charset2lower = charset2lower, 247 247 .charset2upper = charset2upper, 248 - .owner = THIS_MODULE, 249 248 }; 250 249 251 250 static int __init init_nls_iso8859_6(void)

-1

fs/nls/nls_iso8859-7.c

··· 299 299 .char2uni = char2uni, 300 300 .charset2lower = charset2lower, 301 301 .charset2upper = charset2upper, 302 - .owner = THIS_MODULE, 303 302 }; 304 303 305 304 static int __init init_nls_iso8859_7(void)

-1

fs/nls/nls_iso8859-9.c

··· 254 254 .char2uni = char2uni, 255 255 .charset2lower = charset2lower, 256 256 .charset2upper = charset2upper, 257 - .owner = THIS_MODULE, 258 257 }; 259 258 260 259 static int __init init_nls_iso8859_9(void)

-1

fs/nls/nls_koi8-r.c

··· 305 305 .char2uni = char2uni, 306 306 .charset2lower = charset2lower, 307 307 .charset2upper = charset2upper, 308 - .owner = THIS_MODULE, 309 308 }; 310 309 311 310 static int __init init_nls_koi8_r(void)

-1

fs/nls/nls_koi8-ru.c

··· 55 55 .charset = "koi8-ru", 56 56 .uni2char = uni2char, 57 57 .char2uni = char2uni, 58 - .owner = THIS_MODULE, 59 58 }; 60 59 61 60 static int __init init_nls_koi8_ru(void)

-1

fs/nls/nls_koi8-u.c

··· 312 312 .char2uni = char2uni, 313 313 .charset2lower = charset2lower, 314 314 .charset2upper = charset2upper, 315 - .owner = THIS_MODULE, 316 315 }; 317 316 318 317 static int __init init_nls_koi8_u(void)

-1

fs/nls/nls_utf8.c

··· 46 46 .char2uni = char2uni, 47 47 .charset2lower = identity, /* no conversion */ 48 48 .charset2upper = identity, 49 - .owner = THIS_MODULE, 50 49 }; 51 50 52 51 static int __init init_nls_utf8(void)

+2 -1

include/linux/nls.h

··· 44 44 }; 45 45 46 46 /* nls_base.c */ 47 - extern int register_nls(struct nls_table *); 47 + extern int __register_nls(struct nls_table *, struct module *); 48 48 extern int unregister_nls(struct nls_table *); 49 49 extern struct nls_table *load_nls(char *); 50 50 extern void unload_nls(struct nls_table *); 51 51 extern struct nls_table *load_nls_default(void); 52 + #define register_nls(nls) __register_nls((nls), THIS_MODULE) 52 53 53 54 extern int utf8_to_utf32(const u8 *s, int len, unicode_t *pu); 54 55 extern int utf32_to_utf8(unicode_t u, u8 *s, int maxlen);