Skip to contentSkip to conversation

nfs/nfsd: fix some comments

PATCH Applied Li Lingfeng 2 participants 4 messages Aug 24, 2024

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

v2 cover nfs/nfsd: fix some comments

v1->v2:
Change the title of [PATCH 1/4] since it is a NFS client patch, not a nfsd patch;
Made a small change of [PATCH 2/4] to make the comments more syntactically;
Remove [PATCH 3/4] since it's meaningless;
Remove [PATCH 4/4] since it has been applied to nfsd-next for v6.12.

v1:
https://lore.kernel.org/all/[email protected]/

Li Lingfeng (2):
nfs: fix the comment of nfs_get_root
nfsd: fix some spelling errors in comments

 fs/nfs/getroot.c    | 2 +-
 fs/nfsd/nfs4state.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
Signature · 1 line
2.31.1
#1 lore raw

PATCH v2 1/2 nfs: fix the comment of nfs_get_root

The comment for nfs_get_root() needs to be updated as it would also be used by NFS4 as follows:
@x[

    nfs_get_root+1
    nfs_get_tree_common+1819
    nfs_get_tree+2594
    vfs_get_tree+73
    fc_mount+23
    do_nfs4_mount+498
    nfs4_try_get_tree+134
    nfs_get_tree+2562
    vfs_get_tree+73
    path_mount+2776
    do_mount+226
    __se_sys_mount+343
    __x64_sys_mount+106
    do_syscall_64+69
    entry_SYSCALL_64_after_hwframe+97

, mount.nfs4]: 1

---
 fs/nfs/getroot.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
fs/nfs/getroot.c +1 -1
index 11ff2b2e060f..f13d25d95b85 100644
@@ -62,7 +62,7 @@ static int nfs_superblock_set_dummy_root(struct super_block *sb, struct inode *i
 }
 
 /*
- * get an NFS2/NFS3 root dentry from the root filehandle
+ * get a root dentry from the root filehandle
  */
 int nfs_get_root(struct super_block *s, struct fs_context *fc)
 {
Signature · 1 line
2.31.1
#2 lore raw

PATCH v2 2/2 nfsd: fix some spelling errors in comments

In reply to Li Lingfeng

Fix spelling errors in comments of nfsd4_release_lockowner and nfs4_set_delegation.

---
 fs/nfsd/nfs4state.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
fs/nfsd/nfs4state.c +2 -2
index a20c2c9d7d45..9046e39b0e5c 100644
@@ -5856,7 +5856,7 @@ nfs4_set_delegation(struct nfsd4_open *open, struct nfs4_ol_stateid *stp,
 
 	/*
 	 * Now that the deleg is set, check again to ensure that nothing
-	 * raced in and changed the mode while we weren't lookng.
+	 * raced in and changed the mode while we weren't looking.
 	 */
 	status = nfsd4_verify_setuid_write(open, fp->fi_deleg_file);
 	if (status)
@@ -8335,7 +8335,7 @@ check_for_locks(struct nfs4_file *fp, struct nfs4_lockowner *lowner)
  * @cstate: NFSv4 COMPOUND state
  * @u: RELEASE_LOCKOWNER arguments
  *
- * Check if theree are any locks still held and if not - free the lockowner
+ * Check if there are any locks still held and if not, free the lockowner
  * and any lock state that is owned.
  *
  * Return values:
Signature · 1 line
2.31.1
Applied
#3 lore raw

Re: [PATCH v2 2/2] nfsd: fix some spelling errors in comments

Quoted 9 lines · Li Lingfeng

Fix spelling errors in comments of nfsd4_release_lockowner and nfs4_set_delegation.

---
 fs/nfsd/nfs4state.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

[...]

Applied to nfsd-next for v6.12, thanks!

[2/2] nfsd: fix some spelling errors in comments

      commit: 2a6dfb4ce8136b93e38e1101636af44ed82b3d3e
Signature · 1 line
Chuck Lever