LU-3889 osc: Allow lock to be canceled at ENQ time

[fs/lustre-release.git] / ldiskfs / kernel_patches / series / ldiskfs-2.6-rhel6.series

diff --git a/ldiskfs/kernel_patches/series/ldiskfs-2.6-rhel6.series b/ldiskfs/kernel_patches/series/ldiskfs-2.6-rhel6.series
index e051972..4f85148 100644 (file)
--- a/ldiskfs/kernel_patches/series/ldiskfs-2.6-rhel6.series
+++ b/ldiskfs/kernel_patches/series/ldiskfs-2.6-rhel6.series
@@ -1,3 +1,7 @@
+rhel6.3/ext4-use-vzalloc-in-ext4_fill_flex_info.patch
+rhel6.3/ext4-introduce-ext4_kvmalloc-ext4_kzalloc-and-ext4_kvfree.patch
+rhel6.3/ext4-add-missing-kfree-on-error-return-path-in-add_new_gdb.patch
+rhel6.3/ext4-use-ext4_kvzalloc-ext4_kvmalloc-for-s_group_desc-and-s_group_info.patch
 rhel6.3/ext4-wantedi-2.6.patch
 rhel6.3/ext4-map_inode_page-2.6.18.patch
 rhel6.3/export-ext4-2.6.patch
@@ -7,7 +11,6 @@ sles11sp1/ext4-ext_generation.patch
 rhel6.3/ext4-inode-version.patch
 rhel6.3/ext4-mmp.patch
 rhel6.3/ext4-lookup-dotdot.patch
-rhel6.3/ext4-max-dir-size.patch
 rhel6.3/ext4-print-inum-in-htree-warning.patch
 rhel6.3/ext4-xattr-no-update-ctime.patch
 rhel6.3/ext4-prealloc.patch
@@ -20,24 +23,26 @@ rhel6.3/ext4-pdir-fix.patch
 rhel6.3/ext4-add-more-error-checks-to-ext4_mkdir.patch
 rhel6.3/ext4-osd-iop-common.patch
 rhel6.3/ext4-osd-iam-exports.patch
-rhel6.3/ext4-dynlocks-common.patch
 rhel6.3/ext4-hash-indexed-dir-dotdot-update.patch
 rhel6.3/ext4-kill-dx_root.patch
 rhel6.3/ext4-extents-mount-option.patch
 rhel6.3/ext4-fiemap-2.6.patch
 rhel6.3/ext4-mballoc-pa_free-mismatch.patch
-rhel6.3/ext4_data_in_dirent.patch
+rhel6.3/ext4-data-in-dirent.patch
 rhel6.3/ext4-large-eas.patch
 rhel6.3/ext4-disable-mb-cache.patch
 rhel6.3/ext4-back-dquot-to.patch
 rhel6.3/ext4-nocmtime-2.6.patch
-rhel6.3/ext4-vmalloc.patch
 rhel6.3/ext4-journal-callback.patch
 rhel6.3/ext4-store-tree-generation-at-find.patch
-rhel6.3/ext4_pdirop.patch
+rhel6.3/ext4-pdirop.patch
 rhel6.3/ext4-quota-force-block-alloc-quotaoff.patch
 rhel6.3/ext4-quota-dont-update-cmtime.patch
 rhel6.3/ext4-quota-first-class.patch
 rhel6.3/ext4-inode_info_reorganize.patch
 rhel6.3/ext4-fix-mbgroups-access.patch
 rhel6.3/ext4-fix-ext4_mb_add_n_trim.patch
+rhel6.3/ext4-max-dir-size.patch
+rhel6.3/ext4-max-dir-size-options.patch
+rhel6.3/ext4-not-discard-preallocation-umount.patch
+rhel6.3/ext4-journal-path-opt.patch