Commit 637ae8d5 authored by Herb Shiu's avatar Herb Shiu Committed by Sage Weil
Browse files

ceph: pass lock information by struct file_lock instead of as individual params. 



Signed-off-by: default avatarHerb Shiu <herb_shiu@tcloudcomputing.com>
Acked-by: default avatarGreg Farnum <gregf@hq.newdream.net>
Signed-off-by: default avatarSage Weil <sage@newdream.net>
parent 25933abd

fs/ceph/locks.c

+21 −37
Original line number Diff line number Diff line
@@ -11,40 +11,49 @@ 
 * Implement fcntl and flock locking functions.

 */

static int ceph_lock_message(u8 lock_type, u16 operation, struct file *file,

			     u64 pid, u64 pid_ns,

			     int cmd, u64 start, u64 length, u8 wait)

			     int cmd, u8 wait, struct file_lock *fl)

{

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

	struct ceph_mds_client *mdsc =

		ceph_sb_to_client(inode->i_sb)->mdsc;

	struct ceph_mds_request *req;

	int err;

	u64 length = 0;



	req = ceph_mdsc_create_request(mdsc, operation, USE_AUTH_MDS);

	if (IS_ERR(req))

		return PTR_ERR(req);

	req->r_inode = igrab(inode);



	/* mds requires start and length rather than start and end */

	if (LLONG_MAX == fl->fl_end)

		length = 0;

	else

		length = fl->fl_end - fl->fl_start + 1;



	dout("ceph_lock_message: rule: %d, op: %d, pid: %llu, start: %llu, "

	     "length: %llu, wait: %d, type`: %d", (int)lock_type,

	     (int)operation, pid, start, length, wait, cmd);

	     (int)operation, (u64)fl->fl_pid, fl->fl_start,

	     length, wait, fl->fl_type);





	req->r_args.filelock_change.rule = lock_type;

	req->r_args.filelock_change.type = cmd;

	req->r_args.filelock_change.pid = cpu_to_le64(pid);

	req->r_args.filelock_change.pid = cpu_to_le64((u64)fl->fl_pid);

	/* This should be adjusted, but I'm not sure if

	   namespaces actually get id numbers*/

	req->r_args.filelock_change.pid_namespace =

		cpu_to_le64((u64)pid_ns);

	req->r_args.filelock_change.start = cpu_to_le64(start);

		cpu_to_le64((u64)(unsigned long)fl->fl_nspid);

	req->r_args.filelock_change.start = cpu_to_le64(fl->fl_start);

	req->r_args.filelock_change.length = cpu_to_le64(length);

	req->r_args.filelock_change.wait = wait;



	err = ceph_mdsc_do_request(mdsc, inode, req);

	ceph_mdsc_put_request(req);

	dout("ceph_lock_message: rule: %d, op: %d, pid: %llu, start: %llu, "

	     "length: %llu, wait: %d, type`: %d err code %d", (int)lock_type,

	     (int)operation, pid, start, length, wait, cmd, err);

	     "length: %llu, wait: %d, type`: %d, err code %d", (int)lock_type,

	     (int)operation, (u64)fl->fl_pid, fl->fl_start,

	     length, wait, fl->fl_type, err);

	return err;

}
@@ -54,7 +63,6 @@ static int ceph_lock_message(u8 lock_type, u16 operation, struct file *file, 
 */

int ceph_lock(struct file *file, int cmd, struct file_lock *fl)

{

	u64 length;

	u8 lock_cmd;

	int err;

	u8 wait = 0;
@@ -76,16 +84,7 @@ int ceph_lock(struct file *file, int cmd, struct file_lock *fl) 
	else

		lock_cmd = CEPH_LOCK_UNLOCK;



	if (LLONG_MAX == fl->fl_end)

		length = 0;

	else

		length = fl->fl_end - fl->fl_start + 1;



	err = ceph_lock_message(CEPH_LOCK_FCNTL, op, file,

				(u64)fl->fl_pid,

				(u64)(unsigned long)fl->fl_nspid,

				lock_cmd, fl->fl_start,

				length, wait);

	err = ceph_lock_message(CEPH_LOCK_FCNTL, op, file, lock_cmd, wait, fl);

	if (!err) {

		dout("mds locked, locking locally");

		err = posix_lock_file(file, fl, NULL);
@@ -93,10 +92,7 @@ int ceph_lock(struct file *file, int cmd, struct file_lock *fl) 
			/* undo! This should only happen if the kernel detects

			 * local deadlock. */

			ceph_lock_message(CEPH_LOCK_FCNTL, op, file,

					  (u64)fl->fl_pid,

					  (u64)(unsigned long)fl->fl_nspid,

					  CEPH_LOCK_UNLOCK, fl->fl_start,

					  length, 0);

					  CEPH_LOCK_UNLOCK, 0, fl);

			dout("got %d on posix_lock_file, undid lock", err);

		}

	} else {
@@ -107,7 +103,6 @@ int ceph_lock(struct file *file, int cmd, struct file_lock *fl) 


int ceph_flock(struct file *file, int cmd, struct file_lock *fl)

{

	u64 length;

	u8 lock_cmd;

	int err;

	u8 wait = 1;
@@ -127,26 +122,15 @@ int ceph_flock(struct file *file, int cmd, struct file_lock *fl) 
		lock_cmd = CEPH_LOCK_EXCL;

	else

		lock_cmd = CEPH_LOCK_UNLOCK;

	/* mds requires start and length rather than start and end */

	if (LLONG_MAX == fl->fl_end)

		length = 0;

	else

		length = fl->fl_end - fl->fl_start + 1;



	err = ceph_lock_message(CEPH_LOCK_FLOCK, CEPH_MDS_OP_SETFILELOCK,

				file, (u64)fl->fl_pid,

				(u64)(unsigned long)fl->fl_nspid,

				lock_cmd, fl->fl_start,

				length, wait);

				file, lock_cmd, wait, fl);

	if (!err) {

		err = flock_lock_file_wait(file, fl);

		if (err) {

			ceph_lock_message(CEPH_LOCK_FLOCK,

					  CEPH_MDS_OP_SETFILELOCK,

					  file, (u64)fl->fl_pid,

					  (u64)(unsigned long)fl->fl_nspid,

					  CEPH_LOCK_UNLOCK, fl->fl_start,

					  length, 0);

					  file, CEPH_LOCK_UNLOCK, 0, fl);

			dout("got %d on flock_lock_file_wait, undid lock", err);

		}

	} else {