diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2005-09-19 09:38:41 +0100 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2005-09-19 09:38:41 +0100 |
| commit | 4e64c88693fde1b1cbaa4cfecad43a0c3fad354e (patch) | |
| tree | 6b616e513560d6064a30a3e235db22acc61b6efc /fs/ntfs | |
| parent | 5c9f6de3b80ca46000bd1b63d892820f9ee32138 (diff) | |
| download | linux-stable-4e64c88693fde1b1cbaa4cfecad43a0c3fad354e.tar.gz linux-stable-4e64c88693fde1b1cbaa4cfecad43a0c3fad354e.tar.bz2 linux-stable-4e64c88693fde1b1cbaa4cfecad43a0c3fad354e.zip | |
NTFS: Fix handling of compressed directories that I broke in earlier changeset.
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
Diffstat (limited to 'fs/ntfs')
| -rw-r--r-- | fs/ntfs/aops.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/fs/ntfs/aops.c b/fs/ntfs/aops.c index b6cc8cf24626..5fd516f42eec 100644 --- a/fs/ntfs/aops.c +++ b/fs/ntfs/aops.c @@ -389,9 +389,11 @@ retry_readpage: * Only $DATA attributes can be encrypted and only unnamed $DATA * attributes can be compressed. Index root can have the flags set but * this means to create compressed/encrypted files, not that the - * attribute is compressed/encrypted. + * attribute is compressed/encrypted. Note we need to check for + * AT_INDEX_ALLOCATION since this is the type of both directory and + * index inodes. */ - if (ni->type != AT_INDEX_ROOT) { + if (ni->type != AT_INDEX_ALLOCATION) { /* If attribute is encrypted, deny access, just like NT4. */ if (NInoEncrypted(ni)) { BUG_ON(ni->type != AT_DATA); @@ -1341,9 +1343,11 @@ retry_writepage: * Only $DATA attributes can be encrypted and only unnamed $DATA * attributes can be compressed. Index root can have the flags set but * this means to create compressed/encrypted files, not that the - * attribute is compressed/encrypted. + * attribute is compressed/encrypted. Note we need to check for + * AT_INDEX_ALLOCATION since this is the type of both directory and + * index inodes. */ - if (ni->type != AT_INDEX_ROOT) { + if (ni->type != AT_INDEX_ALLOCATION) { /* If file is encrypted, deny access, just like NT4. */ if (NInoEncrypted(ni)) { unlock_page(page); |