diff options
| author | Linus Torvalds | 2021-07-02 14:25:17 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2021-07-02 14:25:17 -0700 |
| commit | e4aa67b023167c570be95a39149a918cca9e36a0 (patch) | |
| tree | 230c2c101310a31068d7584370d08c4dd13fc414 /fs/jfs/inode.c | |
| parent | ced4cca754a6322463720768ce50c45c2865ba5b (diff) | |
| parent | 5d299f44d7658f4423e33a0b9915bc8d81687511 (diff) | |
Merge tag 'jfs-5.14' of git://github.com/kleikamp/linux-shaggy
Pull jfs updates from David Kleikamp:
"JFS fixes for 5.14"
* tag 'jfs-5.14' of git://github.com/kleikamp/linux-shaggy:
jfs: Avoid field-overflowing memcpy()
jfs: remove unnecessary oom message
jfs: fix GPF in diFree
fs/jfs: Fix missing error code in lmLogInit()
jfs: Remove trailing semicolon in macros
fs: Fix typo issue
Diffstat (limited to 'fs/jfs/inode.c')
| -rw-r--r-- | fs/jfs/inode.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/jfs/inode.c b/fs/jfs/inode.c index 3663dd5a23bc..57ab424c05ff 100644 --- a/fs/jfs/inode.c +++ b/fs/jfs/inode.c @@ -151,7 +151,8 @@ void jfs_evict_inode(struct inode *inode) if (test_cflag(COMMIT_Freewmap, inode)) jfs_free_zero_link(inode); - diFree(inode); + if (JFS_SBI(inode->i_sb)->ipimap) + diFree(inode); /* * Free the inode from the quota allocation. |