---

yaml --- r: 119194 b: refs/heads/master c: f945454 h: refs/heads/master v: v3
git-mirror · Nov 20, 2008 · b0b5f26 · b0b5f26
1 parent 41c70a5
commit b0b5f26
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 63eb6b93ce725e4c5f38fc85dd703d49465b03cb
+refs/heads/master: f9454548e17cd56bad081bd7d55a09b001950cbb
diff --git a/trunk/fs/namei.c b/trunk/fs/namei.c
@@ -1378,7 +1378,7 @@ static int may_delete(struct inode *dir,struct dentry *victim,int isdir)
 	if (IS_APPEND(dir))
 		return -EPERM;
 	if (check_sticky(dir, victim->d_inode)||IS_APPEND(victim->d_inode)||
-	    IS_IMMUTABLE(victim->d_inode))
+	    IS_IMMUTABLE(victim->d_inode) || IS_SWAPFILE(victim->d_inode))
 		return -EPERM;
 	if (isdir) {
 		if (!S_ISDIR(victim->d_inode->i_mode))