[EXT2] Upgrade to 0.69

[reactos.git] / drivers / filesystems / ext2 / src / fileinfo.c

diff --git a/drivers/filesystems/ext2/src/fileinfo.c b/drivers/filesystems/ext2/src/fileinfo.c
index cfc016b..a9aeb89 100644 (file)
--- a/drivers/filesystems/ext2/src/fileinfo.c
+++ b/drivers/filesystems/ext2/src/fileinfo.c
@@ -11,6 +11,7 @@
 
 #include "ext2fs.h"
 #include <linux/ext4.h>
+#include "linux/ext4_xattr.h"
 
 /* GLOBALS ***************************************************************/
 
@@ -29,6 +30,15 @@ extern PEXT2_GLOBAL Ext2Global;
 #pragma alloc_text(PAGE, Ext2DeleteFile)
 #endif
 
+static int Ext2IterateAllEa(struct ext4_xattr_ref *xattr_ref, struct ext4_xattr_item *item, BOOL is_last)
+{
+    PULONG EaSize = xattr_ref->iter_arg;
+    ULONG EaEntrySize = 4 + 1 + 1 + 2 + item->name_len + 1 + item->data_size;
+
+    *EaSize += EaEntrySize - 4;
+    return EXT4_XATTR_ITERATE_CONT;
+}
+
 NTSTATUS
 Ext2QueryFileInformation (IN PEXT2_IRP_CONTEXT IrpContext)
 {
@@ -205,6 +215,7 @@ Ext2QueryFileInformation (IN PEXT2_IRP_CONTEXT IrpContext)
 
         case FileEaInformation:
         {
+            struct ext4_xattr_ref xattr_ref;
             PFILE_EA_INFORMATION FileEaInformation;
 
             if (Length < sizeof(FILE_EA_INFORMATION)) {
@@ -213,10 +224,19 @@ Ext2QueryFileInformation (IN PEXT2_IRP_CONTEXT IrpContext)
             }
 
             FileEaInformation = (PFILE_EA_INFORMATION) Buffer;
-
-            // Romfs doesn't have any extended attributes
             FileEaInformation->EaSize = 0;
 
+            Status = Ext2WinntError(ext4_fs_get_xattr_ref(IrpContext, Vcb, Fcb->Mcb, &xattr_ref));
+            if (!NT_SUCCESS(Status))
+                _SEH2_LEAVE;
+
+            xattr_ref.iter_arg = &FileEaInformation->EaSize;
+            ext4_fs_xattr_iterate(&xattr_ref, Ext2IterateAllEa);
+            ext4_fs_put_xattr_ref(&xattr_ref);
+
+            if (FileEaInformation->EaSize)
+                FileEaInformation->EaSize += 4;
+
             Irp->IoStatus.Information = sizeof(FILE_EA_INFORMATION);
             Status = STATUS_SUCCESS;
         }
@@ -1936,12 +1956,14 @@ Ext2DeleteFile(
         ExAcquireResourceExclusiveLite(&Vcb->FcbLock, TRUE);
         bFcbLockAcquired = TRUE;
 
-        if (!(Dcb = Mcb->Parent->Fcb)) {
-            Dcb = Ext2AllocateFcb(Vcb, Mcb->Parent);
+        /* Mcb->Parent could be NULL when working with layered file systems */
+        if (Mcb->Parent) {
+            Dcb = Mcb->Parent->Fcb;
+            if (!Dcb)
+                Dcb = Ext2AllocateFcb(Vcb, Mcb->Parent);
         }
-        if (Dcb) {
+        if (Dcb)
             Ext2ReferXcb(&Dcb->ReferenceCount);
-        }
 
         if (bFcbLockAcquired) {
             ExReleaseResourceLite(&Vcb->FcbLock);