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

staging/lustre: Get rid of inode_dio_write_done and inode_dio_read 



These primitives are long deprecated and unused.

Signed-off-by: default avatarOleg Drokin <oleg.drokin@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 66a23f0c

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

+0 −5
Original line number Original line Diff line number Diff line
@@ -64,11 +64,6 @@ 




#define LTIME_S(time)		   (time.tv_sec)

#define LTIME_S(time)		   (time.tv_sec)





/* inode_dio_wait(i) use as-is for write lock */

# define inode_dio_write_done(i)	do {} while (0) /* for write unlock */

# define inode_dio_read(i)		atomic_inc(&(i)->i_dio_count)

/* inode_dio_done(i) use as-is for read unlock */



#ifndef QUOTA_OK

#ifndef QUOTA_OK

# define QUOTA_OK 0

# define QUOTA_OK 0

#endif

#endif

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

+1 −4
Original line number Original line Diff line number Diff line
@@ -1356,11 +1356,8 @@ int ll_setattr_raw(struct dentry *dentry, struct iattr *attr, bool hsm_import) 
	if (!op_data)

	if (!op_data)

		return -ENOMEM;

		return -ENOMEM;





	if (!S_ISDIR(inode->i_mode)) {

	if (!S_ISDIR(inode->i_mode))

		if (attr->ia_valid & ATTR_SIZE)

			inode_dio_write_done(inode);

		mutex_unlock(&inode->i_mutex);

		mutex_unlock(&inode->i_mutex);

	}





	memcpy(&op_data->op_attr, attr, sizeof(*attr));

	memcpy(&op_data->op_attr, attr, sizeof(*attr));

drivers/staging/lustre/lustre/llite/vvp_io.c

+2 −3
Original line number Original line Diff line number Diff line
@@ -455,12 +455,11 @@ static void vvp_io_setattr_end(const struct lu_env *env, 
	struct cl_io *io    = ios->cis_io;

	struct cl_io *io    = ios->cis_io;

	struct inode *inode = ccc_object_inode(io->ci_obj);

	struct inode *inode = ccc_object_inode(io->ci_obj);





	if (cl_io_is_trunc(io)) {

	if (cl_io_is_trunc(io))

		/* Truncate in memory pages - they must be clean pages

		/* Truncate in memory pages - they must be clean pages

		 * because osc has already notified to destroy osc_extents. */

		 * because osc has already notified to destroy osc_extents. */

		vvp_do_vmtruncate(inode, io->u.ci_setattr.sa_attr.lvb_size);

		vvp_do_vmtruncate(inode, io->u.ci_setattr.sa_attr.lvb_size);

		inode_dio_write_done(inode);



	}

	mutex_unlock(&inode->i_mutex);

	mutex_unlock(&inode->i_mutex);

}

}