Rename is_win32_name => d_is_win32_name

[wimlib] / src / ntfs-3g_capture.c

diff --git a/src/ntfs-3g_capture.c b/src/ntfs-3g_capture.c
index 842f539c6db2f65a546cc061daadadd785632004..0180a48898c19d0fac7974bc148b7d01de7818e0 100644 (file)
--- a/src/ntfs-3g_capture.c
+++ b/src/ntfs-3g_capture.c
@@ -398,7 +398,7 @@ out_put_actx:
 
 /* Load the security descriptor of an NTFS inode into the corresponding WIM
  * inode and the WIM image's security descriptor set.  */
 
 /* Load the security descriptor of an NTFS inode into the corresponding WIM
  * inode and the WIM image's security descriptor set.  */

-static int
+static noinline_for_stack int

 get_security_descriptor(ntfs_inode *ni, struct wim_inode *inode,
                        ntfs_volume *vol, struct wim_sd_set *sd_set)
 {
 get_security_descriptor(ntfs_inode *ni, struct wim_inode *inode,
                        ntfs_volume *vol, struct wim_sd_set *sd_set)
 {


@@ -521,14 +521,14 @@ set_dentry_dos_name(struct wim_dentry *dentry, const struct dos_name_map *map)
 {
        const struct dos_name_node *node;
 
 {
        const struct dos_name_node *node;
 

-       if (dentry->is_win32_name) {
+       if (dentry->d_is_win32_name) {

                node = lookup_dos_name(map, dentry->d_inode->i_ino);
                if (node) {
                node = lookup_dos_name(map, dentry->d_inode->i_ino);
                if (node) {

-                       dentry->short_name = utf16le_dupz(node->dos_name,
-                                                         node->name_nbytes);
-                       if (!dentry->short_name)
+                       dentry->d_short_name = utf16le_dupz(node->dos_name,
+                                                           node->name_nbytes);
+                       if (!dentry->d_short_name)

                                return WIMLIB_ERR_NOMEM;
                                return WIMLIB_ERR_NOMEM;

-                       dentry->short_name_nbytes = node->name_nbytes;
+                       dentry->d_short_name_nbytes = node->name_nbytes;

                } else {
                        WARNING("NTFS inode %"PRIu64" has Win32 name with no "
                                "corresponding DOS name",
                } else {
                        WARNING("NTFS inode %"PRIu64" has Win32 name with no "
                                "corresponding DOS name",


@@ -717,7 +717,7 @@ ntfs_3g_build_dentry_tree_recursive(struct wim_dentry **root_ret,
                goto out;
 
        if (name_type & FILE_NAME_WIN32) /* Win32 or Win32+DOS name (rather than POSIX) */
                goto out;
 
        if (name_type & FILE_NAME_WIN32) /* Win32 or Win32+DOS name (rather than POSIX) */

-               root->is_win32_name = 1;
+               root->d_is_win32_name = 1;

 
        inode = root->d_inode;
 
 
        inode = root->d_inode;