diff options
| author | Curt Wohlgemuth <curtw@google.com> | 2009-09-29 17:01:03 +0200 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2009-09-29 17:01:03 +0200 |
| commit | d3d1faf6a74496ea4435fd057c6a2cad49f3e523 (patch) | |
| tree | 9f1cc0e2efb9a4fe42bb6b57c087d8450a854dc1 /fs/ext4/namei.c | |
| parent | ext4: Make sure ext4_dirty_inode() updates the inode in no journal mode (diff) | |
| download | linux-d3d1faf6a74496ea4435fd057c6a2cad49f3e523.tar.xz linux-d3d1faf6a74496ea4435fd057c6a2cad49f3e523.zip | |
ext4: Handle nested ext4_journal_start/stop calls without a journal
This patch fixes a problem with handling nested calls to
ext4_journal_start/ext4_journal_stop, when there is no journal present.
Signed-off-by: Curt Wohlgemuth <curtw@google.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Diffstat (limited to 'fs/ext4/namei.c')
| -rw-r--r-- | fs/ext4/namei.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c index 42f81d285cd5..7c8fe80bacdd 100644 --- a/fs/ext4/namei.c +++ b/fs/ext4/namei.c @@ -2076,7 +2076,8 @@ int ext4_orphan_del(handle_t *handle, struct inode *inode) struct ext4_iloc iloc; int err = 0; - if (!ext4_handle_valid(handle)) + /* ext4_handle_valid() assumes a valid handle_t pointer */ + if (handle && !ext4_handle_valid(handle)) return 0; mutex_lock(&EXT4_SB(inode->i_sb)->s_orphan_lock); |