From eb6873727e689d9e439183c2c36b38b7a126425a Mon Sep 17 00:00:00 2001 From: Anton Altaparmakov Date: Tue, 4 Oct 2005 14:57:15 +0100 Subject: [PATCH] --- yaml --- r: 11964 b: refs/heads/master c: 2a6fc4e1b0f7d2ec3711d5b1782fb30f78cca765 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/ntfs/ChangeLog | 4 ++++ trunk/fs/ntfs/attrib.c | 4 +++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index c80ead3cc2b4..c75ba9e26de4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8925d4f0d3479b9c5ed7e49acc648beccca95f21 +refs/heads/master: 2a6fc4e1b0f7d2ec3711d5b1782fb30f78cca765 diff --git a/trunk/fs/ntfs/ChangeLog b/trunk/fs/ntfs/ChangeLog index 60ba3c5cb2ea..045beda82942 100644 --- a/trunk/fs/ntfs/ChangeLog +++ b/trunk/fs/ntfs/ChangeLog @@ -43,6 +43,10 @@ ToDo/Notes: reason we cannot simply read the size from the vfs inode i_size is that this is not necessarily uptodate. This happens when ntfs_attr_make_non_resident() is called in the ->truncate call path. + - Fix ntfs_attr_make_non_resident() to update the vfs inode i_blocks + which is zero for a resident attribute but should no longer be zero + once the attribute is non-resident as it then has real clusters + allocated. 2.1.24 - Lots of bug fixes and support more clean journal states. diff --git a/trunk/fs/ntfs/attrib.c b/trunk/fs/ntfs/attrib.c index 380f70a5f2e1..8821e2d088b7 100644 --- a/trunk/fs/ntfs/attrib.c +++ b/trunk/fs/ntfs/attrib.c @@ -1719,7 +1719,9 @@ int ntfs_attr_make_non_resident(ntfs_inode *ni, const u32 data_size) ffs(ni->itype.compressed.block_size) - 1; ni->itype.compressed.block_clusters = 1U << a->data.non_resident.compression_unit; - } + vi->i_blocks = ni->itype.compressed.size >> 9; + } else + vi->i_blocks = ni->allocated_size >> 9; write_unlock_irqrestore(&ni->size_lock, flags); /* * This needs to be last since the address space operations ->readpage