diff options
| author | Anatol Pomozov <anatol.pomozov@gmail.com> | 2012-09-18 13:38:59 -0400 |
|---|---|---|
| committer | Ziyan <jaraidaniel@gmail.com> | 2016-10-29 01:34:05 +0200 |
| commit | b5abd9966c8cf372972eb5cb3c72b8dcc2f97d43 (patch) | |
| tree | e7940e79edd8abc6ea5d8ad6a1ad6732e781f710 /fs | |
| parent | 8d5e9bf8f679bed319b57efc302967280048e97f (diff) | |
| download | kernel_samsung_tuna-b5abd9966c8cf372972eb5cb3c72b8dcc2f97d43.zip kernel_samsung_tuna-b5abd9966c8cf372972eb5cb3c72b8dcc2f97d43.tar.gz kernel_samsung_tuna-b5abd9966c8cf372972eb5cb3c72b8dcc2f97d43.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 df748b6..045c11e 100644 --- a/fs/ext4/namei.c +++ b/fs/ext4/namei.c @@ -1978,7 +1978,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); @@ -2059,8 +2059,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; @@ -2080,7 +2079,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); |