nls: have register_nls() set ->owner

pass owner explicitly to __register_nls(), make register_nls() a macro passing
THIS_MODULE as the owner argument to __register_nls().

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

diff --git a/fs/nls/mac-celtic.c b/fs/nls/mac-celtic.c
index 634a8b717b02199ee310180ba35c9f8947a5e897..266c2d7d50bdaed476be1a44fc0a12f3ac8b9625 100644 (file)
--- a/fs/nls/mac-celtic.c
+++ b/fs/nls/mac-celtic.c
@@ -583,7 +583,6 @@ static struct nls_table table = {
        .char2uni       = char2uni,
        .charset2lower  = charset2lower,
        .charset2upper  = charset2upper,
-       .owner          = THIS_MODULE,
 };
 
 static int __init init_nls_macceltic(void)

diff --git a/fs/nls/mac-centeuro.c b/fs/nls/mac-centeuro.c
index 979e6265ac5e823d355ca9171d8a8debe6195347..9789c6057551a3c16a7de3d9b5cf7302ade3a85f 100644 (file)
--- a/fs/nls/mac-centeuro.c
+++ b/fs/nls/mac-centeuro.c
@@ -513,7 +513,6 @@ static struct nls_table table = {
        .char2uni       = char2uni,
        .charset2lower  = charset2lower,
        .charset2upper  = charset2upper,
-       .owner          = THIS_MODULE,
 };
 
 static int __init init_nls_maccenteuro(void)

diff --git a/fs/nls/mac-croatian.c b/fs/nls/mac-croatian.c
index dd3f675911ee3716a9a835f5fd428db3d723cd8f..bb19e7a07d436496b5ad2f4833dfb1da7c50f588 100644 (file)
--- a/fs/nls/mac-croatian.c
+++ b/fs/nls/mac-croatian.c
@@ -583,7 +583,6 @@ static struct nls_table table = {
        .char2uni       = char2uni,
        .charset2lower  = charset2lower,
        .charset2upper  = charset2upper,
-       .owner          = THIS_MODULE,
 };
 
 static int __init init_nls_maccroatian(void)

diff --git a/fs/nls/mac-cyrillic.c b/fs/nls/mac-cyrillic.c
index 1112c84dd8bb7183d5fec826cea8c06e866d0ee8..2a7dea36acba0e13d706a255868ce82af88dbd51 100644 (file)
--- a/fs/nls/mac-cyrillic.c
+++ b/fs/nls/mac-cyrillic.c
@@ -478,7 +478,6 @@ static struct nls_table table = {
        .char2uni       = char2uni,
        .charset2lower  = charset2lower,
        .charset2upper  = charset2upper,
-       .owner          = THIS_MODULE,
 };
 
 static int __init init_nls_maccyrillic(void)

diff --git a/fs/nls/mac-gaelic.c b/fs/nls/mac-gaelic.c
index 2de9158409c85ec468619e5f93289c5e133af66b..77b001653588076ea42a71a254bd2c42aa0e279d 100644 (file)
--- a/fs/nls/mac-gaelic.c
+++ b/fs/nls/mac-gaelic.c
@@ -548,7 +548,6 @@ static struct nls_table table = {
        .char2uni       = char2uni,
        .charset2lower  = charset2lower,
        .charset2upper  = charset2upper,
-       .owner          = THIS_MODULE,
 };
 
 static int __init init_nls_macgaelic(void)

diff --git a/fs/nls/mac-greek.c b/fs/nls/mac-greek.c
index a863100828028f5f9d98a62f1dbacb1c62fa4ca0..1eccf499e2ebc5bb2aff772b17a834fec615d802 100644 (file)
--- a/fs/nls/mac-greek.c
+++ b/fs/nls/mac-greek.c
@@ -478,7 +478,6 @@ static struct nls_table table = {
        .char2uni       = char2uni,
        .charset2lower  = charset2lower,
        .charset2upper  = charset2upper,
-       .owner          = THIS_MODULE,
 };
 
 static int __init init_nls_macgreek(void)

diff --git a/fs/nls/mac-iceland.c b/fs/nls/mac-iceland.c
index babe2998d5ced2d0a1a8d237edb4fe5a2cd25604..cbd0875c6d6948b3a7ada49d75c909c69da347ba 100644 (file)
--- a/fs/nls/mac-iceland.c
+++ b/fs/nls/mac-iceland.c
@@ -583,7 +583,6 @@ static struct nls_table table = {
        .char2uni       = char2uni,
        .charset2lower  = charset2lower,
        .charset2upper  = charset2upper,
-       .owner          = THIS_MODULE,
 };
 
 static int __init init_nls_maciceland(void)

diff --git a/fs/nls/mac-inuit.c b/fs/nls/mac-inuit.c
index 312364f010dcc7e5a8af3d95f9763c54f37f85d2..fba8357aaf03899d3929902070f8e2c01e91b541 100644 (file)
--- a/fs/nls/mac-inuit.c
+++ b/fs/nls/mac-inuit.c
@@ -513,7 +513,6 @@ static struct nls_table table = {
        .char2uni       = char2uni,
        .charset2lower  = charset2lower,
        .charset2upper  = charset2upper,
-       .owner          = THIS_MODULE,
 };
 
 static int __init init_nls_macinuit(void)

diff --git a/fs/nls/mac-roman.c b/fs/nls/mac-roman.c
index 53ce0809cbd28eec842fab86b808c19b91c5dcc7..b6a98a5208cd6196b48b7d703c1a4a6ad953201e 100644 (file)
--- a/fs/nls/mac-roman.c
+++ b/fs/nls/mac-roman.c
@@ -618,7 +618,6 @@ static struct nls_table table = {
        .char2uni       = char2uni,
        .charset2lower  = charset2lower,
        .charset2upper  = charset2upper,
-       .owner          = THIS_MODULE,
 };
 
 static int __init init_nls_macroman(void)

diff --git a/fs/nls/mac-romanian.c b/fs/nls/mac-romanian.c
index add6f7a0c6663c6ddf251bf749fc13812548d181..25547f023638453396876470e74cd66ba2b34ce1 100644 (file)
--- a/fs/nls/mac-romanian.c
+++ b/fs/nls/mac-romanian.c
@@ -583,7 +583,6 @@ static struct nls_table table = {
        .char2uni       = char2uni,
        .charset2lower  = charset2lower,
        .charset2upper  = charset2upper,
-       .owner          = THIS_MODULE,
 };
 
 static int __init init_nls_macromanian(void)

diff --git a/fs/nls/mac-turkish.c b/fs/nls/mac-turkish.c
index dffa96d5de00243d29940c68dd613666d7fad25c..b5454bc7b7fa390b34f758d0ef49a54c9ece70ad 100644 (file)
--- a/fs/nls/mac-turkish.c
+++ b/fs/nls/mac-turkish.c
@@ -583,7 +583,6 @@ static struct nls_table table = {
        .char2uni       = char2uni,
        .charset2lower  = charset2lower,
        .charset2upper  = charset2upper,
-       .owner          = THIS_MODULE,
 };
 
 static int __init init_nls_macturkish(void)

diff --git a/fs/nls/nls_ascii.c b/fs/nls/nls_ascii.c
index 7020e940f74e9dbcb4f7a420d67391fa6532f779..a2620650d5e45f6d6a9e4113fbae7fcf29a5e25d 100644 (file)
--- a/fs/nls/nls_ascii.c
+++ b/fs/nls/nls_ascii.c
@@ -148,7 +148,6 @@ static struct nls_table table = {
        .char2uni       = char2uni,
        .charset2lower  = charset2lower,
        .charset2upper  = charset2upper,
-       .owner          = THIS_MODULE,
 };
 
 static int __init init_nls_ascii(void)

diff --git a/fs/nls/nls_base.c b/fs/nls/nls_base.c
index fea6bd5831dce3d84868316c424266c1232949fd..52ccd34b1e792370597b77f7d228c4d79bf96600 100644 (file)
--- a/fs/nls/nls_base.c
+++ b/fs/nls/nls_base.c
@@ -232,13 +232,14 @@ int utf16s_to_utf8s(const wchar_t *pwcs, int inlen, enum utf16_endian endian,
 }
 EXPORT_SYMBOL(utf16s_to_utf8s);
 
-int register_nls(struct nls_table * nls)
+int __register_nls(struct nls_table *nls, struct module *owner)
 {
        struct nls_table ** tmp = &tables;
 
        if (nls->next)
                return -EBUSY;
 
+       nls->owner = owner;
        spin_lock(&nls_lock);
        while (*tmp) {
                if (nls == *tmp) {
@@ -252,6 +253,7 @@ int register_nls(struct nls_table * nls)
        spin_unlock(&nls_lock);
        return 0;       
 }
+EXPORT_SYMBOL(__register_nls);
 
 int unregister_nls(struct nls_table * nls)
 {
@@ -538,7 +540,6 @@ struct nls_table *load_nls_default(void)
                return &default_table;
 }
 
-EXPORT_SYMBOL(register_nls);
 EXPORT_SYMBOL(unregister_nls);
 EXPORT_SYMBOL(unload_nls);
 EXPORT_SYMBOL(load_nls);

diff --git a/fs/nls/nls_cp1250.c b/fs/nls/nls_cp1250.c
index c8471fe78e4e5893dade5b391b2d60dda9197bc6..ace3e19d3407671f36eaa5a43aaa27f341028e3c 100644 (file)
--- a/fs/nls/nls_cp1250.c
+++ b/fs/nls/nls_cp1250.c
@@ -329,7 +329,6 @@ static struct nls_table table = {
        .char2uni       = char2uni,
        .charset2lower  = charset2lower,
        .charset2upper  = charset2upper,
-       .owner          = THIS_MODULE,
 };
 
 static int __init init_nls_cp1250(void)

diff --git a/fs/nls/nls_cp1251.c b/fs/nls/nls_cp1251.c
index 1939b46e772f42a6c5ba0377bd6b8c1939030aa9..9273ddfd08a1eec6f2801101897150a46e947c48 100644 (file)
--- a/fs/nls/nls_cp1251.c
+++ b/fs/nls/nls_cp1251.c
@@ -283,7 +283,6 @@ static struct nls_table table = {
        .char2uni       = char2uni,
        .charset2lower  = charset2lower,
        .charset2upper  = charset2upper,
-       .owner          = THIS_MODULE,
 };
 
 static int __init init_nls_cp1251(void)

diff --git a/fs/nls/nls_cp1255.c b/fs/nls/nls_cp1255.c
index 8120ae2e091a78ebe3ee240c0bf35133ceff9a54..1caf5dfed85b7ec9c06688cfd97282ad6b807e36 100644 (file)
--- a/fs/nls/nls_cp1255.c
+++ b/fs/nls/nls_cp1255.c
@@ -365,7 +365,6 @@ static struct nls_table table = {
        .char2uni       = char2uni,
        .charset2lower  = charset2lower,
        .charset2upper  = charset2upper,
-       .owner          = THIS_MODULE,
 };
 
 static int __init init_nls_cp1255(void)

diff --git a/fs/nls/nls_cp437.c b/fs/nls/nls_cp437.c
index ff37a4628ce48e5c9e86d4febdeea81565dec65b..7ddb830da3fdb78a9384b026060f6633a32d4e21 100644 (file)
--- a/fs/nls/nls_cp437.c
+++ b/fs/nls/nls_cp437.c
@@ -369,7 +369,6 @@ static struct nls_table table = {
        .char2uni       = char2uni,
        .charset2lower  = charset2lower,
        .charset2upper  = charset2upper,
-       .owner          = THIS_MODULE,
 };
 
 static int __init init_nls_cp437(void)

diff --git a/fs/nls/nls_cp737.c b/fs/nls/nls_cp737.c
index f5576b8be1b92bb3e43f6a01226f5acae3e641e2..c593f683a0cd2139c68d82b7dd7bd8baffc36e01 100644 (file)
--- a/fs/nls/nls_cp737.c
+++ b/fs/nls/nls_cp737.c
@@ -332,7 +332,6 @@ static struct nls_table table = {
        .char2uni       = char2uni,
        .charset2lower  = charset2lower,
        .charset2upper  = charset2upper,
-       .owner          = THIS_MODULE,
 };
 
 static int __init init_nls_cp737(void)

diff --git a/fs/nls/nls_cp775.c b/fs/nls/nls_cp775.c
index 4905635d1c00986735d49df059cb0f2efab5b1c0..554c863745f2b6e12ae31afee3935b6fce825c1c 100644 (file)
--- a/fs/nls/nls_cp775.c
+++ b/fs/nls/nls_cp775.c
@@ -301,7 +301,6 @@ static struct nls_table table = {
        .char2uni       = char2uni,
        .charset2lower  = charset2lower,
        .charset2upper  = charset2upper,
-       .owner          = THIS_MODULE,
 };
 
 static int __init init_nls_cp775(void)

diff --git a/fs/nls/nls_cp850.c b/fs/nls/nls_cp850.c
index fe5bdad50e2b39ac4783653e8666b1c2be9a92de..56cccd14b40be93a1a49abe57aedfb472c2d9259 100644 (file)
--- a/fs/nls/nls_cp850.c
+++ b/fs/nls/nls_cp850.c
@@ -297,7 +297,6 @@ static struct nls_table table = {
        .char2uni       = char2uni,
        .charset2lower  = charset2lower,
        .charset2upper  = charset2upper,
-       .owner          = THIS_MODULE,
 };
 
 static int __init init_nls_cp850(void)

diff --git a/fs/nls/nls_cp852.c b/fs/nls/nls_cp852.c
index ceb1c0166dd8988909cfee453b79d94ab30213ff..7cdc05ac1d402e8d5a5eca44ec74eb06483abe45 100644 (file)
--- a/fs/nls/nls_cp852.c
+++ b/fs/nls/nls_cp852.c
@@ -319,7 +319,6 @@ static struct nls_table table = {
        .char2uni       = char2uni,
        .charset2lower  = charset2lower,
        .charset2upper  = charset2upper,
-       .owner          = THIS_MODULE,
 };
 
 static int __init init_nls_cp852(void)

diff --git a/fs/nls/nls_cp855.c b/fs/nls/nls_cp855.c
index cc7f5fb2e0c24849f401b47018270609d29ee5ab..7426eea05663731dd90b25b96902c31214a633ec 100644 (file)
--- a/fs/nls/nls_cp855.c
+++ b/fs/nls/nls_cp855.c
@@ -281,7 +281,6 @@ static struct nls_table table = {
        .char2uni       = char2uni,
        .charset2lower  = charset2lower,
        .charset2upper  = charset2upper,
-       .owner          = THIS_MODULE,
 };
 
 static int __init init_nls_cp855(void)

diff --git a/fs/nls/nls_cp857.c b/fs/nls/nls_cp857.c
index e418e198e8d866586e8317f7327dfdfc924c8188..098309733ebd1406316b7c7fb9dcd86f6a88b04c 100644 (file)
--- a/fs/nls/nls_cp857.c
+++ b/fs/nls/nls_cp857.c
@@ -283,7 +283,6 @@ static struct nls_table table = {
        .char2uni       = char2uni,
        .charset2lower  = charset2lower,
        .charset2upper  = charset2upper,
-       .owner          = THIS_MODULE,
 };
 
 static int __init init_nls_cp857(void)

diff --git a/fs/nls/nls_cp860.c b/fs/nls/nls_cp860.c
index a86c97d1aa3484747df369573918cbf01aa97a88..84224478e731a5f9f4e3c566cf78464479dfad3b 100644 (file)
--- a/fs/nls/nls_cp860.c
+++ b/fs/nls/nls_cp860.c
@@ -346,7 +346,6 @@ static struct nls_table table = {
        .char2uni       = char2uni,
        .charset2lower  = charset2lower,
        .charset2upper  = charset2upper,
-       .owner          = THIS_MODULE,
 };
 
 static int __init init_nls_cp860(void)

diff --git a/fs/nls/nls_cp861.c b/fs/nls/nls_cp861.c
index bd920227acdfd0869b450c8d0b58105cf9ae5037..dc873e4be092a233698a0b9fb5e45361af1cf64d 100644 (file)
--- a/fs/nls/nls_cp861.c
+++ b/fs/nls/nls_cp861.c
@@ -369,7 +369,6 @@ static struct nls_table table = {
        .char2uni       = char2uni,
        .charset2lower  = charset2lower,
        .charset2upper  = charset2upper,
-       .owner          = THIS_MODULE,
 };
 
 static int __init init_nls_cp861(void)

diff --git a/fs/nls/nls_cp862.c b/fs/nls/nls_cp862.c
index e9b68eb3daf04d21cb39ed60ab1d4b6120bbf24d..d5263e3c5566cf51f2d0892f2d57e735b62f8b52 100644 (file)
--- a/fs/nls/nls_cp862.c
+++ b/fs/nls/nls_cp862.c
@@ -403,7 +403,6 @@ static struct nls_table table = {
        .char2uni       = char2uni,
        .charset2lower  = charset2lower,
        .charset2upper  = charset2upper,
-       .owner          = THIS_MODULE,
 };
 
 static int __init init_nls_cp862(void)

diff --git a/fs/nls/nls_cp863.c b/fs/nls/nls_cp863.c
index f8a9b07ab4e2f64cc80d247b567250d90b034fea..051c9832e36a96e19da30441a95ce5688071d35a 100644 (file)
--- a/fs/nls/nls_cp863.c
+++ b/fs/nls/nls_cp863.c
@@ -363,7 +363,6 @@ static struct nls_table table = {
        .char2uni       = char2uni,
        .charset2lower  = charset2lower,
        .charset2upper  = charset2upper,
-       .owner          = THIS_MODULE,
 };
 
 static int __init init_nls_cp863(void)

diff --git a/fs/nls/nls_cp864.c b/fs/nls/nls_cp864.c
index 8d31f435fc6f9a31f662d929d6870402766688af..97eb1273b2f7456b10c172ab5e229b745f1e7f01 100644 (file)
--- a/fs/nls/nls_cp864.c
+++ b/fs/nls/nls_cp864.c
@@ -389,7 +389,6 @@ static struct nls_table table = {
        .char2uni       = char2uni,
        .charset2lower  = charset2lower,
        .charset2upper  = charset2upper,
-       .owner          = THIS_MODULE,
 };
 
 static int __init init_nls_cp864(void)

diff --git a/fs/nls/nls_cp865.c b/fs/nls/nls_cp865.c
index 4bd902fe3ec94065d05f3ab36515efac885f3e13..11121422852513544cba0d316668cdfc08225f4a 100644 (file)
--- a/fs/nls/nls_cp865.c
+++ b/fs/nls/nls_cp865.c
@@ -369,7 +369,6 @@ static struct nls_table table = {
        .char2uni       = char2uni,
        .charset2lower  = charset2lower,
        .charset2upper  = charset2upper,
-       .owner          = THIS_MODULE,
 };
 
 static int __init init_nls_cp865(void)

diff --git a/fs/nls/nls_cp866.c b/fs/nls/nls_cp866.c
index bdc7cb391398828330db1cfedb8c47d7174f3d3b..ffdcbc3fc38d71f2b4e258b660c3eb32c2a387f7 100644 (file)
--- a/fs/nls/nls_cp866.c
+++ b/fs/nls/nls_cp866.c
@@ -287,7 +287,6 @@ static struct nls_table table = {
        .char2uni       = char2uni,
        .charset2lower  = charset2lower,
        .charset2upper  = charset2upper,
-       .owner          = THIS_MODULE,
 };
 
 static int __init init_nls_cp866(void)

diff --git a/fs/nls/nls_cp869.c b/fs/nls/nls_cp869.c
index 9f283a2b151a2c2f7004ecdfceae58b5f3c53a06..3b5a345893543fb2702023c6796a72216efbdfd8 100644 (file)
--- a/fs/nls/nls_cp869.c
+++ b/fs/nls/nls_cp869.c
@@ -297,7 +297,6 @@ static struct nls_table table = {
        .char2uni       = char2uni,
        .charset2lower  = charset2lower,
        .charset2upper  = charset2upper,
-       .owner          = THIS_MODULE,
 };
 
 static int __init init_nls_cp869(void)

diff --git a/fs/nls/nls_cp874.c b/fs/nls/nls_cp874.c
index 0b3c4886f8c03d2927ecd9a16a13d964f5cb97e4..8dfaa10710fa7165c4b6261b0b0081a4f37357cf 100644 (file)
--- a/fs/nls/nls_cp874.c
+++ b/fs/nls/nls_cp874.c
@@ -256,7 +256,6 @@ static struct nls_table table = {
        .char2uni       = char2uni,
        .charset2lower  = charset2lower,
        .charset2upper  = charset2upper,
-       .owner          = THIS_MODULE,
 };
 
 static int __init init_nls_cp874(void)

diff --git a/fs/nls/nls_cp932.c b/fs/nls/nls_cp932.c
index 0ffed6f1cebb6cb8d9c5618cc4876c6f053457d3..67b7398e84832bcacd334a65e60cda21f0a045b4 100644 (file)
--- a/fs/nls/nls_cp932.c
+++ b/fs/nls/nls_cp932.c
@@ -7914,7 +7914,6 @@ static struct nls_table table = {
        .char2uni       = char2uni,
        .charset2lower  = charset2lower,
        .charset2upper  = charset2upper,
-       .owner          = THIS_MODULE,
 };
 
 static int __init init_nls_cp932(void)

diff --git a/fs/nls/nls_cp936.c b/fs/nls/nls_cp936.c
index 82770301bc3da82849a2118db40aaeb1e4b92d7c..c96546cfec9fd81b5c726121501ba7e4c1640690 100644 (file)
--- a/fs/nls/nls_cp936.c
+++ b/fs/nls/nls_cp936.c
@@ -11092,7 +11092,6 @@ static struct nls_table table = {
        .char2uni       = char2uni,
        .charset2lower  = charset2lower,
        .charset2upper  = charset2upper,
-       .owner          = THIS_MODULE,
 };
 
 static int __init init_nls_cp936(void)

diff --git a/fs/nls/nls_cp949.c b/fs/nls/nls_cp949.c
index 8a7a2fe85c65a7ca551f6417e0a3d181d9aa7e46..199171e97aa4a014ae0bdaecbf05759bad99b76b 100644 (file)
--- a/fs/nls/nls_cp949.c
+++ b/fs/nls/nls_cp949.c
@@ -13927,7 +13927,6 @@ static struct nls_table table = {
        .char2uni       = char2uni,
        .charset2lower  = charset2lower,
        .charset2upper  = charset2upper,
-       .owner          = THIS_MODULE,
 };
 
 static int __init init_nls_cp949(void)

diff --git a/fs/nls/nls_cp950.c b/fs/nls/nls_cp950.c
index ef2536829aa589a393d1b5d9528d1e28ab2ac47e..8e14187082098216c78d7bb9b39d269dd544eec5 100644 (file)
--- a/fs/nls/nls_cp950.c
+++ b/fs/nls/nls_cp950.c
@@ -9463,7 +9463,6 @@ static struct nls_table table = {
        .char2uni       = char2uni,
        .charset2lower  = charset2lower,
        .charset2upper  = charset2upper,
-       .owner          = THIS_MODULE,
 };
 
 static int __init init_nls_cp950(void)

diff --git a/fs/nls/nls_euc-jp.c b/fs/nls/nls_euc-jp.c
index 7424929a278b0088ba92772ffb1b3a7644864906..162b3f160353c6ab076644079c861a2b4f1fd736 100644 (file)
--- a/fs/nls/nls_euc-jp.c
+++ b/fs/nls/nls_euc-jp.c
@@ -553,7 +553,6 @@ static struct nls_table table = {
        .charset        = "euc-jp",
        .uni2char       = uni2char,
        .char2uni       = char2uni,
-       .owner          = THIS_MODULE,
 };
 
 static int __init init_nls_euc_jp(void)

diff --git a/fs/nls/nls_iso8859-1.c b/fs/nls/nls_iso8859-1.c
index 7b951bb5849cb52e48a30dc8c3f3187949c581bb..69ac020d43b1ce0dc7fc640476faee082a91b6fc 100644 (file)
--- a/fs/nls/nls_iso8859-1.c
+++ b/fs/nls/nls_iso8859-1.c
@@ -239,7 +239,6 @@ static struct nls_table table = {
        .char2uni       = char2uni,
        .charset2lower  = charset2lower,
        .charset2upper  = charset2upper,
-       .owner          = THIS_MODULE,
 };
 
 static int __init init_nls_iso8859_1(void)

diff --git a/fs/nls/nls_iso8859-13.c b/fs/nls/nls_iso8859-13.c
index c4d52ea9f0921a6530bc96de8e02529643856f9e..afb3f8f275f079df23746a779bcf0223fbba81b8 100644 (file)
--- a/fs/nls/nls_iso8859-13.c
+++ b/fs/nls/nls_iso8859-13.c
@@ -267,7 +267,6 @@ static struct nls_table table = {
        .char2uni       = char2uni,
        .charset2lower  = charset2lower,
        .charset2upper  = charset2upper,
-       .owner          = THIS_MODULE,
 };
 
 static int __init init_nls_iso8859_13(void)

diff --git a/fs/nls/nls_iso8859-14.c b/fs/nls/nls_iso8859-14.c
index dc02600c7fe16828d3bb4688652bd46be363e485..046370f0b6f0ca1284aa70cadcc041fd1386be87 100644 (file)
--- a/fs/nls/nls_iso8859-14.c
+++ b/fs/nls/nls_iso8859-14.c
@@ -323,7 +323,6 @@ static struct nls_table table = {
        .char2uni       = char2uni,
        .charset2lower  = charset2lower,
        .charset2upper  = charset2upper,
-       .owner          = THIS_MODULE,
 };
 
 static int __init init_nls_iso8859_14(void)

diff --git a/fs/nls/nls_iso8859-15.c b/fs/nls/nls_iso8859-15.c
index 3c7dfc832ef1309fb095d445a33ad529ebdd3a11..7e34a841a056727cd647784ef1eeca625fd3ea7e 100644 (file)
--- a/fs/nls/nls_iso8859-15.c
+++ b/fs/nls/nls_iso8859-15.c
@@ -289,7 +289,6 @@ static struct nls_table table = {
        .char2uni       = char2uni,
        .charset2lower  = charset2lower,
        .charset2upper  = charset2upper,
-       .owner          = THIS_MODULE,
 };
 
 static int __init init_nls_iso8859_15(void)

diff --git a/fs/nls/nls_iso8859-2.c b/fs/nls/nls_iso8859-2.c
index a2d2197e4c7740e5ea808e196945b8806e74fbc8..7dd5711817414d2bc03564d28ca2249d15bcd0bf 100644 (file)
--- a/fs/nls/nls_iso8859-2.c
+++ b/fs/nls/nls_iso8859-2.c
@@ -290,7 +290,6 @@ static struct nls_table table = {
        .char2uni       = char2uni,
        .charset2lower  = charset2lower,
        .charset2upper  = charset2upper,
-       .owner          = THIS_MODULE,
 };
 
 static int __init init_nls_iso8859_2(void)

diff --git a/fs/nls/nls_iso8859-3.c b/fs/nls/nls_iso8859-3.c
index a61e0daa3a860a6472e52b29f1b640b599f9b0a4..740b75ec44936919b7458f89e34f02fd83d914e4 100644 (file)
--- a/fs/nls/nls_iso8859-3.c
+++ b/fs/nls/nls_iso8859-3.c
@@ -290,7 +290,6 @@ static struct nls_table table = {
        .char2uni       = char2uni,
        .charset2lower  = charset2lower,
        .charset2upper  = charset2upper,
-       .owner          = THIS_MODULE,
 };
 
 static int __init init_nls_iso8859_3(void)

diff --git a/fs/nls/nls_iso8859-4.c b/fs/nls/nls_iso8859-4.c
index e8ff555483b673526845585366b71ba573b27d04..8826021e32f59a2cf6323ecbbd2d8f4da1aa27ad 100644 (file)
--- a/fs/nls/nls_iso8859-4.c
+++ b/fs/nls/nls_iso8859-4.c
@@ -290,7 +290,6 @@ static struct nls_table table = {
        .char2uni       = char2uni,
        .charset2lower  = charset2lower,
        .charset2upper  = charset2upper,
-       .owner          = THIS_MODULE,
 };
 
 static int __init init_nls_iso8859_4(void)

diff --git a/fs/nls/nls_iso8859-5.c b/fs/nls/nls_iso8859-5.c
index 4721e89301249c2e7e765ac19efdabee4cb9baec..7c04057a1ad82c44cc9903abbac1ddb6336086d8 100644 (file)
--- a/fs/nls/nls_iso8859-5.c
+++ b/fs/nls/nls_iso8859-5.c
@@ -254,7 +254,6 @@ static struct nls_table table = {
        .char2uni       = char2uni,
        .charset2lower  = charset2lower,
        .charset2upper  = charset2upper,
-       .owner          = THIS_MODULE,
 };
 
 static int __init init_nls_iso8859_5(void)

diff --git a/fs/nls/nls_iso8859-6.c b/fs/nls/nls_iso8859-6.c
index 01a517d6d306a18fe7d48b811529a00a59c5eb39..d4a881400d74951308788241b1d7240c81d02c7a 100644 (file)
--- a/fs/nls/nls_iso8859-6.c
+++ b/fs/nls/nls_iso8859-6.c
@@ -245,7 +245,6 @@ static struct nls_table table = {
        .char2uni       = char2uni,
        .charset2lower  = charset2lower,
        .charset2upper  = charset2upper,
-       .owner          = THIS_MODULE,
 };
 
 static int __init init_nls_iso8859_6(void)

diff --git a/fs/nls/nls_iso8859-7.c b/fs/nls/nls_iso8859-7.c
index 2d27b93ef19e152bd4415e6e9f62e8bcc2472394..37b75d825a754ec2690a62cf7f0a2ee2d28058ec 100644 (file)
--- a/fs/nls/nls_iso8859-7.c
+++ b/fs/nls/nls_iso8859-7.c
@@ -299,7 +299,6 @@ static struct nls_table table = {
        .char2uni       = char2uni,
        .charset2lower  = charset2lower,
        .charset2upper  = charset2upper,
-       .owner          = THIS_MODULE,
 };
 
 static int __init init_nls_iso8859_7(void)

diff --git a/fs/nls/nls_iso8859-9.c b/fs/nls/nls_iso8859-9.c
index 694bf070c72102535c122499bfd0e88bb6adacf7..557b98250d3790b89a3883f9cb8a6cecbe201eaf 100644 (file)
--- a/fs/nls/nls_iso8859-9.c
+++ b/fs/nls/nls_iso8859-9.c
@@ -254,7 +254,6 @@ static struct nls_table table = {
        .char2uni       = char2uni,
        .charset2lower  = charset2lower,
        .charset2upper  = charset2upper,
-       .owner          = THIS_MODULE,
 };
 
 static int __init init_nls_iso8859_9(void)

diff --git a/fs/nls/nls_koi8-r.c b/fs/nls/nls_koi8-r.c
index 43875310540dd83d3cf354013fdc0b91bbf35140..811f232fccfba77f79627f26aa338553d1cf3a6e 100644 (file)
--- a/fs/nls/nls_koi8-r.c
+++ b/fs/nls/nls_koi8-r.c
@@ -305,7 +305,6 @@ static struct nls_table table = {
        .char2uni       = char2uni,
        .charset2lower  = charset2lower,
        .charset2upper  = charset2upper,
-       .owner          = THIS_MODULE,
 };
 
 static int __init init_nls_koi8_r(void)

diff --git a/fs/nls/nls_koi8-ru.c b/fs/nls/nls_koi8-ru.c
index e7bc1d75c78c4e9a79a373707559ab51f091d456..a80a741a8676dc5a6ead28c9a584169050fc3c79 100644 (file)
--- a/fs/nls/nls_koi8-ru.c
+++ b/fs/nls/nls_koi8-ru.c
@@ -55,7 +55,6 @@ static struct nls_table table = {
        .charset        = "koi8-ru",
        .uni2char       = uni2char,
        .char2uni       = char2uni,
-       .owner          = THIS_MODULE,
 };
 
 static int __init init_nls_koi8_ru(void)

diff --git a/fs/nls/nls_koi8-u.c b/fs/nls/nls_koi8-u.c
index 8c9f0292b5ae88318249c53708b31ae600dafa81..7e029e4c188a241ef37de1e2e419bf61dbf8eba3 100644 (file)
--- a/fs/nls/nls_koi8-u.c
+++ b/fs/nls/nls_koi8-u.c
@@ -312,7 +312,6 @@ static struct nls_table table = {
        .char2uni       = char2uni,
        .charset2lower  = charset2lower,
        .charset2upper  = charset2upper,
-       .owner          = THIS_MODULE,
 };
 
 static int __init init_nls_koi8_u(void)

diff --git a/fs/nls/nls_utf8.c b/fs/nls/nls_utf8.c
index 0d60a44acacd42b7eee10349a672a9ec9a74240a..afcfbc4a14dbf82c6d8b171477d8f5e0eb0dc00f 100644 (file)
--- a/fs/nls/nls_utf8.c
+++ b/fs/nls/nls_utf8.c
@@ -46,7 +46,6 @@ static struct nls_table table = {
        .char2uni       = char2uni,
        .charset2lower  = identity,     /* no conversion */
        .charset2upper  = identity,
-       .owner          = THIS_MODULE,
 };
 
 static int __init init_nls_utf8(void)

diff --git a/include/linux/nls.h b/include/linux/nls.h
index 5dc635f8d79e09a4a6976c3e536cbfb506b16689..520681b6820817b6f08cb304503bf75b8f8f564f 100644 (file)
--- a/include/linux/nls.h
+++ b/include/linux/nls.h
@@ -44,11 +44,12 @@ enum utf16_endian {
 };
 
 /* nls_base.c */
-extern int register_nls(struct nls_table *);
+extern int __register_nls(struct nls_table *, struct module *);
 extern int unregister_nls(struct nls_table *);
 extern struct nls_table *load_nls(char *);
 extern void unload_nls(struct nls_table *);
 extern struct nls_table *load_nls_default(void);
+#define register_nls(nls) __register_nls((nls), THIS_MODULE)
 
 extern int utf8_to_utf32(const u8 *s, int len, unicode_t *pu);
 extern int utf32_to_utf8(unicode_t u, u8 *s, int maxlen);