LU-12977 ldiskfs: properly take inode_lock() for truncates

[fs/lustre-release.git] / ldiskfs / kernel_patches / patches / sles12 / ext4-remove-truncate-warning.patch

diff --git a/ldiskfs/kernel_patches/patches/sles12/ext4-remove-truncate-warning.patch b/ldiskfs/kernel_patches/patches/sles12/ext4-remove-truncate-warning.patch
deleted file mode 100644 (file)
index d5ecfe1..0000000
--- a/ldiskfs/kernel_patches/patches/sles12/ext4-remove-truncate-warning.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-There will cause a deadlock if invoke ext4_truncate with i_mutex locked
-in lustre. Since lustre has own lock to provide protect so we don't
-need this check at all. 
-
-Index: linux-3.10.0-229.1.2.fc21.x86_64/fs/ext4/inode.c
-===================================================================
---- linux-3.10.0-229.1.2.fc21.x86_64.orig/fs/ext4/inode.c
-+++ linux-3.10.0-229.1.2.fc21.x86_64/fs/ext4/inode.c
-@@ -3644,8 +3644,6 @@ void ext4_truncate(struct inode *inode)
-        * or it completely new indode. In those cases we might not
-        * have i_mutex locked because it's not necessary.
-        */
--      if (!(inode->i_state & (I_NEW|I_FREEING)))
--              WARN_ON(!mutex_is_locked(&inode->i_mutex));
-       trace_ext4_truncate_enter(inode);
- 
-       if (!ext4_can_truncate(inode))