diff --git a/[refs] b/[refs] index 3500cff0bc79..111caa187e85 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6cfd76a26d9fe2ba54b9d496a48c1d9285e5c5ed +refs/heads/master: 70888bd5b70579e278d5ef1b7e1ec6a420d38b9e diff --git a/trunk/Documentation/filesystems/Locking b/trunk/Documentation/filesystems/Locking index eb1a6cad21e6..790ef6fbe495 100644 --- a/trunk/Documentation/filesystems/Locking +++ b/trunk/Documentation/filesystems/Locking @@ -124,7 +124,7 @@ sync_fs: no no read write_super_lockfs: ? unlockfs: ? statfs: no no no -remount_fs: no yes maybe (see below) +remount_fs: yes yes maybe (see below) clear_inode: no umount_begin: yes no no show_options: no (vfsmount->sem)