diff options
author | Anatol Pomozov <anatol.pomozov@gmail.com> | 2012-09-18 13:38:59 -0400 |
---|---|---|
committer | Simon Shields <keepcalm444@gmail.com> | 2016-03-12 23:13:30 +1100 |
commit | 07c64da538554085466e9338e19f033438a0a5bf (patch) | |
tree | 110bcb5e2547318c6634a004a70306faab8882ff /fs | |
parent | a92474e6463fcca623b5a8ebcd11a71c3ee8c445 (diff) | |
download | kernel_samsung_smdk4412-07c64da538554085466e9338e19f033438a0a5bf.zip kernel_samsung_smdk4412-07c64da538554085466e9338e19f033438a0a5bf.tar.gz kernel_samsung_smdk4412-07c64da538554085466e9338e19f033438a0a5bf.tar.bz2 |
ext4: make orphan functions be no-op in no-journal mode
Instead of checking whether the handle is valid, we check if journal
is enabled. This avoids taking the s_orphan_lock mutex in all cases
when there is no journal in use, including the error paths where
ext4_orphan_del() is called with a handle set to NULL.
Signed-off-by: Anatol Pomozov <anatol.pomozov@gmail.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Conflicts:
fs/ext4/namei.c
Change-Id: I734ccb8069fceb12b864e7b9dceb37e27ab94c61
Diffstat (limited to 'fs')
-rw-r--r-- | fs/ext4/namei.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c index 4098064..c70e08b 100644 --- a/fs/ext4/namei.c +++ b/fs/ext4/namei.c @@ -1986,7 +1986,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); @@ -2067,8 +2067,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 && !(EXT4_SB(inode->i_sb)->s_mount_state & EXT4_ORPHAN_FS)) return 0; @@ -2088,7 +2087,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); |