Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6: (52 commits)
  split invalidate_inodes()
  fs: skip I_FREEING inodes in writeback_sb_inodes
  fs: fold invalidate_list into invalidate_inodes
  fs: do not drop inode_lock in dispose_list
  fs: inode split IO and LRU lists
  fs: switch bdev inode bdi's correctly
  fs: fix buffer invalidation in invalidate_list
  fsnotify: use dget_parent
  smbfs: use dget_parent
  exportfs: use dget_parent
  fs: use RCU read side protection in d_validate
  fs: clean up dentry lru modification
  fs: split __shrink_dcache_sb
  fs: improve DCACHE_REFERENCED usage
  fs: use percpu counter for nr_dentry and nr_dentry_unused
  fs: simplify __d_free
  fs: take dcache_lock inside __d_path
  fs: do not assign default i_ino in new_inode
  fs: introduce a per-cpu last_ino allocator
  new helper: ihold()
  ...

2 files changed, 25 insertions, 10 deletions

diff --git a/Documentation/filesystems/Locking b/Documentation/filesystems/Locking
index 2db4283efa8d..8a817f656f0a 100644
--- a/Documentation/filesystems/Locking
+++ b/Documentation/filesystems/Locking
@@ -349,21 +349,36 @@ call this method upon the IO completion.
 
 --------------------------- block_device_operations -----------------------
 prototypes:
-        int (*open) (struct inode *, struct file *);
-        int (*release) (struct inode *, struct file *);
-        int (*ioctl) (struct inode *, struct file *, unsigned, unsigned long);
+        int (*open) (struct block_device *, fmode_t);
+        int (*release) (struct gendisk *, fmode_t);
+        int (*ioctl) (struct block_device *, fmode_t, unsigned, unsigned long);
+        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 *);
+        void (*swap_slot_free_notify) (struct block_device *, unsigned long);
 
 locking rules:
-                        BKL     bd_sem
-open:                   yes     yes
-release:                yes     yes
-ioctl:                  yes     no
+                        BKL     bd_mutex
+open:                   no      yes
+release:                no      yes
+ioctl:                  no      no
+compat_ioctl:           no      no
+direct_access:          no      no
 media_changed:          no      no
+unlock_native_capacity: no      no
 revalidate_disk:        no      no
+getgeo:                 no      no
+swap_slot_free_notify:  no      no      (see below)
+
+media_changed, 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
+held.
 
-The last two are called only from check_disk_change().
 
 --------------------------- file_operations -------------------------------
 prototypes:
diff --git a/Documentation/filesystems/sharedsubtree.txt b/Documentation/filesystems/sharedsubtree.txt
index fc0e39af43c3..4ede421c9687 100644
--- a/Documentation/filesystems/sharedsubtree.txt
+++ b/Documentation/filesystems/sharedsubtree.txt
@@ -62,10 +62,10 @@ replicas continue to be exactly same.
         # mount /dev/sd0  /tmp/a
 
         #ls /tmp/a
-        t1 t2 t2
+        t1 t2 t3
 
         #ls /mnt/a
-        t1 t2 t2
+        t1 t2 t3
 
         Note that the mount has propagated to the mount at /mnt as well.