X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=fs%2Fnamei.c;h=d34e0f9681c6557d83852cf04646afbf9e670d98;hb=1f15a506f356aa21c29b6a7b0e9e826695273dfc;hp=09ce58e49e72bb000004851a1ea23e958b0b917d;hpb=f8aea20018aefa51bf818914c9c1ef9006353dbb;p=linux-2.6-omap-h63xx.git diff --git a/fs/namei.c b/fs/namei.c index 09ce58e49e7..d34e0f9681c 100644 --- a/fs/namei.c +++ b/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))