Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'nfsd-6.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux
Pull nfsd fixes from Chuck Lever:
- Use correct order when encoding NFSv4 RENAME change_info
- Fix a potential oops during NFSD shutdown
* tag 'nfsd-6.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux:
NFSD: fix possible oops when nfsd/pool_stats is closed.
nfsd: fix change_info in NFSv4 RENAME replies
+5
-4
+2
-2
fs/nfsd/nfs4proc.c
+2
-2
fs/nfsd/nfs4proc.c
···
1058
1058
rename->rn_tname, rename->rn_tnamelen);
1059
1059
if (status)
1060
1060
return status;
1061
-
set_change_info(&rename->rn_sinfo, &cstate->current_fh);
1062
-
set_change_info(&rename->rn_tinfo, &cstate->save_fh);
1061
+
set_change_info(&rename->rn_sinfo, &cstate->save_fh);
1062
+
set_change_info(&rename->rn_tinfo, &cstate->current_fh);
1063
1063
return nfs_ok;
1064
1064
}
1065
1065
+3
-2
fs/nfsd/nfssvc.c
+3
-2
fs/nfsd/nfssvc.c
···
1082
1082
1083
1083
int nfsd_pool_stats_release(struct inode *inode, struct file *file)
1084
1084
{
1085
+
struct seq_file *seq = file->private_data;
1086
+
struct svc_serv *serv = seq->private;
1085
1087
int ret = seq_release(inode, file);
1086
-
struct net *net = inode->i_sb->s_fs_info;
1087
1088
1088
1089
mutex_lock(&nfsd_mutex);
1089
-
nfsd_put(net);
1090
+
svc_put(serv);
1090
1091
mutex_unlock(&nfsd_mutex);
1091
1092
return ret;
1092
1093
}