aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--fs/ntfs/ChangeLog2
-rw-r--r--fs/ntfs/attrib.c7
2 files changed, 6 insertions, 3 deletions
diff --git a/fs/ntfs/ChangeLog b/fs/ntfs/ChangeLog
index cd348f0b90e5..868871cb9c6e 100644
--- a/fs/ntfs/ChangeLog
+++ b/fs/ntfs/ChangeLog
@@ -88,6 +88,8 @@ ToDo/Notes:
88 checked and set in the ntfs inode as done for compressed files and 88 checked and set in the ntfs inode as done for compressed files and
89 the compressed size needs to be used for vfs inode->i_blocks instead 89 the compressed size needs to be used for vfs inode->i_blocks instead
90 of the allocated size, again, as done for compressed files. 90 of the allocated size, again, as done for compressed files.
91 - Add AT_EA in addition to AT_DATA to whitelist for being allowed to
92 be non-resident in fs/ntfs/attrib.c::ntfs_attr_can_be_non_resident().
91 93
922.1.22 - Many bug and race fixes and error handling improvements. 942.1.22 - Many bug and race fixes and error handling improvements.
93 95
diff --git a/fs/ntfs/attrib.c b/fs/ntfs/attrib.c
index 7a16f7ca76d8..fa464fce2261 100644
--- a/fs/ntfs/attrib.c
+++ b/fs/ntfs/attrib.c
@@ -1049,10 +1049,11 @@ int ntfs_attr_can_be_non_resident(const ntfs_volume *vol, const ATTR_TYPE type)
1049 ATTR_DEF *ad; 1049 ATTR_DEF *ad;
1050 1050
1051 /* 1051 /*
1052 * $DATA is always allowed to be non-resident even if $AttrDef does not 1052 * $DATA and $EA are always allowed to be non-resident even if $AttrDef
1053 * specify this in the flags of the $DATA attribute definition record. 1053 * does not specify this in the flags of the $DATA attribute definition
1054 * record.
1054 */ 1055 */
1055 if (type == AT_DATA) 1056 if (type == AT_DATA || type == AT_EA)
1056 return 0; 1057 return 0;
1057 /* Find the attribute definition record in $AttrDef. */ 1058 /* Find the attribute definition record in $AttrDef. */
1058 ad = ntfs_attr_find_in_attrdef(vol, type); 1059 ad = ntfs_attr_find_in_attrdef(vol, type);