Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e15ba45d authored by Oleg Drokin's avatar Oleg Drokin Committed by Greg Kroah-Hartman
Browse files

staging/lustre/llite: Fix style vs open parenthesis alignment 



This mostly fixes checkpatch complaints about
"Alignment should match open parenthesis"

Signed-off-by: default avatarOleg Drokin <green@linuxhacker.ru>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 82ddecfe

drivers/staging/lustre/lustre/llite/dcache.c

+1 −2
Original line number Diff line number Diff line
@@ -183,8 +183,7 @@ static int ll_ddelete(const struct dentry *de) 
int ll_d_init(struct dentry *de)

{

	CDEBUG(D_DENTRY, "ldd on dentry %pd (%p) parent %p inode %p refc %d\n",

		de, de, de->d_parent, d_inode(de),

		d_count(de));

	       de, de, de->d_parent, d_inode(de), d_count(de));



	if (!de->d_fsdata) {

		struct ll_dentry_data *lld;

drivers/staging/lustre/lustre/llite/file.c

+37 −35
Original line number Diff line number Diff line
@@ -287,7 +287,8 @@ static int ll_md_close(struct obd_export *md_exp, struct inode *inode, 
		 * application crashed, we need to release here.

		 */

		rc = ll_lease_close(fd->fd_lease_och, inode, &lease_broken);

		CDEBUG(rc ? D_ERROR : D_INODE, "Clean up lease "DFID" %d/%d\n",

		CDEBUG(rc ? D_ERROR : D_INODE,

		       "Clean up lease " DFID " %d/%d\n",

		       PFID(&lli->lli_fid), rc, lease_broken);



		fd->fd_lease_och = NULL;
@@ -727,7 +728,8 @@ int ll_file_open(struct inode *inode, struct file *file) 
}



static int ll_md_blocking_lease_ast(struct ldlm_lock *lock,

			struct ldlm_lock_desc *desc, void *data, int flag)

				    struct ldlm_lock_desc *desc,

				    void *data, int flag)

{

	int rc;

	struct lustre_handle lockh;

drivers/staging/lustre/lustre/llite/llite_close.c

+2 −3
Original line number Diff line number Diff line
@@ -53,8 +53,7 @@ void vvp_write_pending(struct ccc_object *club, struct ccc_page *page) 
	spin_lock(&lli->lli_lock);

	lli->lli_flags |= LLIF_SOM_DIRTY;

	if (page && list_empty(&page->cpg_pending_linkage))

		list_add(&page->cpg_pending_linkage,

			     &club->cob_pending_list);

		list_add(&page->cpg_pending_linkage, &club->cob_pending_list);

	spin_unlock(&lli->lli_lock);

}

drivers/staging/lustre/lustre/llite/llite_internal.h

+4 −7
Original line number Diff line number Diff line
@@ -287,11 +287,8 @@ static inline void ll_layout_version_set(struct ll_inode_info *lli, __u32 gen) 


int ll_xattr_cache_destroy(struct inode *inode);



int ll_xattr_cache_get(struct inode *inode,

			const char *name,

			char *buffer,

			size_t size,

			__u64 valid);

int ll_xattr_cache_get(struct inode *inode, const char *name,

		       char *buffer, size_t size, __u64 valid);



/*

 * Locking to guarantee consistency of non-atomic updates to long long i_size,
@@ -970,8 +967,8 @@ int ll_close_thread_start(struct ll_close_queue **lcq_ret); 


int ll_teardown_mmaps(struct address_space *mapping, __u64 first, __u64 last);

int ll_file_mmap(struct file *file, struct vm_area_struct *vma);

void policy_from_vma(ldlm_policy_data_t *policy,

		struct vm_area_struct *vma, unsigned long addr, size_t count);

void policy_from_vma(ldlm_policy_data_t *policy, struct vm_area_struct *vma,

		     unsigned long addr, size_t count);

struct vm_area_struct *our_vma(struct mm_struct *mm, unsigned long addr,

			       size_t count);

drivers/staging/lustre/lustre/llite/rw.c

+3 −3
Original line number Diff line number Diff line
@@ -626,8 +626,8 @@ static int ll_read_ahead_pages(const struct lu_env *env, 
	RIA_DEBUG(ria);



	stride_ria = ria->ria_length > ria->ria_pages && ria->ria_pages > 0;

	for (page_idx = ria->ria_start; page_idx <= ria->ria_end &&

			*reserved_pages > 0; page_idx++) {

	for (page_idx = ria->ria_start;

	     page_idx <= ria->ria_end && *reserved_pages > 0; page_idx++) {

		if (ras_inside_ra_window(page_idx, ria)) {

			/* If the page is inside the read-ahead window*/

			rc = ll_read_ahead_page(env, io, queue,