From b570928de425553a71e8977400128a97fb4f5e17 Mon Sep 17 00:00:00 2001 From: Anatol Pomozov Date: Tue, 18 Sep 2012 13:38:59 -0400 Subject: [PATCH] --- yaml --- r: 331587 b: refs/heads/master c: c9b92530a723ac5ef8e352885a1862b18f31b2f5 h: refs/heads/master i: 331585: a3241112584f91b4c9b340cf01bb9c61ba7a1dbc 331583: 6c7fb254fd282d1ba1d34b2fa3283eb7d22da331 v: v3 --- [refs] | 2 +- trunk/fs/ext4/namei.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 40de58c182dd..8473c916ef8d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b5e2368baeddf401bf3da9e364fc1c96676279cd +refs/heads/master: c9b92530a723ac5ef8e352885a1862b18f31b2f5 diff --git a/trunk/fs/ext4/namei.c b/trunk/fs/ext4/namei.c index 37c03b32e194..8f4bda75122e 100644 --- a/trunk/fs/ext4/namei.c +++ b/trunk/fs/ext4/namei.c @@ -2369,7 +2369,7 @@ int ext4_orphan_add(handle_t *handle, struct inode *inode) struct ext4_iloc iloc; int err = 0, rc; - if (!ext4_handle_valid(handle)) + if (!EXT4_SB(sb)->s_journal) return 0; mutex_lock(&EXT4_SB(sb)->s_orphan_lock); @@ -2443,8 +2443,7 @@ int ext4_orphan_del(handle_t *handle, struct inode *inode) struct ext4_iloc iloc; int err = 0; - /* ext4_handle_valid() assumes a valid handle_t pointer */ - if (handle && !ext4_handle_valid(handle)) + if (!EXT4_SB(inode->i_sb)->s_journal) return 0; mutex_lock(&EXT4_SB(inode->i_sb)->s_orphan_lock); @@ -2463,7 +2462,7 @@ int ext4_orphan_del(handle_t *handle, struct inode *inode) * transaction handle with which to update the orphan list on * disk, but we still need to remove the inode from the linked * list in memory. */ - if (sbi->s_journal && !handle) + if (!handle) goto out; err = ext4_reserve_inode_write(handle, inode, &iloc);