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