summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@infradead.org>2010-10-31 08:35:31 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2010-10-31 06:35:15 -0700
commitbb8430a2c8fe2b726033017daadf73c69b0348ea (patch)
treefeb6063cab812816bc67bca4e509995b5ad9217d /fs
parent51ee4b84f5c86935b438d6636f34b523edb415a8 (diff)
downloadop-kernel-dev-bb8430a2c8fe2b726033017daadf73c69b0348ea.zip
op-kernel-dev-bb8430a2c8fe2b726033017daadf73c69b0348ea.tar.gz
locks: remove fl_copy_lock lock_manager operation
This one was only used for a nasty hack in nfsd, which has recently been removed. Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/locks.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/fs/locks.c b/fs/locks.c
index a2ab790..65765cb 100644
--- 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;
- }
}
/*
OpenPOWER on IntegriCloud