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

Commit 9f11748c authored by Aastha Gupta's avatar Aastha Gupta Committed by Greg Kroah-Hartman
Browse files

staging: lustre: llite: fix lines over 80 characters in llite files 



This fixes checkpatch.pl warning:
WARNING: line over 80 characters

Signed-off-by: default avatarAastha Gupta <aastha.gupta4104@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f9e8f9bf

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

+6 −3
Original line number Diff line number Diff line
@@ -141,7 +141,8 @@ void ll_intent_drop_lock(struct lookup_intent *it) 


		handle.cookie = it->it_lock_handle;



		CDEBUG(D_DLMTRACE, "releasing lock with cookie %#llx from it %p\n",

		CDEBUG(D_DLMTRACE,

		       "releasing lock with cookie %#llx from it %p\n",

		       handle.cookie, it);

		ldlm_lock_decref(&handle, it->it_lock_mode);
@@ -152,7 +153,8 @@ void ll_intent_drop_lock(struct lookup_intent *it) 
		if (it->it_remote_lock_mode != 0) {

			handle.cookie = it->it_remote_lock_handle;



			CDEBUG(D_DLMTRACE, "releasing remote lock with cookie%#llx from it %p\n",

			CDEBUG(D_DLMTRACE,

			       "releasing remote lock with cookie%#llx from it %p\n",

			       handle.cookie, it);

			ldlm_lock_decref(&handle,

					 it->it_remote_lock_mode);
@@ -185,7 +187,8 @@ void ll_invalidate_aliases(struct inode *inode) 


	spin_lock(&inode->i_lock);

	hlist_for_each_entry(dentry, &inode->i_dentry, d_u.d_alias) {

		CDEBUG(D_DENTRY, "dentry in drop %pd (%p) parent %p inode %p flags %d\n",

		CDEBUG(D_DENTRY,

		       "dentry in drop %pd (%p) parent %p inode %p flags %d\n",

		       dentry, dentry, dentry->d_parent,

		       d_inode(dentry), dentry->d_flags);

drivers/staging/lustre/lustre/llite/dir.c

+6 −3
Original line number Diff line number Diff line
@@ -303,7 +303,8 @@ static int ll_readdir(struct file *filp, struct dir_context *ctx) 
	struct md_op_data *op_data;

	int			rc;



	CDEBUG(D_VFSTRACE, "VFS Op:inode=" DFID "(%p) pos/size %lu/%llu 32bit_api %d\n",

	CDEBUG(D_VFSTRACE,

	       "VFS Op:inode=" DFID "(%p) pos/size %lu/%llu 32bit_api %d\n",

	       PFID(ll_inode2fid(inode)), inode, (unsigned long)pos,

	       i_size_read(inode), api32);
@@ -502,7 +503,8 @@ int ll_dir_setstripe(struct inode *inode, struct lov_user_md *lump, 
			break;

		}

		default: {

			CDEBUG(D_IOCTL, "bad userland LOV MAGIC: %#08x != %#08x nor %#08x\n",

			CDEBUG(D_IOCTL,

			       "bad userland LOV MAGIC: %#08x != %#08x nor %#08x\n",

			       lump->lmm_magic, LOV_USER_MAGIC_V1,

			       LOV_USER_MAGIC_V3);

			return -EINVAL;
@@ -816,7 +818,8 @@ static int ll_ioc_copy_end(struct super_block *sb, struct hsm_copy *copy) 
		rc = ll_data_version(inode, &data_version, LL_DV_RD_FLUSH);

		iput(inode);

		if (rc) {

			CDEBUG(D_HSM, "Could not read file data version. Request could not be confirmed.\n");

			CDEBUG(D_HSM,

			       "Could not read file data version. Request could not be confirmed.\n");

			if (hpk.hpk_errval == 0)

				hpk.hpk_errval = -rc;

			goto progress;

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

+6 −3
Original line number Diff line number Diff line
@@ -605,7 +605,8 @@ int ll_file_open(struct inode *inode, struct file *file) 
			 * to get file with different fid.

			 */

			it->it_flags |= MDS_OPEN_LOCK | MDS_OPEN_BY_FID;

			rc = ll_intent_file_open(file->f_path.dentry, NULL, 0, it);

			rc = ll_intent_file_open(file->f_path.dentry,

						 NULL, 0, it);

			if (rc)

				goto out_openerr;
@@ -1119,7 +1120,8 @@ ll_file_io_generic(const struct lu_env *env, struct vvp_io_args *args, 
	cl_io_fini(env, io);



	if ((!rc || rc == -ENODATA) && count > 0 && io->ci_need_restart) {

		CDEBUG(D_VFSTRACE, "%s: restart %s from %lld, count:%zu, result: %zd\n",

		CDEBUG(D_VFSTRACE,

		       "%s: restart %s from %lld, count:%zu, result: %zd\n",

		       file_dentry(file)->d_name.name,

		       iot == CIT_READ ? "read" : "write",

		       *ppos, count, result);
@@ -3455,7 +3457,8 @@ static int ll_layout_lock_set(struct lustre_handle *lockh, enum ldlm_mode mode, 
		if (rc == 0)

			rc = -EAGAIN;



		CDEBUG(D_INODE, "%s: file=" DFID " waiting layout return: %d.\n",

		CDEBUG(D_INODE,

		       "%s: file=" DFID " waiting layout return: %d.\n",

		       ll_get_fsname(inode->i_sb, NULL, 0),

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

	}

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

+8 −5
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ struct ll_dentry_data { 


struct ll_getname_data {

	struct dir_context ctx;

	char	    *lgd_name;      /* points to a buffer with NAME_MAX+1 size */

	char	    *lgd_name;      /* points to buffer with NAME_MAX+1 size */

	struct lu_fid    lgd_fid;       /* target fid we are looking for */

	int	      lgd_found;     /* inode matched? */

};
@@ -637,7 +637,8 @@ static inline int ll_need_32bit_api(struct ll_sb_info *sbi) 
#if BITS_PER_LONG == 32

	return 1;

#elif defined(CONFIG_COMPAT)

	return unlikely(in_compat_syscall() || (sbi->ll_flags & LL_SBI_32BIT_API));

	return unlikely(in_compat_syscall() ||

			(sbi->ll_flags & LL_SBI_32BIT_API));

#else

	return unlikely(sbi->ll_flags & LL_SBI_32BIT_API);

#endif
@@ -1065,7 +1066,7 @@ struct ll_statahead_info { 
					     * hidden entries

					     */

				sai_agl_valid:1,/* AGL is valid for the dir */

				sai_in_readpage:1;/* statahead is in readdir() */

				sai_in_readpage:1;/* statahead in readdir() */

	wait_queue_head_t	sai_waitq;      /* stat-ahead wait queue */

	struct ptlrpc_thread    sai_thread;     /* stat-ahead thread */

	struct ptlrpc_thread    sai_agl_thread; /* AGL thread */
@@ -1261,7 +1262,8 @@ static inline void ll_set_lock_data(struct obd_export *exp, struct inode *inode, 


		handle.cookie = it->it_lock_handle;



		CDEBUG(D_DLMTRACE, "setting l_data to inode " DFID "%p for lock %#llx\n",

		CDEBUG(D_DLMTRACE,

		       "setting l_data to inode " DFID "%p for lock %#llx\n",

		       PFID(ll_inode2fid(inode)), inode, handle.cookie);



		md_set_lock_data(exp, &handle, inode, &it->it_lock_bits);
@@ -1284,7 +1286,8 @@ static inline int d_lustre_invalid(const struct dentry *dentry) 
 */

static inline void d_lustre_invalidate(struct dentry *dentry, int nested)

{

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

	CDEBUG(D_DENTRY,

	       "invalidate dentry %pd (%p) parent %p inode %p refc %d\n",

	       dentry, dentry,

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

drivers/staging/lustre/lustre/llite/llite_lib.c

+19 −10
Original line number Diff line number Diff line
@@ -231,7 +231,8 @@ static int client_common_fill_super(struct super_block *sb, char *md, char *dt, 
	err = obd_connect(NULL, &sbi->ll_md_exp, obd, &sbi->ll_sb_uuid,

			  data, NULL);

	if (err == -EBUSY) {

		LCONSOLE_ERROR_MSG(0x14f, "An MDT (md %s) is performing recovery, of which this client is not a part. Please wait for recovery to complete, abort, or time out.\n",

		LCONSOLE_ERROR_MSG(0x14f,

				   "An MDT (md %s) is performing recovery, of which this client is not a part. Please wait for recovery to complete, abort, or time out.\n",

				   md);

		goto out;

	} else if (err) {
@@ -279,7 +280,8 @@ static int client_common_fill_super(struct super_block *sb, char *md, char *dt, 
		}

		obd_connect_flags2str(buf, PAGE_SIZE,

				      valid ^ CLIENT_CONNECT_MDT_REQD, ",");

		LCONSOLE_ERROR_MSG(0x170, "Server %s does not support feature(s) needed for correct operation of this client (%s). Please upgrade server or downgrade client.\n",

		LCONSOLE_ERROR_MSG(0x170,

				   "Server %s does not support feature(s) needed for correct operation of this client (%s). Please upgrade server or downgrade client.\n",

				   sbi->ll_md_exp->exp_obd->obd_name, buf);

		kfree(buf);

		err = -EPROTO;
@@ -380,7 +382,8 @@ static int client_common_fill_super(struct super_block *sb, char *md, char *dt, 
	if (sbi->ll_flags & LL_SBI_ALWAYS_PING)

		data->ocd_connect_flags &= ~OBD_CONNECT_PINGLESS;



	CDEBUG(D_RPCTRACE, "ocd_connect_flags: %#llx ocd_version: %d ocd_grant: %d\n",

	CDEBUG(D_RPCTRACE,

	       "ocd_connect_flags: %#llx ocd_version: %d ocd_grant: %d\n",

	       data->ocd_connect_flags,

	       data->ocd_version, data->ocd_grant);
@@ -392,7 +395,8 @@ static int client_common_fill_super(struct super_block *sb, char *md, char *dt, 
	err = obd_connect(NULL, &sbi->ll_dt_exp, obd, &sbi->ll_sb_uuid, data,

			  NULL);

	if (err == -EBUSY) {

		LCONSOLE_ERROR_MSG(0x150, "An OST (dt %s) is performing recovery, of which this client is not a part.  Please wait for recovery to complete, abort, or time out.\n",

		LCONSOLE_ERROR_MSG(0x150,

				   "An OST (dt %s) is performing recovery, of which this client is not a part.  Please wait for recovery to complete, abort, or time out.\n",

				   dt);

		goto out_md;

	} else if (err) {
@@ -915,7 +919,8 @@ int ll_fill_super(struct super_block *sb, struct vfsmount *mnt) 
	/* Profile set with LCFG_MOUNTOPT so we can find our mdc and osc obds */

	lprof = class_get_profile(profilenm);

	if (!lprof) {

		LCONSOLE_ERROR_MSG(0x156, "The client profile '%s' could not be read from the MGS.  Does that filesystem exist?\n",

		LCONSOLE_ERROR_MSG(0x156,

				   "The client profile '%s' could not be read from the MGS.  Does that filesystem exist?\n",

				   profilenm);

		err = -EINVAL;

		goto out_free;
@@ -1042,7 +1047,8 @@ struct inode *ll_inode_from_resource_lock(struct ldlm_lock *lock) 
		} else {

			inode = lock->l_resource->lr_lvb_inode;

			LDLM_DEBUG_LIMIT(inode->i_state & I_FREEING ?  D_INFO :

					 D_WARNING, lock, "lr_lvb_inode %p is bogus: magic %08x",

					 D_WARNING, lock,

					 "lr_lvb_inode %p is bogus: magic %08x",

					 lock->l_resource->lr_lvb_inode,

					 lli->lli_inode_magic);

			inode = NULL;
@@ -1744,7 +1750,8 @@ int ll_update_inode(struct inode *inode, struct lustre_md *md) 
	}

	if (body->mbo_valid & OBD_MD_FLMTIME) {

		if (body->mbo_mtime > LTIME_S(inode->i_mtime)) {

			CDEBUG(D_INODE, "setting ino %lu mtime from %lu to %llu\n",

			CDEBUG(D_INODE,

			       "setting ino %lu mtime from %lu to %llu\n",

			       inode->i_ino, LTIME_S(inode->i_mtime),

			       body->mbo_mtime);

			LTIME_S(inode->i_mtime) = body->mbo_mtime;
@@ -2254,7 +2261,8 @@ int ll_process_config(struct lustre_cfg *lcfg) 
		return -EINVAL;

	sb = (void *)x;

	/* This better be a real Lustre superblock! */

	LASSERT(s2lsi((struct super_block *)sb)->lsi_lmd->lmd_magic == LMD_MAGIC);

	LASSERT(s2lsi((struct super_block *)sb)->lsi_lmd->lmd_magic ==

		LMD_MAGIC);



	/* Note we have not called client_common_fill_super yet, so

	 * proc fns must be able to handle that!
@@ -2571,8 +2579,9 @@ static int ll_linkea_decode(struct linkea_data *ldata, unsigned int linkno, 
 *

 * \param[in]	  file	- File descriptor against which to perform the operation

 * \param[in,out] arg	- User-filled structure containing the linkno to operate

 *			  on and the available size. It is eventually filled with

 *			  the requested information or left untouched on error

 *			  on and the available size. It is eventually filled

 *			  with the requested information or left untouched on

 *			  error

 *

 * \retval - 0 on success

 * \retval - Appropriate negative error code on failure