diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-04-02 18:22:11 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-04-02 18:22:11 -0400 |
| commit | cd02938a828f4b2098a074afb7454f106f2e8df5 (patch) | |
| tree | 7b543fd6aa82a62dc3a9614c26f89daca83e77d5 /fs/ntfs/inode.c | |
| parent | 9d681f3a1b27fdfc17ea251cf8d5f627dab34670 (diff) | |
| parent | 172ef275444efa12d834fb9d1b1acdac92db47f7 (diff) | |
Merge branch 'smsc911x-armplatforms' of git://github.com/steveglen/linux-2.6
Diffstat (limited to 'fs/ntfs/inode.c')
| -rw-r--r-- | fs/ntfs/inode.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/ntfs/inode.c b/fs/ntfs/inode.c index 86bef156cf0a..82c5085559c6 100644 --- a/fs/ntfs/inode.c +++ b/fs/ntfs/inode.c | |||
| @@ -1975,8 +1975,7 @@ int ntfs_read_inode_mount(struct inode *vi) | |||
| 1975 | goto em_put_err_out; | 1975 | goto em_put_err_out; |
| 1976 | next_al_entry = (ATTR_LIST_ENTRY*)((u8*)al_entry + | 1976 | next_al_entry = (ATTR_LIST_ENTRY*)((u8*)al_entry + |
| 1977 | le16_to_cpu(al_entry->length)); | 1977 | le16_to_cpu(al_entry->length)); |
| 1978 | if (le32_to_cpu(al_entry->type) > | 1978 | if (le32_to_cpu(al_entry->type) > le32_to_cpu(AT_DATA)) |
| 1979 | const_le32_to_cpu(AT_DATA)) | ||
| 1980 | goto em_put_err_out; | 1979 | goto em_put_err_out; |
| 1981 | if (AT_DATA != al_entry->type) | 1980 | if (AT_DATA != al_entry->type) |
| 1982 | continue; | 1981 | continue; |