Commit 1d8cb70c authored by Greg Donald's avatar Greg Donald Committed by Greg Kroah-Hartman
Browse files

drivers: staging: lustre: Fix space required after that ',' errors 



Fix checkpatch.pl space required after that ',' errors

Signed-off-by: default avatarGreg Donald <gdonald@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4873972b

drivers/staging/lustre/lnet/klnds/socklnd/socklnd_proto.c

+4 −2
Original line number Diff line number Diff line
@@ -495,7 +495,8 @@ ksocknal_send_hello_v1 (ksock_conn_t *conn, ksock_hello_msg_t *hello) 
	hdr->msg.hello.type = cpu_to_le32 (hello->kshm_ctype);

	hdr->msg.hello.incarnation = cpu_to_le64 (hello->kshm_src_incarnation);



	rc = libcfs_sock_write(sock, hdr, sizeof(*hdr),lnet_acceptor_timeout());

	rc = libcfs_sock_write(sock, hdr, sizeof(*hdr),

			       lnet_acceptor_timeout());



	if (rc != 0) {

		CNETERR("Error %d sending HELLO hdr to %pI4h/%d\n",
@@ -568,7 +569,8 @@ ksocknal_send_hello_v2 (ksock_conn_t *conn, ksock_hello_msg_t *hello) 
}



static int

ksocknal_recv_hello_v1(ksock_conn_t *conn, ksock_hello_msg_t *hello,int timeout)

ksocknal_recv_hello_v1(ksock_conn_t *conn, ksock_hello_msg_t *hello,

		       int timeout)

{

	struct socket	*sock = conn->ksnc_sock;

	lnet_hdr_t	  *hdr;

drivers/staging/lustre/lustre/include/lclient.h

+8 −6
Original line number Diff line number Diff line
@@ -320,7 +320,8 @@ int ccc_transient_page_prep(const struct lu_env *env, 
void ccc_lock_delete(const struct lu_env *env,

		     const struct cl_lock_slice *slice);

void ccc_lock_fini(const struct lu_env *env, struct cl_lock_slice *slice);

int ccc_lock_enqueue(const struct lu_env *env,const struct cl_lock_slice *slice,

int ccc_lock_enqueue(const struct lu_env *env,

		     const struct cl_lock_slice *slice,

		     struct cl_io *io, __u32 enqflags);

int ccc_lock_unuse(const struct lu_env *env, const struct cl_lock_slice *slice);

int ccc_lock_wait(const struct lu_env *env, const struct cl_lock_slice *slice);
@@ -348,7 +349,8 @@ int ccc_prep_size(const struct lu_env *env, struct cl_object *obj, 
		  struct cl_io *io, loff_t start, size_t count, int *exceed);

void ccc_req_completion(const struct lu_env *env,

			const struct cl_req_slice *slice, int ioret);

void ccc_req_attr_set(const struct lu_env *env,const struct cl_req_slice *slice,

void ccc_req_attr_set(const struct lu_env *env,

		      const struct cl_req_slice *slice,

		      const struct cl_object *obj,

		      struct cl_req_attr *oa, u64 flags);

drivers/staging/lustre/lustre/include/linux/lustre_compat25.h

+10 −8
Original line number Diff line number Diff line
@@ -103,8 +103,10 @@ static inline void ll_set_fs_pwd(struct fs_struct *fs, struct vfsmount *mnt, 
#define ll_vfs_mkdir(inode, dir, mnt, mode)	vfs_mkdir(inode, dir, mode)

#define ll_vfs_link(old, mnt, dir, new, mnt1)       vfs_link(old, dir, new)

#define ll_vfs_unlink(inode, entry, mnt)	  vfs_unlink(inode, entry)

#define ll_vfs_mknod(dir,entry,mnt,mode,dev)    vfs_mknod(dir,entry,mode,dev)

#define ll_security_inode_unlink(dir,entry,mnt) security_inode_unlink(dir,entry)

#define ll_vfs_mknod(dir, entry, mnt, mode, dev) \

		     vfs_mknod(dir, entry, mode, dev)

#define ll_security_inode_unlink(dir, entry, mnt) \

				 security_inode_unlink(dir, entry)

#define ll_vfs_rename(old, old_dir, mnt, new, new_dir, mnt1) \

		vfs_rename(old, old_dir, new, new_dir, NULL, 0)

drivers/staging/lustre/lustre/include/linux/lustre_fsfilt.h

+3 −2
Original line number Diff line number Diff line
@@ -155,7 +155,8 @@ static inline int fsfilt_write_record(struct obd_device *obd, struct file *file, 
				      void *buf, loff_t size, loff_t *offs,

				      int force_sync)

{

	return obd->obd_fsops->fs_write_record(file, buf, size,offs,force_sync);

	return obd->obd_fsops->fs_write_record(file, buf, size, offs,

					       force_sync);

}



static inline int fsfilt_setup(struct obd_device *obd, struct super_block *fs)

drivers/staging/lustre/lustre/include/lprocfs_status.h

+3 −2
Original line number Diff line number Diff line
@@ -864,7 +864,8 @@ static inline void lprocfs_free_md_stats(struct obd_device *obddev) 
struct obd_export;

static inline int lprocfs_add_clear_entry(struct obd_export *exp)

{ return 0; }

static inline int lprocfs_exp_setup(struct obd_export *exp,lnet_nid_t *peer_nid,

static inline int lprocfs_exp_setup(struct obd_export *exp,

				    lnet_nid_t *peer_nid,

				    int *newnid)

{ return 0; }

static inline int lprocfs_exp_cleanup(struct obd_export *exp)