Merge branch 'for-2.6.37/drivers' into for-linus

[net-next-2.6.git] / fs / locks.c

diff --git a/fs/locks.c b/fs/locks.c
index a2ab790471b5d773862941ef18f850cd9728e600..65765cb6afedaee442c1e1ab21bf7269ce9b07c7 100644 (file)
--- a/fs/locks.c
+++ b/fs/locks.c
@@ -235,11 +235,8 @@ static void locks_copy_private(struct file_lock *new, struct file_lock *fl)
                        fl->fl_ops->fl_copy_lock(new, fl);
                new->fl_ops = fl->fl_ops;
        }
-       if (fl->fl_lmops) {
-               if (fl->fl_lmops->fl_copy_lock)
-                       fl->fl_lmops->fl_copy_lock(new, fl);
+       if (fl->fl_lmops)
                new->fl_lmops = fl->fl_lmops;
-       }
 }
 
 /*