patch-2.4.0-test8 linux/fs/locks.c

• Lines: 40
• Date: Tue Aug 29 12:41:12 2000
• Orig file: v2.4.0-test7/linux/fs/locks.c
• Orig date: Wed Aug 23 18:36:38 2000

diff -u --recursive --new-file v2.4.0-test7/linux/fs/locks.c linux/fs/locks.c
@@ -1040,17 +1040,12 @@
 	 */
 	if (IS_MANDLOCK(inode) &&
 	    (inode->i_mode & (S_ISGID | S_IXGRP)) == S_ISGID) {
-		struct vm_area_struct *vma;
 		struct address_space *mapping = inode->i_mapping;
-		spin_lock(&mapping->i_shared_lock);
-		for(vma = mapping->i_mmap;vma;vma = vma->vm_next_share) {
-			if (!(vma->vm_flags & VM_MAYSHARE))
-				continue;
-			spin_unlock(&mapping->i_shared_lock);
+
+		if (mapping->i_mmap_shared != NULL) {
 			error = -EAGAIN;
 			goto out_putf;
 		}
-		spin_unlock(&mapping->i_shared_lock);
 	}
 
 	error = -EINVAL;
@@ -1199,17 +1194,12 @@
 	 */
 	if (IS_MANDLOCK(inode) &&
 	    (inode->i_mode & (S_ISGID | S_IXGRP)) == S_ISGID) {
-		struct vm_area_struct *vma;
 		struct address_space *mapping = inode->i_mapping;
-		spin_lock(&mapping->i_shared_lock);
-		for(vma = mapping->i_mmap;vma;vma = vma->vm_next_share) {
-			if (!(vma->vm_flags & VM_MAYSHARE))
-				continue;
-			spin_unlock(&mapping->i_shared_lock);
+
+		if (mapping->i_mmap_shared != NULL) {
 			error = -EAGAIN;
 			goto out_putf;
 		}
-		spin_unlock(&mapping->i_shared_lock);
 	}
 
 	error = -EINVAL;