/* Initialize as for dx_probe */
hinfo.hash_version = dx_info->hash_version;
-@@ -1876,7 +2476,7 @@ static int make_indexed_dir(handle_t *ha
+@@ -1876,14 +2476,14 @@ static int make_indexed_dir(handle_t *ha
}
- dx_release(frames);
-- retval = add_dirent_to_buf(handle, fname, dir, inode, de, bh);
-+ retval = add_dirent_to_buf(handle, fname, dir, inode, de, bh, dentry);
+- retval = add_dirent_to_buf(handle, fname, dir, inode, de, bh2);
++ retval = add_dirent_to_buf(handle, fname, dir, inode, de, bh2, dentry);
+ out_frames:
+ /*
+ * Even if the block split failed, we have to properly write
+ * out all the changes we did so far. Otherwise we can end up
+ * with corrupted filesystem.
+ */
+ if (retval)
+ ext4_mark_inode_dirty(handle, dir);
+ dx_release(frames);
brelse(bh);
return retval;
- out_frames:
@@ -1909,6 +1949,8 @@ static int ext4_update_dotdot(handle_t *
struct buffer_head * dir_block;
struct ext4_dir_entry_2 * de;
err = ext4_handle_dirty_dirent_node(handle, dir, bh2);
if (err)
goto journal_error;
-@@ -1945,7 +2283,7 @@ static int make_indexed_dir(handle_t *ha
- ext4_handle_dirty_dx_node(handle, dir, frame->bh);
- ext4_handle_dirty_dirent_node(handle, dir, bh);
+@@ -1945,9 +2283,9 @@ static int make_indexed_dir(handle_t *ha
+ retval = ext4_handle_dirty_dirent_node(handle, dir, bh2);
+ if (retval)
+ goto out_frames;
-- de = do_split(handle,dir, &bh, frame, &fname->hinfo);
-+ de = do_split(handle, dir, &bh, frames, frame, &fname->hinfo, NULL);
+- de = do_split(handle,dir, &bh2, frame, &fname->hinfo);
++ de = do_split(handle, dir, &bh2, frames, frame, &fname->hinfo, NULL);
if (IS_ERR(de)) {
- /*
- * Even if the block split failed, we have to properly write
+ retval = PTR_ERR(de);
+ goto out_frames;
+ }
@@ -2051,8 +2389,8 @@ out:
* may not sleep between calling this and putting something into
* the entry, as someone else might have used it while you slept.
3.0.101-0.47.71 (SLES11 SP3)
3.0.101-91 (SLES11 SP4)
3.12.67-60.64.24 (SLES12 SP1)
- 4.4.21-84 (SLES12 SP2)
+ 4.4.38-93 (SLES12 SP2)
vanilla linux 4.5.7 (ZFS only)
* Client known to build on unpatched kernels:
2.6.32-431.29.2.el6 (RHEL6.5)
3.0.101-0.47.71 (SLES11 SP3)
3.0.101-91 (SLES11 SP4)
3.12.67-60.64.24 (SLES12 SP1)
- 4.4.21-84 (SLES12 SP2)
+ 4.4.38-93 (SLES12 SP2)
vanilla linux 4.5.7
* Recommended e2fsprogs version: 1.42.13.wc4 or newer
* Recommended ZFS / SPL version: 0.6.5.7
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.4.21 Kernel Configuration
+# Linux/x86 4.4.38 Kernel Configuration
#
CONFIG_64BIT=y
CONFIG_X86_64=y
CONFIG_INIT_ENV_ARG_LIMIT=32
CONFIG_CROSS_COMPILE=""
# CONFIG_COMPILE_TEST is not set
-CONFIG_LOCALVERSION="-84-default"
+CONFIG_LOCALVERSION="-93-default"
# CONFIG_LOCALVERSION_AUTO is not set
CONFIG_HAVE_KERNEL_GZIP=y
CONFIG_HAVE_KERNEL_BZIP2=y
# I2C system bus drivers (mostly embedded / system-on-chip)
#
# CONFIG_I2C_CBUS_GPIO is not set
-# CONFIG_I2C_DESIGNWARE_PLATFORM is not set
+CONFIG_I2C_DESIGNWARE_CORE=m
+CONFIG_I2C_DESIGNWARE_PLATFORM=m
# CONFIG_I2C_DESIGNWARE_PCI is not set
+CONFIG_I2C_DESIGNWARE_BAYTRAIL=y
# CONFIG_I2C_EMEV2 is not set
# CONFIG_I2C_GPIO is not set
# CONFIG_I2C_OCORES is not set
CONFIG_SND_SST_IPC=m
CONFIG_SND_SST_IPC_ACPI=m
CONFIG_SND_SOC_INTEL_SST=m
+CONFIG_SND_SOC_INTEL_SST_FIRMWARE=m
CONFIG_SND_SOC_INTEL_SST_ACPI=m
+CONFIG_SND_SOC_INTEL_SST_MATCH=m
CONFIG_SND_SOC_INTEL_BAYTRAIL=m
+# CONFIG_SND_SOC_INTEL_HASWELL_MACH is not set
CONFIG_SND_SOC_INTEL_BYT_RT5640_MACH=m
CONFIG_SND_SOC_INTEL_BYT_MAX98090_MACH=m
CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH=m
lnxmaj="4.4"
-lnxmin=".21"
-lnxrel="84"
+lnxmin=".38"
+lnxrel="93"
# use this when there is an "RPM fix" which means that the name of the
# (source) RPM has been updated but the version of the kernel inside the
# RPM is not also updated
3.0-sles11sp3.series 3.0.101-0.47.71 (SLES11 SP3)
3.0-sles11sp3.series 3.0.101-91 (SLES11 SP4)
3.12-sles12.series 3.12.67-60.64.24 (SLES12 SP1)
-4.4-sles12.series 4.4.21-84 (SLES12 SP2)
+4.4-sles12.series 4.4.38-93 (SLES12 SP2)
See lustre/ChangeLog for supported client kernel versions.