nfsd: fix some comments and code cleanup
Subsystems (2)
cover nfsd: fix some comments and code cleanup
Li Lingfeng (4):
nfsd: fix the comment of nfs_get_root
nfsd: fix some spelling errors in comments
nfsd: remove the redundant blank line
nfsd: remove unused parameter of nfsd_file_mark_find_or_create
fs/nfs/getroot.c | 2 +- fs/nfsd/filecache.c | 4 ++-- fs/nfsd/nfs4proc.c | 1 - fs/nfsd/nfs4state.c | 4 ++-- 4 files changed, 5 insertions(+), 6 deletions(-)
Signature · 1 line
2.31.1
PATCH 1/4 nfsd: 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
@@ -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
Re: [PATCH 1/4] nfsd: fix the comment of nfs_get_root
Quoted 30 lines · Li Lingfeng
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
Signed-off-by Li Lingfeng <[email protected]>--- fs/nfs/getroot.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)fs/nfs/getroot.c +0
-0
fs/nfs/getroot.c static int nfs_superblock_set_dummy_root(struct super_block *sb, struct inode *i · line 68
Quoted 8 lines
fs/nfs/getroot.c +1
-1@@ -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) {
Note that this is a NFS client patch, not a nfsd patch like the title suggests.
PATCH 2/4 nfsd: fix some spelling errors in comments
In reply to Li LingfengFix 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
@@ -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
Jeff Layton
maintainerRe: [PATCH 2/4] nfsd: fix some spelling errors in comments
Quoted 22 lines · Li Lingfeng
Fix spelling errors in comments of
nfsd4_release_lockownerandnfs4_set_delegation.Signed-off-by Li Lingfeng <[email protected]>--- fs/nfsd/nfs4state.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)fs/nfsd/nfs4state.c +1
-1@@ -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)
fs/nfsd/nfs4state.c check_for_locks(struct nfs4_file *fp, struct nfs4_lockowner *lowner) · line 8338
Quoted 5 lines
fs/nfsd/nfs4state.c +1
-1@@ -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
This is probably better grammatically:
Check if there are any locks still held and if not, free the lockowner
Quoted 3 lines
fs/nfsd/nfs4state.c +0
-0* and any lock state that is owned. * * Return values:
Signature · 1 line
Jeff Layton <[email protected]>
Re: [PATCH 2/4] nfsd: fix some spelling errors in comments
Quoted 30 lines · Jeff Layton
Quoted 22 lines · Li Lingfeng
Fix spelling errors in comments of
nfsd4_release_lockownerandnfs4_set_delegation.Signed-off-by Li Lingfeng <[email protected]>--- fs/nfsd/nfs4state.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)fs/nfsd/nfs4state.c +1
-1@@ -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)fs/nfsd/nfs4state.c check_for_locks(struct nfs4_file *fp, struct nfs4_lockowner *lowner) · line 8338
Quoted 5 lines
fs/nfsd/nfs4state.c +1
-1@@ -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 This is probably better grammatically:
Quoted 1 line
Check if there are any locks still held and if not, free the lockowner
Thanks for your advice, it does look better.
Quoted 3 lines
Quoted 3 lines
fs/nfsd/nfs4state.c +0
-0* and any lock state that is owned. * * Return values:
PATCH 3/4 nfsd: remove the redundant blank line
In reply to Li LingfengJust remove the redundant blank line in do_open_permission. No function change.
--- fs/nfsd/nfs4proc.c | 1 - 1 file changed, 1 deletion(-)
fs/nfsd/nfs4proc.c +0 -1
@@ -141,7 +141,6 @@ fh_dup2(struct svc_fh *dst, struct svc_fh *src)static __be32 do_open_permission (struct svc_rqst *rqstp,struct svc_fh *current_fh,struct nfsd4_open *open,int accmode) { -if (open->op_truncate && !(open->op_share_access &NFS4_SHARE_ACCESS_WRITE ))return nfserr_inval;
Signature · 1 line
2.31.1
Jeff Layton
maintainerRe: [PATCH 3/4] nfsd: remove the redundant blank line
Quoted 13 lines · Li Lingfeng
Just remove the redundant blank line in
do_open_permission. No function change.Signed-off-by Li Lingfeng <[email protected]>--- fs/nfsd/nfs4proc.c | 1 - 1 file changed, 1 deletion(-)fs/nfsd/nfs4proc.c +0
-0
fs/nfsd/nfs4proc.c fh_dup2(struct svc_fh *dst, struct svc_fh *src) · line 146
Quoted 7 lines
fs/nfsd/nfs4proc.c +0
-1@@ -141,7 +141,6 @@ fh_dup2(struct svc_fh *dst, struct svc_fh *src)static __be32 do_open_permission (struct svc_rqst *rqstp,struct svc_fh *current_fh,struct nfsd4_open *open,int accmode) { -if (open->op_truncate && !(open->op_share_access &NFS4_SHARE_ACCESS_WRITE ))return nfserr_inval;
NACK. In general, we don't take whitespace patches. They just make backporting harder later if you have to do it. If you have a material change to make in this area, then go ahead and fix the whitespace, but otherwise don't bother.
Signature · 1 line
Jeff Layton <[email protected]>
Re: [PATCH 3/4] nfsd: remove the redundant blank line
Thank you for your response. I appreciate you taking the time to address my concerns. Moving forward, I will be more mindful and refrain from submitting patches like this.
Quoted 25 lines · Jeff Layton
Quoted 13 lines · Li Lingfeng
Just remove the redundant blank line in
do_open_permission. No function change.Signed-off-by Li Lingfeng <[email protected]>--- fs/nfsd/nfs4proc.c | 1 - 1 file changed, 1 deletion(-)fs/nfsd/nfs4proc.c +0
-0fs/nfsd/nfs4proc.c fh_dup2(struct svc_fh *dst, struct svc_fh *src) · line 146
Quoted 7 lines
fs/nfsd/nfs4proc.c +0
-1@@ -141,7 +141,6 @@ fh_dup2(struct svc_fh *dst, struct svc_fh *src)static __be32 do_open_permission (struct svc_rqst *rqstp,struct svc_fh *current_fh,struct nfsd4_open *open,int accmode) { -if (open->op_truncate && !(open->op_share_access &NFS4_SHARE_ACCESS_WRITE ))return nfserr_inval;NACK. In general, we don't take whitespace patches. They just make backporting harder later if you have to do it. If you have a material change to make in this area, then go ahead and fix the whitespace, but otherwise don't bother.
PATCH 4/4 nfsd: remove unused parameter of nfsd_file_mark_find_or_create
In reply to Li LingfengCommit 427f5f83a319 ("NFSD: Ensure nf_inode is never dereferenced") passes inode directly to nfsd_file_mark_find_or_create instead of getting it from nf, so there is no need to pass nf.
--- fs/nfsd/filecache.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
fs/nfsd/filecache.c +2 -2
@@ -151,7 +151,7 @@ nfsd_file_mark_put(struct nfsd_file_mark *nfm) }static struct nfsd_file_mark * -nfsd_file_mark_find_or_create (struct nfsd_file *nf,struct inode *inode) +nfsd_file_mark_find_or_create (struct inode *inode) {int err;struct fsnotify_mark *mark;
@@ -1074,7 +1074,7 @@ nfsd_file_do_acquire(struct svc_rqst *rqstp, struct svc_fh *fhp, open_file:trace_nfsd_file_alloc (nf); - nf->nf_mark =nfsd_file_mark_find_or_create (nf, inode); + nf->nf_mark =nfsd_file_mark_find_or_create (inode);if (nf->nf_mark) {if (file) {get_file (file);
Signature · 1 line
2.31.1
Re: [PATCH 4/4] nfsd: remove unused parameter of nfsd_file_mark_find_or_create
Quoted 23 lines · Li Lingfeng
Commit
427f5f83a319("NFSD: Ensurenf_inodeis never dereferenced") passes inode directly tonfsd_file_mark_find_or_createinstead of getting it from nf, so there is no need to pass nf.Signed-off-by Li Lingfeng <[email protected]>--- fs/nfsd/filecache.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)fs/nfsd/filecache.c +1
-1@@ -151,7 +151,7 @@ nfsd_file_mark_put(struct nfsd_file_mark *nfm) }static struct nfsd_file_mark * -nfsd_file_mark_find_or_create (struct nfsd_file *nf,struct inode *inode) +nfsd_file_mark_find_or_create (struct inode *inode) {int err;struct fsnotify_mark *mark;
fs/nfsd/filecache.c nfsd_file_do_acquire(struct svc_rqst *rqstp, struct svc_fh *fhp, · line 1080
Quoted 8 lines
fs/nfsd/filecache.c +1
-1@@ -1074,7 +1074,7 @@ nfsd_file_do_acquire(struct svc_rqst *rqstp, struct svc_fh *fhp, open_file:trace_nfsd_file_alloc (nf); - nf->nf_mark =nfsd_file_mark_find_or_create (nf, inode); + nf->nf_mark =nfsd_file_mark_find_or_create (inode);if (nf->nf_mark) {if (file) {get_file (file);
Nice cleanup.
Chuck Lever
AppliedRe: [PATCH 4/4] nfsd: remove unused parameter of nfsd_file_mark_find_or_create
In reply to Li LingfengQuoted 5 lines · Li Lingfeng
Commit
427f5f83a319("NFSD: Ensurenf_inodeis never dereferenced") passes inode directly tonfsd_file_mark_find_or_createinstead of getting it from nf, so there is no need to pass nf.[...]
Applied to nfsd-next for v6.12, thanks!
[4/4] nfsd: remove unused parameter of nfsd_file_mark_find_or_create
commit: c78a662dfe4ea208e05c7ba78949a239e31c360d
Signature · 1 line
Chuck Lever