diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2022-06-28 10:15:13 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2022-06-28 10:15:13 +1000 |
| commit | 9455acd7e3460d33e259f3d7edb548709be2d4bc (patch) | |
| tree | 0ffacc035193de06c4e7af5b7441281e4c6adfc8 | |
| parent | f349167f04b3adf5304995bccea4c9f1600c9d08 (diff) | |
| parent | fe39dc98fb241a67f4a5a5eb6f842a05c4e316b8 (diff) | |
| download | linux-next-9455acd7e3460d33e259f3d7edb548709be2d4bc.tar.gz | |
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git
| -rw-r--r-- | fs/gfs2/file.c | 3 | ||||
| -rw-r--r-- | fs/gfs2/glock.c | 7 | ||||
| -rw-r--r-- | fs/gfs2/lock_dlm.c | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/fs/gfs2/file.c b/fs/gfs2/file.c index 2cceb193dcd85..d8f1239344c1f 100644 --- a/fs/gfs2/file.c +++ b/fs/gfs2/file.c @@ -1066,8 +1066,7 @@ out_unlock: gfs2_glock_dq(gh); out_uninit: gfs2_holder_uninit(gh); - if (statfs_gh) - kfree(statfs_gh); + kfree(statfs_gh); from->count = orig_count - written; return written ? written : ret; } diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c index c992d53013d31..b3259c8e6dada 100644 --- a/fs/gfs2/glock.c +++ b/fs/gfs2/glock.c @@ -540,9 +540,10 @@ restart: continue; if (!may_grant(gl, first_gh, gh)) { /* - * If we get here, it means we may not grant this holder for - * some reason. If this holder is the head of the list, it - * means we have a blocked holder at the head, so return 1. + * If we get here, it means we may not grant this + * holder for some reason. If this holder is at the + * head of the list, it means we have a blocked holder + * at the head, so return 1. */ if (list_is_first(&gh->gh_list, &gl->gl_holders)) return 1; diff --git a/fs/gfs2/lock_dlm.c b/fs/gfs2/lock_dlm.c index 2559a79cf14be..6ce369b096d4b 100644 --- a/fs/gfs2/lock_dlm.c +++ b/fs/gfs2/lock_dlm.c @@ -1058,7 +1058,7 @@ restart: /* * Expand static jid arrays if necessary (by increments of RECOVER_SIZE_INC) - * to accomodate the largest slot number. (NB dlm slot numbers start at 1, + * to accommodate the largest slot number. (NB dlm slot numbers start at 1, * gfs2 jids start at 0, so jid = slot - 1) */ |