diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-07-02 14:25:17 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-07-02 14:25:17 -0700 |
commit | e4aa67b023167c570be95a39149a918cca9e36a0 (patch) | |
tree | 230c2c101310a31068d7584370d08c4dd13fc414 /fs/jfs/jfs_dmap.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/jfs_dmap.c')
-rw-r--r-- | fs/jfs/jfs_dmap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/jfs/jfs_dmap.c b/fs/jfs/jfs_dmap.c index 7aee15608619..91f4ec93dab1 100644 --- a/fs/jfs/jfs_dmap.c +++ b/fs/jfs/jfs_dmap.c @@ -3660,7 +3660,7 @@ void dbFinalizeBmap(struct inode *ipbmap) * (the leftmost ag with average free space in it); */ //agpref: - /* get the number of active ags and inacitve ags */ + /* get the number of active ags and inactive ags */ actags = bmp->db_maxag + 1; inactags = bmp->db_numag - actags; ag_rem = bmp->db_mapsize & (bmp->db_agsize - 1); /* ??? */ |