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

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

staging/lustre/llite: Remove unused vui_local_lock field 



vvp_io_setattr_lock is the only user that sets it, but it's
never checked anywhere, so could go away.
Also get rid of enum ccc_setattr_lock_type that becomes unused.

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

drivers/staging/lustre/lustre/llite/vvp_internal.h

+0 −12
Original line number Diff line number Diff line
@@ -53,15 +53,6 @@ struct obd_device; 
struct obd_export;

struct page;



enum ccc_setattr_lock_type {

	/** Locking is done by server */

	SETATTR_NOLOCK,

	/** Extent lock is enqueued */

	SETATTR_EXTENT_LOCK,

	/** Existing local extent lock is used */

	SETATTR_MATCH_LOCK

};



/* specific architecture can implement only part of this list */

enum vvp_io_subtype {

	/** normal IO */
@@ -111,9 +102,6 @@ struct vvp_io { 
			 */

			bool		ft_flags_valid;

		} fault;

		struct {

			enum ccc_setattr_lock_type vui_local_lock;

		} setattr;

		struct {

			struct pipe_inode_info	*vui_pipe;

			unsigned int		 vui_flags;

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

+0 −3
Original line number Diff line number Diff line
@@ -567,7 +567,6 @@ static int vvp_io_setattr_iter_init(const struct lu_env *env, 
static int vvp_io_setattr_lock(const struct lu_env *env,

			       const struct cl_io_slice *ios)

{

	struct vvp_io *vio = vvp_env_io(env);

	struct cl_io  *io  = ios->cis_io;

	__u64 new_size;

	__u32 enqflags = 0;
@@ -585,8 +584,6 @@ static int vvp_io_setattr_lock(const struct lu_env *env, 
		new_size = 0;

	}



	vio->u.setattr.vui_local_lock = SETATTR_EXTENT_LOCK;



	return vvp_io_one_lock(env, io, enqflags, CLM_WRITE,

			       new_size, OBD_OBJECT_EOF);

}