Rewrap the overly long source code lines resulting from the previous patch's addition of the slab cache flag SLAB_MEM_SPREAD. This patch contains only formatting changes, and no function change.
Unified · Split
| @@ -241,7 +241,8 @@ static int init_inodecache(void) · 240 unmodified lines | ||
| 241 | 241 | { |
| 242 | 242 | adfs_inode_cachep = kmem_cache_create("adfs_inode_cache", |
| 243 | 243 | sizeof(struct adfs_inode_info), |
| 244 | − 0, SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD, | |
| 244 | + 0, (SLAB_RECLAIM_ACCOUNT| | |
| 245 | + SLAB_MEM_SPREAD), | |
| 245 | 246 | init_once, NULL); |
| 246 | 247 | if (adfs_inode_cachep == NULL) |
| 247 | 248 | return -ENOMEM; |
| @@ -98,7 +98,8 @@ static int init_inodecache(void) · 97 unmodified lines | ||
| 98 | 98 | { |
| 99 | 99 | affs_inode_cachep = kmem_cache_create("affs_inode_cache", |
| 100 | 100 | sizeof(struct affs_inode_info), |
| 101 | − 0, SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD, | |
| 101 | + 0, (SLAB_RECLAIM_ACCOUNT| | |
| 102 | + SLAB_MEM_SPREAD), | |
| 102 | 103 | init_once, NULL); |
| 103 | 104 | if (affs_inode_cachep == NULL) |
| 104 | 105 | return -ENOMEM; |
| @@ -427,7 +427,8 @@ befs_init_inodecache(void) · 426 unmodified lines | ||
| 427 | 427 | { |
| 428 | 428 | befs_inode_cachep = kmem_cache_create("befs_inode_cache", |
| 429 | 429 | sizeof (struct befs_inode_info), |
| 430 | − 0, SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD, | |
| 430 | + 0, (SLAB_RECLAIM_ACCOUNT| | |
| 431 | + SLAB_MEM_SPREAD), | |
| 431 | 432 | init_once, NULL); |
| 432 | 433 | if (befs_inode_cachep == NULL) { |
| 433 | 434 | printk(KERN_ERR "befs_init_inodecache: " |
| @@ -257,7 +257,8 @@ static int init_inodecache(void) · 256 unmodified lines | ||
| 257 | 257 | { |
| 258 | 258 | bfs_inode_cachep = kmem_cache_create("bfs_inode_cache", |
| 259 | 259 | sizeof(struct bfs_inode_info), |
| 260 | − 0, SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD, | |
| 260 | + 0, (SLAB_RECLAIM_ACCOUNT| | |
| 261 | + SLAB_MEM_SPREAD), | |
| 261 | 262 | init_once, NULL); |
| 262 | 263 | if (bfs_inode_cachep == NULL) |
| 263 | 264 | return -ENOMEM; |
| @@ -319,7 +319,8 @@ void __init bdev_cache_init(void) · 318 unmodified lines | ||
| 319 | 319 | { |
| 320 | 320 | int err; |
| 321 | 321 | bdev_cachep = kmem_cache_create("bdev_cache", sizeof(struct bdev_inode), |
| 322 | − 0, SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD|SLAB_PANIC, | |
| 322 | + 0, (SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT| | |
| 323 | + SLAB_MEM_SPREAD|SLAB_PANIC), | |
| 323 | 324 | init_once, NULL); |
| 324 | 325 | err = register_filesystem(&bd_type); |
| 325 | 326 | if (err) |
| @@ -695,7 +695,8 @@ cifs_init_inodecache(void) · 694 unmodified lines | ||
| 695 | 695 | { |
| 696 | 696 | cifs_inode_cachep = kmem_cache_create("cifs_inode_cache", |
| 697 | 697 | sizeof (struct cifsInodeInfo), |
| 698 | − 0, SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD, | |
| 698 | + 0, (SLAB_RECLAIM_ACCOUNT| | |
| 699 | + SLAB_MEM_SPREAD), | |
| 699 | 700 | cifs_init_once, NULL); |
| 700 | 701 | if (cifs_inode_cachep == NULL) |
| 701 | 702 | return -ENOMEM; |
| @@ -1821,7 +1821,8 @@ static int __init dquot_init(void) · 1820 unmodified lines | ||
| 1821 | 1821 | |
| 1822 | 1822 | dquot_cachep = kmem_cache_create("dquot", |
| 1823 | 1823 | sizeof(struct dquot), sizeof(unsigned long) * 4, |
| 1824 | − SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD|SLAB_PANIC, | |
| 1824 | + (SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT| | |
| 1825 | + SLAB_MEM_SPREAD|SLAB_PANIC), | |
| 1825 | 1826 | NULL, NULL); |
| 1826 | 1827 | |
| 1827 | 1828 | order = 0; |
| @@ -175,7 +175,8 @@ static int init_inodecache(void) · 174 unmodified lines | ||
| 175 | 175 | { |
| 176 | 176 | ext2_inode_cachep = kmem_cache_create("ext2_inode_cache", |
| 177 | 177 | sizeof(struct ext2_inode_info), |
| 178 | − 0, SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD, | |
| 178 | + 0, (SLAB_RECLAIM_ACCOUNT| | |
| 179 | + SLAB_MEM_SPREAD), | |
| 179 | 180 | init_once, NULL); |
| 180 | 181 | if (ext2_inode_cachep == NULL) |
| 181 | 182 | return -ENOMEM; |
| @@ -481,7 +481,8 @@ static int init_inodecache(void) · 480 unmodified lines | ||
| 481 | 481 | { |
| 482 | 482 | ext3_inode_cachep = kmem_cache_create("ext3_inode_cache", |
| 483 | 483 | sizeof(struct ext3_inode_info), |
| 484 | − 0, SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD, | |
| 484 | + 0, (SLAB_RECLAIM_ACCOUNT| | |
| 485 | + SLAB_MEM_SPREAD), | |
| 485 | 486 | init_once, NULL); |
| 486 | 487 | if (ext3_inode_cachep == NULL) |
| 487 | 488 | return -ENOMEM; |
| @@ -518,7 +518,8 @@ static int __init fat_init_inodecache(void) · 517 unmodified lines | ||
| 518 | 518 | { |
| 519 | 519 | fat_inode_cachep = kmem_cache_create("fat_inode_cache", |
| 520 | 520 | sizeof(struct msdos_inode_info), |
| 521 | − 0, SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD, | |
| 521 | + 0, (SLAB_RECLAIM_ACCOUNT| | |
| 522 | + SLAB_MEM_SPREAD), | |
| 522 | 523 | init_once, NULL); |
| 523 | 524 | if (fat_inode_cachep == NULL) |
| 524 | 525 | return -ENOMEM; |
| @@ -191,7 +191,8 @@ static int init_inodecache(void) · 190 unmodified lines | ||
| 191 | 191 | { |
| 192 | 192 | hpfs_inode_cachep = kmem_cache_create("hpfs_inode_cache", |
| 193 | 193 | sizeof(struct hpfs_inode_info), |
| 194 | − 0, SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD, | |
| 194 | + 0, (SLAB_RECLAIM_ACCOUNT| | |
| 195 | + SLAB_MEM_SPREAD), | |
| 195 | 196 | init_once, NULL); |
| 196 | 197 | if (hpfs_inode_cachep == NULL) |
| 197 | 198 | return -ENOMEM; |
| @@ -87,7 +87,8 @@ static int init_inodecache(void) · 86 unmodified lines | ||
| 87 | 87 | { |
| 88 | 88 | isofs_inode_cachep = kmem_cache_create("isofs_inode_cache", |
| 89 | 89 | sizeof(struct iso_inode_info), |
| 90 | − 0, SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD, | |
| 90 | + 0, (SLAB_RECLAIM_ACCOUNT| | |
| 91 | + SLAB_MEM_SPREAD), | |
| 91 | 92 | init_once, NULL); |
| 92 | 93 | if (isofs_inode_cachep == NULL) |
| 93 | 94 | return -ENOMEM; |
| @@ -1812,15 +1812,17 @@ init_jffs_fs(void) · 1811 unmodified lines | ||
| 1812 | 1812 | } |
| 1813 | 1813 | #endif |
| 1814 | 1814 | fm_cache = kmem_cache_create("jffs_fm", sizeof(struct jffs_fm), |
| 1815 | − 0, SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD, | |
| 1816 | − NULL, NULL); | |
| 1815 | + 0, | |
| 1816 | + SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD, | |
| 1817 | + NULL, NULL); | |
| 1817 | 1818 | if (!fm_cache) { |
| 1818 | 1819 | return -ENOMEM; |
| 1819 | 1820 | } |
| 1820 | 1821 | |
| 1821 | 1822 | node_cache = kmem_cache_create("jffs_node",sizeof(struct jffs_node), |
| 1822 | − 0, SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD, | |
| 1823 | − NULL, NULL); | |
| 1823 | + 0, | |
| 1824 | + SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD, | |
| 1825 | + NULL, NULL); | |
| 1824 | 1826 | if (!node_cache) { |
| 1825 | 1827 | kmem_cache_destroy(fm_cache); |
| 1826 | 1828 | return -ENOMEM; |
| @@ -331,7 +331,8 @@ static int __init init_jffs2_fs(void) · 330 unmodified lines | ||
| 331 | 331 | |
| 332 | 332 | jffs2_inode_cachep = kmem_cache_create("jffs2_i", |
| 333 | 333 | sizeof(struct jffs2_inode_info), |
| 334 | − 0, SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD, | |
| 334 | + 0, (SLAB_RECLAIM_ACCOUNT| | |
| 335 | + SLAB_MEM_SPREAD), | |
| 335 | 336 | jffs2_i_init_once, NULL); |
| 336 | 337 | if (!jffs2_inode_cachep) { |
| 337 | 338 | printk(KERN_ERR "JFFS2 error: Failed to initialise inode cache\n"); |
| @@ -664,7 +664,8 @@ static int __init init_jfs_fs(void) · 663 unmodified lines | ||
| 664 | 664 | |
| 665 | 665 | jfs_inode_cachep = |
| 666 | 666 | kmem_cache_create("jfs_ip", sizeof(struct jfs_inode_info), 0, |
| 667 | − SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD, init_once, NULL); | |
| 667 | + SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD, | |
| 668 | + init_once, NULL); | |
| 668 | 669 | if (jfs_inode_cachep == NULL) |
| 669 | 670 | return -ENOMEM; |
| 670 | 671 | |
| @@ -80,7 +80,8 @@ static int init_inodecache(void) · 79 unmodified lines | ||
| 80 | 80 | { |
| 81 | 81 | minix_inode_cachep = kmem_cache_create("minix_inode_cache", |
| 82 | 82 | sizeof(struct minix_inode_info), |
| 83 | − 0, SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD, | |
| 83 | + 0, (SLAB_RECLAIM_ACCOUNT| | |
| 84 | + SLAB_MEM_SPREAD), | |
| 84 | 85 | init_once, NULL); |
| 85 | 86 | if (minix_inode_cachep == NULL) |
| 86 | 87 | return -ENOMEM; |
| @@ -72,7 +72,8 @@ static int init_inodecache(void) · 71 unmodified lines | ||
| 72 | 72 | { |
| 73 | 73 | ncp_inode_cachep = kmem_cache_create("ncp_inode_cache", |
| 74 | 74 | sizeof(struct ncp_inode_info), |
| 75 | − 0, SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD, | |
| 75 | + 0, (SLAB_RECLAIM_ACCOUNT| | |
| 76 | + SLAB_MEM_SPREAD), | |
| 76 | 77 | init_once, NULL); |
| 77 | 78 | if (ncp_inode_cachep == NULL) |
| 78 | 79 | return -ENOMEM; |
| @@ -781,7 +781,8 @@ int nfs_init_directcache(void) · 780 unmodified lines | ||
| 781 | 781 | { |
| 782 | 782 | nfs_direct_cachep = kmem_cache_create("nfs_direct_cache", |
| 783 | 783 | sizeof(struct nfs_direct_req), |
| 784 | − 0, SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD, | |
| 784 | + 0, (SLAB_RECLAIM_ACCOUNT| | |
| 785 | + SLAB_MEM_SPREAD), | |
| 785 | 786 | NULL, NULL); |
| 786 | 787 | if (nfs_direct_cachep == NULL) |
| 787 | 788 | return -ENOMEM; |
| @@ -2163,7 +2163,8 @@ static int nfs_init_inodecache(void) · 2162 unmodified lines | ||
| 2163 | 2163 | { |
| 2164 | 2164 | nfs_inode_cachep = kmem_cache_create("nfs_inode_cache", |
| 2165 | 2165 | sizeof(struct nfs_inode), |
| 2166 | − 0, SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD, | |
| 2166 | + 0, (SLAB_RECLAIM_ACCOUNT| | |
| 2167 | + SLAB_MEM_SPREAD), | |
| 2167 | 2168 | init_once, NULL); |
| 2168 | 2169 | if (nfs_inode_cachep == NULL) |
| 2169 | 2170 | return -ENOMEM; |
| @@ -596,7 +596,8 @@ static int __init init_dlmfs_fs(void) · 595 unmodified lines | ||
| 596 | 596 | |
| 597 | 597 | dlmfs_inode_cache = kmem_cache_create("dlmfs_inode_cache", |
| 598 | 598 | sizeof(struct dlmfs_inode_private), |
| 599 | − 0, SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD, | |
| 599 | + 0, (SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT| | |
| 600 | + SLAB_MEM_SPREAD), | |
| 600 | 601 | dlmfs_init_once, NULL); |
| 601 | 602 | if (!dlmfs_inode_cache) |
| 602 | 603 | return -ENOMEM; |
| @@ -950,9 +950,11 @@ static void ocfs2_inode_init_once(void *data, · 949 unmodified lines | ||
| 950 | 950 | static int ocfs2_initialize_mem_caches(void) |
| 951 | 951 | { |
| 952 | 952 | ocfs2_inode_cachep = kmem_cache_create("ocfs2_inode_cache", |
| 953 | − sizeof(struct ocfs2_inode_info), | |
| 954 | − 0, SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD, | |
| 955 | − ocfs2_inode_init_once, NULL); | |
| 953 | + sizeof(struct ocfs2_inode_info), | |
| 954 | + 0, | |
| 955 | + (SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT| | |
| 956 | + SLAB_MEM_SPREAD), | |
| 957 | + ocfs2_inode_init_once, NULL); | |
| 956 | 958 | if (!ocfs2_inode_cachep) |
| 957 | 959 | return -ENOMEM; |
| 958 | 960 | |
| @@ -121,7 +121,8 @@ int __init proc_init_inodecache(void) · 120 unmodified lines | ||
| 121 | 121 | { |
| 122 | 122 | proc_inode_cachep = kmem_cache_create("proc_inode_cache", |
| 123 | 123 | sizeof(struct proc_inode), |
| 124 | − 0, SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD, | |
| 124 | + 0, (SLAB_RECLAIM_ACCOUNT| | |
| 125 | + SLAB_MEM_SPREAD), | |
| 125 | 126 | init_once, NULL); |
| 126 | 127 | if (proc_inode_cachep == NULL) |
| 127 | 128 | return -ENOMEM; |
| @@ -546,7 +546,8 @@ static int init_inodecache(void) · 545 unmodified lines | ||
| 546 | 546 | { |
| 547 | 547 | qnx4_inode_cachep = kmem_cache_create("qnx4_inode_cache", |
| 548 | 548 | sizeof(struct qnx4_inode_info), |
| 549 | − 0, SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD, | |
| 549 | + 0, (SLAB_RECLAIM_ACCOUNT| | |
| 550 | + SLAB_MEM_SPREAD), | |
| 550 | 551 | init_once, NULL); |
| 551 | 552 | if (qnx4_inode_cachep == NULL) |
| 552 | 553 | return -ENOMEM; |
| @@ -521,7 +521,8 @@ static int init_inodecache(void) · 520 unmodified lines | ||
| 521 | 521 | reiserfs_inode_cachep = kmem_cache_create("reiser_inode_cache", |
| 522 | 522 | sizeof(struct |
| 523 | 523 | reiserfs_inode_info), |
| 524 | − 0, SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD, | |
| 524 | + 0, (SLAB_RECLAIM_ACCOUNT| | |
| 525 | + SLAB_MEM_SPREAD), | |
| 525 | 526 | init_once, NULL); |
| 526 | 527 | if (reiserfs_inode_cachep == NULL) |
| 527 | 528 | return -ENOMEM; |
| @@ -579,7 +579,8 @@ static int init_inodecache(void) · 578 unmodified lines | ||
| 579 | 579 | { |
| 580 | 580 | romfs_inode_cachep = kmem_cache_create("romfs_inode_cache", |
| 581 | 581 | sizeof(struct romfs_inode_info), |
| 582 | − 0, SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD, | |
| 582 | + 0, (SLAB_RECLAIM_ACCOUNT| | |
| 583 | + SLAB_MEM_SPREAD), | |
| 583 | 584 | init_once, NULL); |
| 584 | 585 | if (romfs_inode_cachep == NULL) |
| 585 | 586 | return -ENOMEM; |
| @@ -80,7 +80,8 @@ static int init_inodecache(void) · 79 unmodified lines | ||
| 80 | 80 | { |
| 81 | 81 | smb_inode_cachep = kmem_cache_create("smb_inode_cache", |
| 82 | 82 | sizeof(struct smb_inode_info), |
| 83 | − 0, SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD, | |
| 83 | + 0, (SLAB_RECLAIM_ACCOUNT| | |
| 84 | + SLAB_MEM_SPREAD), | |
| 84 | 85 | init_once, NULL); |
| 85 | 86 | if (smb_inode_cachep == NULL) |
| 86 | 87 | return -ENOMEM; |
| @@ -140,7 +140,8 @@ static int init_inodecache(void) · 139 unmodified lines | ||
| 140 | 140 | { |
| 141 | 141 | udf_inode_cachep = kmem_cache_create("udf_inode_cache", |
| 142 | 142 | sizeof(struct udf_inode_info), |
| 143 | − 0, SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD, | |
| 143 | + 0, (SLAB_RECLAIM_ACCOUNT| | |
| 144 | + SLAB_MEM_SPREAD), | |
| 144 | 145 | init_once, NULL); |
| 145 | 146 | if (udf_inode_cachep == NULL) |
| 146 | 147 | return -ENOMEM; |
| @@ -1184,7 +1184,8 @@ static int init_inodecache(void) · 1183 unmodified lines | ||
| 1184 | 1184 | { |
| 1185 | 1185 | ufs_inode_cachep = kmem_cache_create("ufs_inode_cache", |
| 1186 | 1186 | sizeof(struct ufs_inode_info), |
| 1187 | − 0, SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD, | |
| 1187 | + 0, (SLAB_RECLAIM_ACCOUNT| | |
| 1188 | + SLAB_MEM_SPREAD), | |
| 1188 | 1189 | init_once, NULL); |
| 1189 | 1190 | if (ufs_inode_cachep == NULL) |
| 1190 | 1191 | return -ENOMEM; |
| @@ -319,7 +319,8 @@ static int init_inodecache(void) · 318 unmodified lines | ||
| 319 | 319 | { |
| 320 | 320 | sock_inode_cachep = kmem_cache_create("sock_inode_cache", |
| 321 | 321 | sizeof(struct socket_alloc), |
| 322 | − 0, SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD, | |
| 322 | + 0, (SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT| | |
| 323 | + SLAB_MEM_SPREAD), | |
| 323 | 324 | init_once, NULL); |
| 324 | 325 | if (sock_inode_cachep == NULL) |
| 325 | 326 | return -ENOMEM; |
| @@ -849,9 +849,10 @@ init_once(void * foo, kmem_cache_t * cachep, unsigned long flags) · 848 unmodified lines | ||
| 849 | 849 | int register_rpc_pipefs(void) |
| 850 | 850 | { |
| 851 | 851 | rpc_inode_cachep = kmem_cache_create("rpc_inode_cache", |
| 852 | − sizeof(struct rpc_inode), | |
| 853 | − 0, SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD, | |
| 854 | − init_once, NULL); | |
| 852 | + sizeof(struct rpc_inode), | |
| 853 | + 0, (SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT| | |
| 854 | + SLAB_MEM_SPREAD), | |
| 855 | + init_once, NULL); | |
| 855 | 856 | if (!rpc_inode_cachep) |
| 856 | 857 | return -ENOMEM; |
| 857 | 858 | register_filesystem(&rpc_pipe_fs_type); |