staging: luster: Fix typo in lustre/llite (d0a0acc3) · Commits · e / devices / android_kernel_fairphone_FP4

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -160,7 +160,7 @@ static int ll_ddelete(const struct dentry *de)
		/* kernel >= 2.6.38 last refcount is decreased after this function. */
		LASSERT(d_count(de) == 1);

		/* Disable this piece of code temproarily because this is called
		/* Disable this piece of code temporarily because this is called
		* inside dcache_lock so it's not appropriate to do lots of work
		* here. ATTENTION: Before this piece of code enabling, LU-2487 must be
		* resolved. */

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

+5 −5

Original line number	Diff line number	Diff line
		@@ -1124,7 +1124,7 @@ ll_file_io_generic(const struct lu_env env, struct vvp_io_args args,
		vio->u.splice.cui_flags = args->u.splice.via_flags;
		break;
		default:
		CERROR("Unknow IO type - %u\n", vio->cui_io_subtype);
		CERROR("Unknown IO type - %u\n", vio->cui_io_subtype);
		LBUG();
		}
		result = cl_io_loop(env, io);
		@@ -2030,7 +2030,7 @@ static int ll_swap_layouts(struct file file1, struct file file2,
		llss->ia2.ia_valid = ATTR_MTIME \| ATTR_ATIME;
		}

		/* ultimate check, before swaping the layouts we check if
		/* ultimate check, before swapping the layouts we check if
		* dataversion has changed (if requested) */
		if (llss->check_dv1) {
		rc = ll_data_version(llss->inode1, &dv, 0);
		@@ -2695,7 +2695,7 @@ int ll_file_flock(struct file file, int cmd, struct file_lock file_lock)
		LASSERT((cmd == F_SETLKW) \|\| (cmd == F_SETLK));
		/* flocks are whole-file locks */
		flock.l_flock.end = OFFSET_MAX;
		/* For flocks owner is determined by the local file desctiptor*/
		/* For flocks owner is determined by the local file descriptor*/
		flock.l_flock.owner = (unsigned long)file_lock->fl_file;
		} else if (file_lock->fl_flags & FL_POSIX) {
		flock.l_flock.owner = (unsigned long)file_lock->fl_owner;
		@@ -3200,7 +3200,7 @@ struct inode_operations ll_file_inode_operations = {
		.get_acl = ll_get_acl,
		};

		/* dynamic ioctl number support routins */
		/* dynamic ioctl number support routines */
		static struct llioc_ctl_data {
		struct rw_semaphore ioc_sem;
		struct list_head ioc_head;
		@@ -3324,7 +3324,7 @@ int ll_layout_conf(struct inode inode, const struct cl_object_conf conf)
		if (result == 0) {
		/* it can only be allowed to match after layout is
		* applied to inode otherwise false layout would be
		* seen. Applying layout shoud happen before dropping
		* seen. Applying layout should happen before dropping
		* the intent lock. */
		ldlm_lock_allow_match(lock);
		}

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -348,7 +348,7 @@ static int ll_close_thread(void *arg)
		break;

		inode = ll_info2i(lli);
		CDEBUG(D_INFO, "done_writting for inode %lu/%u\n",
		CDEBUG(D_INFO, "done_writing for inode %lu/%u\n",
		inode->i_ino, inode->i_generation);
		ll_done_writing(inode);
		iput(inode);

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

+6 −6

Original line number	Diff line number	Diff line
		@@ -525,7 +525,7 @@ struct ll_sb_info {
		atomic_t ll_agl_total; /* AGL thread started count */

		dev_t ll_sdev_orig; /* save s_dev before assign for
		* clustred nfs */
		* clustered nfs */
		struct rmtacl_ctl_table ll_rct;
		struct eacl_table ll_et;
		__kernel_fsid_t ll_fsid;
		@@ -908,7 +908,7 @@ struct ccc_object cl_inode2ccc(struct inode inode);
		void vvp_write_pending (struct ccc_object club, struct ccc_page page);
		void vvp_write_complete(struct ccc_object club, struct ccc_page page);

		/* specific achitecture can implement only part of this list */
		/* specific architecture can implement only part of this list */
		enum vvp_io_subtype {
		/** normal IO */
		IO_NORMAL,
		@@ -1361,7 +1361,7 @@ ll_statahead_enter(struct inode dir, struct dentry *dentryp, int only_unplug)
		return do_statahead_enter(dir, dentryp, only_unplug);
		}

		/* llite ioctl register support rountine */
		/* llite ioctl register support routine */
		enum llioc_iter {
		LLIOC_CONT = 0,
		LLIOC_STOP
		@@ -1373,7 +1373,7 @@ enum llioc_iter {
		* Rules to write a callback function:
		*
		* Parameters:
		* @magic: Dynamic ioctl call routine will feed this vaule with the pointer
		* @magic: Dynamic ioctl call routine will feed this value with the pointer
		* returned to ll_iocontrol_register. Callback functions should use this
		* data to check the potential collasion of ioctl cmd. If collasion is
		* found, callback function should return LLIOC_CONT.
		@@ -1398,7 +1398,7 @@ enum llioc_iter ll_iocontrol_call(struct inode inode, struct file file,
		* @cb: callback function, it will be called if an ioctl command is found to
		* belong to the command list @cmd.
		*
		* Return vaule:
		* Return value:
		* A magic pointer will be returned if success;
		* otherwise, NULL will be returned.
		* */
		@@ -1508,7 +1508,7 @@ static inline void ll_set_lock_data(struct obd_export exp, struct inode inode,
		* separate locks in different namespaces, Master MDT,
		* where the name entry is, will grant LOOKUP lock,
		* remote MDT, where the object is, will grant
		* UPDATE\|PERM lock. The inode will be attched to both
		* UPDATE\|PERM lock. The inode will be attached to both
		* LOOKUP and PERM locks, so revoking either locks will
		* case the dcache being cleared */
		if (it->d.lustre.it_remote_lock_mode) {

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -279,7 +279,7 @@ static int client_common_fill_super(struct super_block sb, char md, char *dt,

		/* For mount, we only need fs info from MDT0, and also in DNE, it
		* can make sure the client can be mounted as long as MDT0 is
		* avaible */
		* available */
		err = obd_statfs(NULL, sbi->ll_md_exp, osfs,
		cfs_time_shift_64(-OBD_STATFS_CACHE_SECONDS),
		OBD_STATFS_FOR_MDT0);
		@@ -717,7 +717,7 @@ void ll_kill_super(struct super_block *sb)
		return;

		sbi = ll_s2sbi(sb);
		/* we need restore s_dev from changed for clustred NFS before put_super
		/* we need to restore s_dev from changed for clustered NFS before put_super
		* because new kernels have cached s_dev and change sb->s_dev in
		* put_super not affected real removing devices */
		if (sbi) {