---

yaml --- r: 153646 b: refs/heads/master c: a9e61e2 h: refs/heads/master v: v3
git-mirror · Apr 24, 2009 · 8955cf1 · 8955cf1
1 parent 7959556
commit 8955cf1
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 80492e7d49bee0a280a84a39075a7857b92836b2
+refs/heads/master: a9e61e25f9d2e7e43bf17625f5cb56c9e0a89b17
diff --git a/trunk/fs/lockd/svclock.c b/trunk/fs/lockd/svclock.c
@@ -326,6 +326,8 @@ static void nlmsvc_freegrantargs(struct nlm_rqst *call)
 {
 	if (call->a_args.lock.oh.data != call->a_owner)
 		kfree(call->a_args.lock.oh.data);
+
+	locks_release_private(&call->a_args.lock.fl);
 }
 
 /*

diff --git a/trunk/fs/locks.c b/trunk/fs/locks.c
@@ -151,7 +151,7 @@ static struct file_lock *locks_alloc_lock(void)
 	return kmem_cache_alloc(filelock_cache, GFP_KERNEL);
 }
 
-static void locks_release_private(struct file_lock *fl)
+void locks_release_private(struct file_lock *fl)
 {
 	if (fl->fl_ops) {
 		if (fl->fl_ops->fl_release_private)
@@ -165,6 +165,7 @@ static void locks_release_private(struct file_lock *fl)
 	}
 
 }
+EXPORT_SYMBOL_GPL(locks_release_private);
 
 /* Free a lock which is not in use. */
 static void locks_free_lock(struct file_lock *fl)

diff --git a/trunk/include/linux/fs.h b/trunk/include/linux/fs.h
@@ -1108,6 +1108,7 @@ extern void locks_copy_lock(struct file_lock *, struct file_lock *);
 extern void __locks_copy_lock(struct file_lock *, const struct file_lock *);
 extern void locks_remove_posix(struct file *, fl_owner_t);
 extern void locks_remove_flock(struct file *);
+extern void locks_release_private(struct file_lock *);
 extern void posix_test_lock(struct file *, struct file_lock *);
 extern int posix_lock_file(struct file *, struct file_lock *, struct file_lock *);
 extern int posix_lock_file_wait(struct file *, struct file_lock *);
-Original file line number
+Diff line change
@@ Expand Up / @@ -326,6 +326,8 @@ static void nlmsvc_freegrantargs(struct nlm_rqst *call) @@
     {
     	if (call->a_args.lock.oh.data != call->a_owner)
     		kfree(call->a_args.lock.oh.data);
+    	locks_release_private(&call->a_args.lock.fl);
     }
     /*
@@ Expand Down @@