Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Staging: pohmelfs: move open brace to same line on structs

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Cc: Evgeniy Polyakov <zbr@ioremap.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

authored by

Bill Pemberton and committed by
Greg Kroah-Hartman
385e3f1a 94993ce4

+23 -46
+1 -2
drivers/staging/pohmelfs/crypto.c
··· 832 832 return pohmelfs_crypto_thread_get(psb, pohmelfs_trans_crypt_action, trans); 833 833 } 834 834 835 - struct pohmelfs_crypto_input_action_data 836 - { 835 + struct pohmelfs_crypto_input_action_data { 837 836 struct page *page; 838 837 struct pohmelfs_crypto_engine *e; 839 838 u64 iv;
+1 -2
drivers/staging/pohmelfs/net.c
··· 168 168 * Polling machinery. 169 169 */ 170 170 171 - struct netfs_poll_helper 172 - { 171 + struct netfs_poll_helper { 173 172 poll_table pt; 174 173 struct netfs_state *st; 175 174 };
+21 -42
drivers/staging/pohmelfs/netfs.h
··· 30 30 * Network command structure. 31 31 * Will be extended. 32 32 */ 33 - struct netfs_cmd 34 - { 33 + struct netfs_cmd { 35 34 __u16 cmd; /* Command number */ 36 35 __u16 csize; /* Attached crypto information size */ 37 36 __u16 cpad; /* Attached padding size */ ··· 95 96 */ 96 97 #define _K_SS_MAXSIZE 128 97 98 98 - struct saddr 99 - { 99 + struct saddr { 100 100 unsigned short sa_family; 101 101 char addr[_K_SS_MAXSIZE]; 102 102 }; ··· 105 107 POHMELFS_CRYPTO_CIPHER, 106 108 }; 107 109 108 - struct pohmelfs_crypto 109 - { 110 + struct pohmelfs_crypto { 110 111 unsigned int idx; /* Config index */ 111 112 unsigned short strlen; /* Size of the attached crypto string including 0-byte 112 113 * "cbc(aes)" for example */ ··· 120 123 /* 121 124 * Configuration command used to create table of different remote servers. 122 125 */ 123 - struct pohmelfs_ctl 124 - { 126 + struct pohmelfs_ctl { 125 127 __u32 idx; /* Config index */ 126 128 __u32 type; /* Socket type */ 127 129 __u32 proto; /* Socket protocol */ ··· 133 137 /* 134 138 * Ack for userspace about requested command. 135 139 */ 136 - struct pohmelfs_cn_ack 137 - { 140 + struct pohmelfs_cn_ack { 138 141 struct cn_msg msg; 139 142 int error; 140 143 int msg_num; ··· 145 150 * Inode info structure used to sync with server. 146 151 * Check what stat() returns. 147 152 */ 148 - struct netfs_inode_info 149 - { 153 + struct netfs_inode_info { 150 154 unsigned int mode; 151 155 unsigned int nlink; 152 156 unsigned int uid; ··· 199 205 /* Extended attributes support on/off */ 200 206 #define POHMELFS_FLAGS_XATTR (1<<1) 201 207 202 - struct netfs_root_capabilities 203 - { 208 + struct netfs_root_capabilities { 204 209 __u64 nr_files; 205 210 __u64 used, avail; 206 211 __u64 flags; ··· 213 220 cap->flags = __cpu_to_be64(cap->flags); 214 221 } 215 222 216 - struct netfs_crypto_capabilities 217 - { 223 + struct netfs_crypto_capabilities { 218 224 unsigned short hash_strlen; /* Hash string length, like "hmac(sha1) including 0 byte "*/ 219 225 unsigned short cipher_strlen; /* Cipher string length with the same format */ 220 226 unsigned int cipher_keysize; /* Cipher key size */ ··· 233 241 POHMELFS_WRITE_LOCK, 234 242 }; 235 243 236 - struct netfs_lock 237 - { 244 + struct netfs_lock { 238 245 __u64 start; 239 246 __u64 ino; 240 247 __u32 size; ··· 259 268 /* 260 269 * Private POHMELFS cache of objects in directory. 261 270 */ 262 - struct pohmelfs_name 263 - { 271 + struct pohmelfs_name { 264 272 struct rb_node hash_node; 265 273 266 274 struct list_head sync_create_entry; ··· 276 286 /* 277 287 * POHMELFS inode. Main object. 278 288 */ 279 - struct pohmelfs_inode 280 - { 289 + struct pohmelfs_inode { 281 290 struct list_head inode_entry; /* Entry in superblock list. 282 291 * Objects which are not bound to dentry require to be dropped 283 292 * in ->put_super() ··· 307 318 struct netfs_state; 308 319 struct pohmelfs_sb; 309 320 310 - struct netfs_trans 311 - { 321 + struct netfs_trans { 312 322 /* 313 323 * Transaction header and attached contiguous data live here. 314 324 */ ··· 414 426 t->complete = NULL; 415 427 } 416 428 417 - struct netfs_trans_dst 418 - { 429 + struct netfs_trans_dst { 419 430 struct list_head trans_entry; 420 431 struct rb_node state_entry; 421 432 ··· 443 456 int netfs_trans_init(void); 444 457 void netfs_trans_exit(void); 445 458 446 - struct pohmelfs_crypto_engine 447 - { 459 + struct pohmelfs_crypto_engine { 448 460 u64 iv; /* Crypto IV for current operation */ 449 461 unsigned long timeout; /* Crypto waiting timeout */ 450 462 unsigned int size; /* Size of crypto scratchpad */ ··· 460 474 unsigned int page_num; 461 475 }; 462 476 463 - struct pohmelfs_crypto_thread 464 - { 477 + struct pohmelfs_crypto_thread { 465 478 struct list_head thread_entry; 466 479 467 480 struct task_struct *thread; ··· 482 497 /* 483 498 * Network state, attached to one server. 484 499 */ 485 - struct netfs_state 486 - { 500 + struct netfs_state { 487 501 struct mutex __state_lock; /* Can not allow to use the same socket simultaneously */ 488 502 struct mutex __state_send_lock; 489 503 struct netfs_cmd cmd; /* Cached command */ ··· 564 580 565 581 struct pohmelfs_config; 566 582 567 - struct pohmelfs_sb 568 - { 583 + struct pohmelfs_sb { 569 584 struct rb_root mcache_root; 570 585 struct mutex mcache_lock; 571 586 atomic_long_t mcache_gen; ··· 701 718 spin_unlock(&psb->ino_lock); 702 719 } 703 720 704 - struct pohmelfs_config 705 - { 721 + struct pohmelfs_config { 706 722 struct list_head config_entry; 707 723 708 724 struct netfs_state state; 709 725 }; 710 726 711 - struct pohmelfs_config_group 712 - { 727 + struct pohmelfs_config_group { 713 728 /* 714 729 * Entry in the global config group list. 715 730 */ ··· 795 814 int pohmelfs_construct_path_string(struct pohmelfs_inode *pi, void *data, int len); 796 815 int pohmelfs_path_length(struct pohmelfs_inode *pi); 797 816 798 - struct pohmelfs_crypto_completion 799 - { 817 + struct pohmelfs_crypto_completion { 800 818 struct completion complete; 801 819 int error; 802 820 }; ··· 871 891 } 872 892 } 873 893 874 - struct pohmelfs_mcache 875 - { 894 + struct pohmelfs_mcache { 876 895 struct rb_node mcache_entry; 877 896 struct completion complete; 878 897