Commit 385e3f1a authored by Bill Pemberton's avatar Bill Pemberton Committed by Greg Kroah-Hartman
Browse files

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



Signed-off-by: default avatarBill Pemberton <wfp5p@virginia.edu>
Cc: Evgeniy Polyakov <zbr@ioremap.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 94993ce4

drivers/staging/pohmelfs/crypto.c

+1 −2
Original line number Diff line number Diff line
@@ -832,8 +832,7 @@ int pohmelfs_trans_crypt(struct netfs_trans *trans, struct pohmelfs_sb *psb) 
	return pohmelfs_crypto_thread_get(psb, pohmelfs_trans_crypt_action, trans);

}



struct pohmelfs_crypto_input_action_data

{

struct pohmelfs_crypto_input_action_data {

	struct page			*page;

	struct pohmelfs_crypto_engine	*e;

	u64				iv;

drivers/staging/pohmelfs/net.c

+1 −2
Original line number Diff line number Diff line
@@ -168,8 +168,7 @@ int pohmelfs_data_recv_and_check(struct netfs_state *st, void *data, unsigned in 
 * Polling machinery.

 */



struct netfs_poll_helper

{

struct netfs_poll_helper {

	poll_table 		pt;

	struct netfs_state	*st;

};

drivers/staging/pohmelfs/netfs.h

+21 −42
Original line number Diff line number Diff line
@@ -30,8 +30,7 @@ 
 * Network command structure.

 * Will be extended.

 */

struct netfs_cmd

{

struct netfs_cmd {

	__u16			cmd;	/* Command number */

	__u16			csize;	/* Attached crypto information size */

	__u16			cpad;	/* Attached padding size */
@@ -96,8 +95,7 @@ enum { 
 */

#define _K_SS_MAXSIZE	128



struct saddr

{

struct saddr {

	unsigned short		sa_family;

	char			addr[_K_SS_MAXSIZE];

};
@@ -107,8 +105,7 @@ enum { 
	POHMELFS_CRYPTO_CIPHER,

};



struct pohmelfs_crypto

{

struct pohmelfs_crypto {

	unsigned int		idx;		/* Config index */

	unsigned short		strlen;		/* Size of the attached crypto string including 0-byte

						 * "cbc(aes)" for example */
@@ -123,8 +120,7 @@ struct pohmelfs_crypto 
/*

 * Configuration command used to create table of different remote servers.

 */

struct pohmelfs_ctl

{

struct pohmelfs_ctl {

	__u32			idx;		/* Config index */

	__u32			type;		/* Socket type */

	__u32			proto;		/* Socket protocol */
@@ -137,8 +133,7 @@ struct pohmelfs_ctl 
/*

 * Ack for userspace about requested command.

 */

struct pohmelfs_cn_ack

{

struct pohmelfs_cn_ack {

	struct cn_msg		msg;

	int			error;

	int			msg_num;
@@ -150,8 +145,7 @@ struct pohmelfs_cn_ack 
 * Inode info structure used to sync with server.

 * Check what stat() returns.

 */

struct netfs_inode_info

{

struct netfs_inode_info {

	unsigned int		mode;

	unsigned int		nlink;

	unsigned int		uid;
@@ -205,8 +199,7 @@ enum pohmelfs_capabilities { 
/* Extended attributes support on/off */

#define POHMELFS_FLAGS_XATTR		(1<<1)



struct netfs_root_capabilities

{

struct netfs_root_capabilities {

	__u64			nr_files;

	__u64			used, avail;

	__u64			flags;
@@ -220,8 +213,7 @@ static inline void netfs_convert_root_capabilities(struct netfs_root_capabilitie 
	cap->flags = __cpu_to_be64(cap->flags);

}



struct netfs_crypto_capabilities

{

struct netfs_crypto_capabilities {

	unsigned short		hash_strlen;	/* Hash string length, like "hmac(sha1) including 0 byte "*/

	unsigned short		cipher_strlen;	/* Cipher string length with the same format */

	unsigned int		cipher_keysize;	/* Cipher key size */
@@ -241,8 +233,7 @@ enum pohmelfs_lock_type { 
	POHMELFS_WRITE_LOCK,

};



struct netfs_lock

{

struct netfs_lock {

	__u64			start;

	__u64			ino;

	__u32			size;
@@ -268,8 +259,7 @@ static inline void netfs_convert_lock(struct netfs_lock *lock) 
/*

 * Private POHMELFS cache of objects in directory.

 */

struct pohmelfs_name

{

struct pohmelfs_name {

	struct rb_node		hash_node;



	struct list_head	sync_create_entry;
@@ -286,8 +276,7 @@ struct pohmelfs_name 
/*

 * POHMELFS inode. Main object.

 */

struct pohmelfs_inode

{

struct pohmelfs_inode {

	struct list_head	inode_entry;		/* Entry in superblock list.

							 * Objects which are not bound to dentry require to be dropped

							 * in ->put_super()
@@ -318,8 +307,7 @@ typedef int (* netfs_trans_complete_t)(struct page **pages, unsigned int page_nu 
struct netfs_state;

struct pohmelfs_sb;



struct netfs_trans

{

struct netfs_trans {

	/*

	 * Transaction header and attached contiguous data live here.

	 */
@@ -426,8 +414,7 @@ static inline void netfs_trans_reset(struct netfs_trans *t) 
	t->complete = NULL;

}



struct netfs_trans_dst

{

struct netfs_trans_dst {

	struct list_head		trans_entry;

	struct rb_node			state_entry;
@@ -456,8 +443,7 @@ int netfs_trans_remove_nolock(struct netfs_trans_dst *dst, struct netfs_state *s 
int netfs_trans_init(void);

void netfs_trans_exit(void);



struct pohmelfs_crypto_engine

{

struct pohmelfs_crypto_engine {

	u64				iv;		/* Crypto IV for current operation */

	unsigned long			timeout;	/* Crypto waiting timeout */

	unsigned int			size;		/* Size of crypto scratchpad */
@@ -474,8 +460,7 @@ struct pohmelfs_crypto_engine 
	unsigned int			page_num;

};



struct pohmelfs_crypto_thread

{

struct pohmelfs_crypto_thread {

	struct list_head		thread_entry;



	struct task_struct		*thread;
@@ -497,8 +482,7 @@ void pohmelfs_crypto_thread_make_ready(struct pohmelfs_crypto_thread *th); 
/*

 * Network state, attached to one server.

 */

struct netfs_state

{

struct netfs_state {

	struct mutex		__state_lock;		/* Can not allow to use the same socket simultaneously */

	struct mutex		__state_send_lock;

	struct netfs_cmd 	cmd;			/* Cached command */
@@ -580,8 +564,7 @@ static inline unsigned int netfs_state_poll(struct netfs_state *st) 


struct pohmelfs_config;



struct pohmelfs_sb

{

struct pohmelfs_sb {

	struct rb_root		mcache_root;

	struct mutex		mcache_lock;

	atomic_long_t		mcache_gen;
@@ -718,15 +701,13 @@ static inline void pohmelfs_put_inode(struct pohmelfs_inode *pi) 
	spin_unlock(&psb->ino_lock);

}



struct pohmelfs_config

{

struct pohmelfs_config {

	struct list_head	config_entry;



	struct netfs_state	state;

};



struct pohmelfs_config_group

{

struct pohmelfs_config_group {

	/*

	 * Entry in the global config group list.

	 */
@@ -814,8 +795,7 @@ void pohmelfs_switch_active(struct pohmelfs_sb *psb); 
int pohmelfs_construct_path_string(struct pohmelfs_inode *pi, void *data, int len);

int pohmelfs_path_length(struct pohmelfs_inode *pi);



struct pohmelfs_crypto_completion

{

struct pohmelfs_crypto_completion {

	struct completion	complete;

	int			error;

};
@@ -891,8 +871,7 @@ static inline void netfs_trans_put(struct netfs_trans *t) 
	}

}



struct pohmelfs_mcache

{

struct pohmelfs_mcache {

	struct rb_node			mcache_entry;

	struct completion		complete;