Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Marek <mmarek@suse.cz>2013-06-27 15:19:18 +0200
committerMichal Marek <mmarek@suse.cz>2013-06-27 15:19:18 +0200
commite99b9fae7a80e47f866ebadc98f2cff98bd37ad5 (patch)
treea44ff5cd4c37d33f331d3807d5288aece0f16bd4
parentf2519ccd9d840b27117e2357cf2a0d729531131d (diff)
parentf0746bccc7eb2f04e45b79942f6b70c8040bcf47 (diff)
Merge branch 'SLE11-SP2' into SLE11-SP3rpm-3.0.82-0.7
Conflicts: kernel-source.changes patches.kabi/mm-compaction-scan-pfn-caching-KABI-fix.patch patches.kabi/mm-compaction-scan-pfn-caching-KABI.patch patches.kabi/mm-mmu_notifier-have-mmu_notifiers-use-a-global-SRCU-so-they-may-safely-schedule-kabi.patch patches.kabi/netfilter-kABI-fix-after-making-event-callback-regis.patch series.conf suse-commit: 6efde93b67191cd8477119f38506300e9146e134
-rw-r--r--fs/ext4/namei.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c
index 78585fc0a27a..ad1338572add 100644
--- a/fs/ext4/namei.c
+++ b/fs/ext4/namei.c
@@ -2062,7 +2062,8 @@ int ext4_orphan_del(handle_t *handle, struct inode *inode)
int err = 0;
/* ext4_handle_valid() assumes a valid handle_t pointer */
- if (handle && !ext4_handle_valid(handle))
+ if (handle && !ext4_handle_valid(handle) &&
+ !(EXT4_SB(inode->i_sb)->s_mount_state & EXT4_ORPHAN_FS))
return 0;
mutex_lock(&EXT4_SB(inode->i_sb)->s_orphan_lock);