This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / Documentation / filesystems / Locking

diff --git a/Documentation/filesystems/Locking b/Documentation/filesystems/Locking
index 570ef5d..f1c2cee 100644 (file)
--- a/Documentation/filesystems/Locking
+++ b/Documentation/filesystems/Locking
@@ -295,19 +295,13 @@ fl_release_private:       yes     yes
 prototypes:
        int (*fl_compare_owner)(struct file_lock *, struct file_lock *);
        void (*fl_notify)(struct file_lock *);  /* unblock callback */
-       void (*fl_copy_lock)(struct file_lock *, struct file_lock *);
-       void (*fl_release_private)(struct file_lock *);
-       void (*fl_break)(struct file_lock *); /* break_lease callback */
 
 locking rules:
                        BKL     may block
 fl_compare_owner:      yes     no
 fl_notify:             yes     no
-fl_copy_lock:          yes     no
-fl_release_private:    yes     yes
-fl_break:              yes     no
 
-       Currently only NFSD and NLM provide instances of this class. None of the
+       Currently only NLM provides instances of this class. None of the
 them block. If you have out-of-tree instances - please, show up. Locking
 in that area will change.
 --------------------------- buffer_head -----------------------------------
@@ -317,8 +311,8 @@ prototypes:
 locking rules:
        called from interrupts. In other words, extreme care is needed here.
 bh is locked, but that's all warranties we have here. Currently only RAID1,
-highmem, fs/buffer.c, and fs/ntfs/aops.c are providing these. Block devices
-call this method upon the IO completion.
+highmem and fs/buffer.c are providing these. Block devices call this method
+upon the IO completion.
 
 --------------------------- block_device_operations -----------------------
 prototypes: