---

yaml --- r: 233637 b: refs/heads/master c: bf9faa2 h: refs/heads/master i: 233635: 0aef3c8 v: v3
git-mirror · Feb 24, 2011 · 3089ab0 · 3089ab0
1 parent eeca020
commit 3089ab0
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a3e8cc643d22d2c8ed36b9be7d9c9ca21efcf7f7
+refs/heads/master: bf9faa2aa30e2ebf30287536712ed2717bb47002
diff --git a/trunk/fs/namespace.c b/trunk/fs/namespace.c
@@ -1244,7 +1244,7 @@ static int do_umount(struct vfsmount *mnt, int flags)
 		 */
 		br_write_lock(vfsmount_lock);
 		if (mnt_get_count(mnt) != 2) {
-			br_write_lock(vfsmount_lock);
+			br_write_unlock(vfsmount_lock);
 			return -EBUSY;
 		}
 		br_write_unlock(vfsmount_lock);

diff --git a/trunk/mm/mremap.c b/trunk/mm/mremap.c
@@ -94,7 +94,9 @@ static void move_ptes(struct vm_area_struct *vma, pmd_t *old_pmd,
 		 */
 		mapping = vma->vm_file->f_mapping;
 		spin_lock(&mapping->i_mmap_lock);
-		new_vma->vm_truncate_count = 0;
+		if (new_vma->vm_truncate_count &&
+		    new_vma->vm_truncate_count != vma->vm_truncate_count)
+			new_vma->vm_truncate_count = 0;
 	}
 
 	/*