1 files changed, 25 insertions, 18 deletions

diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c
index 931368a385c8..d631cad0aeee 100644
--- a/fs/gfs2/glock.c
+++ b/fs/gfs2/glock.c
@@ -1106,24 +1106,31 @@ static void add_to_queue(struct gfs2_holder *gh)
         if (test_and_set_bit(HIF_WAIT, &gh->gh_iflags))
                 BUG();
 
-        existing = find_holder_by_owner(&gl->gl_holders, gh->gh_owner_pid);
-        if (existing) {
-                print_symbol(KERN_WARNING "original: %s\n", existing->gh_ip);
-                printk(KERN_INFO "pid : %d\n", existing->gh_owner_pid);
-                printk(KERN_INFO "lock type : %d lock state : %d\n",
-                                existing->gh_gl->gl_name.ln_type, existing->gh_gl->gl_state);
-                print_symbol(KERN_WARNING "new: %s\n", gh->gh_ip);
-                printk(KERN_INFO "pid : %d\n", gh->gh_owner_pid);
-                printk(KERN_INFO "lock type : %d lock state : %d\n",
-                                gl->gl_name.ln_type, gl->gl_state);
-                BUG();
-        }
-
-        existing = find_holder_by_owner(&gl->gl_waiters3, gh->gh_owner_pid);
-        if (existing) {
-                print_symbol(KERN_WARNING "original: %s\n", existing->gh_ip);
-                print_symbol(KERN_WARNING "new: %s\n", gh->gh_ip);
-                BUG();
+        if (!(gh->gh_flags & GL_FLOCK)) {
+                existing = find_holder_by_owner(&gl->gl_holders, 
+                                                gh->gh_owner_pid);
+                if (existing) {
+                        print_symbol(KERN_WARNING "original: %s\n", 
+                                     existing->gh_ip);
+                        printk(KERN_INFO "pid : %d\n", existing->gh_owner_pid);
+                        printk(KERN_INFO "lock type : %d lock state : %d\n",
+                               existing->gh_gl->gl_name.ln_type, 
+                               existing->gh_gl->gl_state);
+                        print_symbol(KERN_WARNING "new: %s\n", gh->gh_ip);
+                        printk(KERN_INFO "pid : %d\n", gh->gh_owner_pid);
+                        printk(KERN_INFO "lock type : %d lock state : %d\n",
+                               gl->gl_name.ln_type, gl->gl_state);
+                        BUG();
+                }
+                
+                existing = find_holder_by_owner(&gl->gl_waiters3, 
+                                                gh->gh_owner_pid);
+                if (existing) {
+                        print_symbol(KERN_WARNING "original: %s\n", 
+                                     existing->gh_ip);
+                        print_symbol(KERN_WARNING "new: %s\n", gh->gh_ip);
+                        BUG();
+                }
         }
 
         if (gh->gh_flags & LM_FLAG_PRIORITY)