diff options
| author | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-11-27 23:23:52 -0500 |
|---|---|---|
| committer | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-11-27 23:23:52 -0500 |
| commit | b5a20aa2657063cbf3b47fc700603180de4bb554 (patch) | |
| tree | 9419fb851cda53a7f1fd67a3697bdf8550df19e4 /fs/namei.c | |
| parent | cc09c0dc57de7f7d2ed89d480b5653e5f6a32f2c (diff) | |
| parent | ed313489badef16d700f5a3be50e8fd8f8294bc8 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'fs/namei.c')
| -rw-r--r-- | fs/namei.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/namei.c b/fs/namei.c index 09ce58e49e72..d34e0f9681c6 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) | |||
| 1378 | if (IS_APPEND(dir)) | 1378 | if (IS_APPEND(dir)) |
| 1379 | return -EPERM; | 1379 | return -EPERM; |
| 1380 | if (check_sticky(dir, victim->d_inode)||IS_APPEND(victim->d_inode)|| | 1380 | if (check_sticky(dir, victim->d_inode)||IS_APPEND(victim->d_inode)|| |
| 1381 | IS_IMMUTABLE(victim->d_inode)) | 1381 | IS_IMMUTABLE(victim->d_inode) || IS_SWAPFILE(victim->d_inode)) |
| 1382 | return -EPERM; | 1382 | return -EPERM; |
| 1383 | if (isdir) { | 1383 | if (isdir) { |
| 1384 | if (!S_ISDIR(victim->d_inode->i_mode)) | 1384 | if (!S_ISDIR(victim->d_inode->i_mode)) |