|
@@ -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);
|