From 6f73d39896a7b8c2e08b96c87d2b7f4b2f9cb936 Mon Sep 17 00:00:00 2001
From: "J. Bruce Fields" <bfields@fieldses.org>
Date: Mon, 23 Jul 2012 15:17:17 -0400
Subject: [PATCH] --- yaml --- r: 312990 b: refs/heads/master c:
 0ec4f431eb56d633da3a55da67d5c4b88886ccc7 h: refs/heads/master v: v3

---
 [refs]           | 2 +-
 trunk/fs/locks.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 5c91bcc399ab..6b4a59a1c458 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a66d2c8f7ec1284206ca7c14569e2a607583f1e3
+refs/heads/master: 0ec4f431eb56d633da3a55da67d5c4b88886ccc7
diff --git a/trunk/fs/locks.c b/trunk/fs/locks.c
index fce6238d52c1..82c353304f9e 100644
--- a/trunk/fs/locks.c
+++ b/trunk/fs/locks.c
@@ -308,7 +308,7 @@ static int flock_make_lock(struct file *filp, struct file_lock **lock,
 	return 0;
 }
 
-static int assign_type(struct file_lock *fl, int type)
+static int assign_type(struct file_lock *fl, long type)
 {
 	switch (type) {
 	case F_RDLCK:
@@ -445,7 +445,7 @@ static const struct lock_manager_operations lease_manager_ops = {
 /*
  * Initialize a lease, use the default lock manager operations
  */
-static int lease_init(struct file *filp, int type, struct file_lock *fl)
+static int lease_init(struct file *filp, long type, struct file_lock *fl)
  {
 	if (assign_type(fl, type) != 0)
 		return -EINVAL;
@@ -463,7 +463,7 @@ static int lease_init(struct file *filp, int type, struct file_lock *fl)
 }
 
 /* Allocate a file_lock initialised to this type of lease */
-static struct file_lock *lease_alloc(struct file *filp, int type)
+static struct file_lock *lease_alloc(struct file *filp, long type)
 {
 	struct file_lock *fl = locks_alloc_lock();
 	int error = -ENOMEM;