NTFS: Fix stupid bug in fs/ntfs/attrib.c::ntfs_attr_reinit_search_ctx() where

      we did not clear ctx->al_entry but it was still set due to changes in
      ntfs_attr_lookup() and ntfs_external_attr_find() in particular.

Signed-off-by: Anton Altaparmakov <aia21@cantab.net>

diff --git a/Documentation/filesystems/ntfs.txt b/Documentation/filesystems/ntfs.txt
index 680b299b9fe19b332ca51c950e1bf8c7e29f1577..6707050bd6ff0474c881321133e908bef158460f 100644 (file)
--- a/Documentation/filesystems/ntfs.txt
+++ b/Documentation/filesystems/ntfs.txt
@@ -277,6 +277,8 @@ ChangeLog
 
 Note, a technical ChangeLog aimed at kernel hackers is in fs/ntfs/ChangeLog.
 
+2.1.20:
+       - Fix a stupid bug introduced in 2.1.18 release.
 2.1.19:
        - Minor bugfix in handling of the default upcase table.
        - Many internal cleanups and improvements.  Many thanks to Linus

diff --git a/fs/ntfs/ChangeLog b/fs/ntfs/ChangeLog
index c175cf4f21a3e82a784e0223c62d5715d3931c9a..eca9bad72fa4df3c10f7cba8dc04f9f96457cebf 100644 (file)
--- a/fs/ntfs/ChangeLog
+++ b/fs/ntfs/ChangeLog
@@ -21,6 +21,13 @@ ToDo/Notes:
        - Enable the code for setting the NT4 compatibility flag when we start
          making NTFS 1.2 specific modifications.
 
+2.1.20 - Fix a stupid bug in ntfs_attr_reinit_search_ctx().
+
+       - Fix stupid bug in fs/ntfs/attrib.c::ntfs_attr_reinit_search_ctx()
+         where we did not clear ctx->al_entry but it was still set due to
+         changes in ntfs_attr_lookup() and ntfs_external_attr_find() in
+         particular.
+
 2.1.19 - Many cleanups, improvements, and a minor bug fix.
 
        - Update ->setattr (fs/ntfs/inode.c::ntfs_setattr()) to refuse to

diff --git a/fs/ntfs/Makefile b/fs/ntfs/Makefile
index 47de3a5da04169b404972c89aaf6d16b55b00d33..28e8ac163037ca9a67d1a810e19b3eb972f5c3d1 100644 (file)
--- a/fs/ntfs/Makefile
+++ b/fs/ntfs/Makefile
@@ -6,7 +6,7 @@ ntfs-objs := aops.o attrib.o collate.o compress.o debug.o dir.o file.o \
             index.o inode.o mft.o mst.o namei.o super.o sysctl.o unistr.o \
             upcase.o
 
-EXTRA_CFLAGS = -DNTFS_VERSION=\"2.1.19\"
+EXTRA_CFLAGS = -DNTFS_VERSION=\"2.1.20\"
 
 ifeq ($(CONFIG_NTFS_DEBUG),y)
 EXTRA_CFLAGS += -DDEBUG

diff --git a/fs/ntfs/attrib.c b/fs/ntfs/attrib.c
index 732bfb6cc3c314a89dc527510dc3c569c325c4b6..8168429b5cf5c8ead898843b4aa20c038ce6e8cb 100644 (file)
--- a/fs/ntfs/attrib.c
+++ b/fs/ntfs/attrib.c
@@ -1861,6 +1861,11 @@ void ntfs_attr_reinit_search_ctx(ntfs_attr_search_ctx *ctx)
                /* Sanity checks are performed elsewhere. */
                ctx->attr = (ATTR_RECORD*)((u8*)ctx->mrec +
                                le16_to_cpu(ctx->mrec->attrs_offset));
+               /*
+                * This needs resetting due to ntfs_external_attr_find() which
+                * can leave it set despite having zeroed ctx->base_ntfs_ino.
+                */
+               ctx->al_entry = NULL;
                return;
        } /* Attribute list. */
        if (ctx->ntfs_ino != ctx->base_ntfs_ino)