mm: memcg: prepare for byte-sized vmstat items

[linux-2.6-microblaze.git] / Documentation / filesystems / locking.rst

diff --git a/Documentation/filesystems/locking.rst b/Documentation/filesystems/locking.rst
index 318605d..64f94a1 100644 (file)
--- a/Documentation/filesystems/locking.rst
+++ b/Documentation/filesystems/locking.rst
@@ -433,15 +433,15 @@ prototypes::
 
 locking rules:
 
-==========             =============   =================       =========
+====================== =============   =================       =========
 ops                    inode->i_lock   blocked_lock_lock       may block
-==========             =============   =================       =========
+====================== =============   =================       =========
 lm_notify:             yes             yes                     no
 lm_grant:              no              no                      no
 lm_break:              yes             no                      no
 lm_change              yes             no                      no
 lm_breaker_owns_lease: no              no                      no
-==========             =============   =================       =========
+====================== =============   =================       =========
 
 buffer_head
 ===========
@@ -467,7 +467,6 @@ prototypes::
        int (*compat_ioctl) (struct block_device *, fmode_t, unsigned, unsigned long);
        int (*direct_access) (struct block_device *, sector_t, void **,
                                unsigned long *);
-       int (*media_changed) (struct gendisk *);
        void (*unlock_native_capacity) (struct gendisk *);
        int (*revalidate_disk) (struct gendisk *);
        int (*getgeo)(struct block_device *, struct hd_geometry *);
@@ -483,14 +482,13 @@ release:          yes
 ioctl:                 no
 compat_ioctl:          no
 direct_access:         no
-media_changed:         no
 unlock_native_capacity:        no
 revalidate_disk:       no
 getgeo:                        no
 swap_slot_free_notify: no      (see below)
 ======================= ===================
 
-media_changed, unlock_native_capacity and revalidate_disk are called only from
+unlock_native_capacity and revalidate_disk are called only from
 check_disk_change().
 
 swap_slot_free_notify is called with swap_lock and sometimes the page lock
@@ -616,9 +614,9 @@ prototypes::
 
 locking rules:
 
-=============  ========        ===========================
+=============  =========       ===========================
 ops            mmap_lock       PageLocked(page)
-=============  ========        ===========================
+=============  =========       ===========================
 open:          yes
 close:         yes
 fault:         yes             can return with page locked
@@ -626,7 +624,7 @@ map_pages:  yes
 page_mkwrite:  yes             can return with page locked
 pfn_mkwrite:   yes
 access:                yes
-=============  ========        ===========================
+=============  =========       ===========================
 
 ->fault() is called when a previously not present pte is about
 to be faulted in. The filesystem must find and return the page associated