Commit 875332d4 authored by Dmitry Eremin's avatar Dmitry Eremin Committed by Greg Kroah-Hartman
Browse files

staging/lustre: fix frong ldlm flags type used 



Fixed implicit conversion from 'unsigned long long' to 'int'.

Signed-off-by: default avatarDmitry Eremin <dmitry.eremin@intel.com>
Reviewed-on: http://review.whamcloud.com/7799
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-4023


Reviewed-by: default avatarAndreas Dilger <andreas.dilger@intel.com>
Signed-off-by: default avatarOleg Drokin <oleg.drokin@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 98639249

drivers/staging/lustre/lustre/include/lustre_dlm.h

+1 −1
Original line number Diff line number Diff line
@@ -1390,7 +1390,7 @@ int ldlm_cli_cancel_req(struct obd_export *exp, struct list_head *head, 
int ldlm_cancel_resource_local(struct ldlm_resource *res,

			       struct list_head *cancels,

			       ldlm_policy_data_t *policy,

			       ldlm_mode_t mode, int lock_flags,

			       ldlm_mode_t mode, __u64 lock_flags,

			       ldlm_cancel_flags_t cancel_flags, void *opaque);

int ldlm_cli_cancel_list_local(struct list_head *cancels, int count,

			       ldlm_cancel_flags_t flags);

drivers/staging/lustre/lustre/include/obd_class.h

+1 −1
Original line number Diff line number Diff line
@@ -1818,7 +1818,7 @@ static inline int md_enqueue(struct obd_export *exp, 
			     struct lustre_handle *lockh,

			     void *lmm, int lmmsize,

			     struct ptlrpc_request **req,

			     int extra_lock_flags)

			     __u64 extra_lock_flags)

{

	int rc;

drivers/staging/lustre/lustre/include/obd_ost.h

+4 −0
Original line number Diff line number Diff line
@@ -87,6 +87,10 @@ struct osc_enqueue_args { 
	unsigned int	      oa_agl:1;

};



extern void osc_update_enqueue(struct lustre_handle *lov_lockhp,

			       struct lov_oinfo *loi, __u64 flags,

			       struct ost_lvb *lvb, __u32 mode, int rc);



#if 0

int osc_extent_blocking_cb(struct ldlm_lock *lock,

			   struct ldlm_lock_desc *new, void *data,

drivers/staging/lustre/lustre/ldlm/ldlm_request.c

+1 −1
Original line number Diff line number Diff line
@@ -1768,7 +1768,7 @@ int ldlm_cancel_lru(struct ldlm_namespace *ns, int nr, 
int ldlm_cancel_resource_local(struct ldlm_resource *res,

			       struct list_head *cancels,

			       ldlm_policy_data_t *policy,

			       ldlm_mode_t mode, int lock_flags,

			       ldlm_mode_t mode, __u64 lock_flags,

			       ldlm_cancel_flags_t cancel_flags, void *opaque)

{

	struct ldlm_lock *lock;

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

+3 −3
Original line number Diff line number Diff line
@@ -290,7 +290,7 @@ static int ll_md_close(struct obd_export *md_exp, struct inode *inode, 
	   we can skip talking to MDS */

	if (file->f_dentry->d_inode) { /* Can this ever be false? */

		int lockmode;

		int flags = LDLM_FL_BLOCK_GRANTED | LDLM_FL_TEST_LOCK;

		__u64 flags = LDLM_FL_BLOCK_GRANTED | LDLM_FL_TEST_LOCK;

		struct lustre_handle lockh;

		struct inode *inode = file->f_dentry->d_inode;

		ldlm_policy_data_t policy = {.l_inodebits={MDS_INODELOCK_OPEN}};
@@ -2623,7 +2623,7 @@ ll_file_flock(struct file *file, int cmd, struct file_lock *file_lock) 
	struct md_op_data *op_data;

	struct lustre_handle lockh = {0};

	ldlm_policy_data_t flock = {{0}};

	int flags = 0;

	__u64 flags = 0;

	int rc;

	int rc2 = 0;
@@ -2708,7 +2708,7 @@ ll_file_flock(struct file *file, int cmd, struct file_lock *file_lock) 
	if (IS_ERR(op_data))

		return PTR_ERR(op_data);



	CDEBUG(D_DLMTRACE, "inode=%lu, pid=%u, flags=%#x, mode=%u, "

	CDEBUG(D_DLMTRACE, "inode=%lu, pid=%u, flags=%#llx, mode=%u, "

	       "start="LPU64", end="LPU64"\n", inode->i_ino, flock.l_flock.pid,

	       flags, einfo.ei_mode, flock.l_flock.start, flock.l_flock.end);

CRA Git | Maintained and supported by SUSTech CRA and CCSE