diff --git a/[refs] b/[refs]
index bb3b326c18ff..ee6a20081db5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eb35cf60e462491249166182e3e755d3d5d91a28
+refs/heads/master: 9cedc194a7735e5d74ad26d3825247dc65a4d98e
diff --git a/trunk/fs/locks.c b/trunk/fs/locks.c
index 6f99c0a6f836..ab61a8b54829 100644
--- a/trunk/fs/locks.c
+++ b/trunk/fs/locks.c
@@ -755,6 +755,7 @@ static int flock_lock_file(struct file *filp, struct file_lock *request)
 	if (request->fl_type == F_UNLCK)
 		goto out;
 
+	error = -ENOMEM;
 	new_fl = locks_alloc_lock();
 	if (new_fl == NULL)
 		goto out;
@@ -781,6 +782,7 @@ static int flock_lock_file(struct file *filp, struct file_lock *request)
 	locks_copy_lock(new_fl, request);
 	locks_insert_lock(&inode->i_flock, new_fl);
 	new_fl = NULL;
+	error = 0;
 
 out:
 	unlock_kernel();