Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 96d851c4 authored by Stanislav Kinsbursky's avatar Stanislav Kinsbursky Committed by J. Bruce Fields
Browse files

nfsd: use proper net while reading "exports" file 



Functuon "exports_open" is used for both "/proc/fs/nfs/exports" and
"/proc/fs/nfsd/exports" files.
Now NFSd filesystem is containerised, so proper net can be taken from
superblock for "/proc/fs/nfsd/exports" reader.
But for "/proc/fs/nfsd/exports" only current->nsproxy->net_ns can be used.

Signed-off-by: default avatarStanislav Kinsbursky <skinsbursky@parallels.com>
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent 11f77942

fs/nfsd/nfsctl.c

+25 −6
Original line number Diff line number Diff line
@@ -125,11 +125,11 @@ static const struct file_operations transaction_ops = { 
	.llseek		= default_llseek,

};



static int exports_open(struct inode *inode, struct file *file)

static int exports_net_open(struct net *net, struct file *file)

{

	int err;

	struct seq_file *seq;

	struct nfsd_net *nn = net_generic(&init_net, nfsd_net_id);

	struct nfsd_net *nn = net_generic(net, nfsd_net_id);



	err = seq_open(file, &nfs_exports_op);

	if (err)
@@ -140,8 +140,26 @@ static int exports_open(struct inode *inode, struct file *file) 
	return 0;

}



static const struct file_operations exports_operations = {

	.open		= exports_open,

static int exports_proc_open(struct inode *inode, struct file *file)

{

	return exports_net_open(current->nsproxy->net_ns, file);

}



static const struct file_operations exports_proc_operations = {

	.open		= exports_proc_open,

	.read		= seq_read,

	.llseek		= seq_lseek,

	.release	= seq_release,

	.owner		= THIS_MODULE,

};



static int exports_nfsd_open(struct inode *inode, struct file *file)

{

	return exports_net_open(inode->i_sb->s_fs_info, file);

}



static const struct file_operations exports_nfsd_operations = {

	.open		= exports_nfsd_open,

	.read		= seq_read,

	.llseek		= seq_lseek,

	.release	= seq_release,
@@ -1018,7 +1036,7 @@ static ssize_t write_recoverydir(struct file *file, char *buf, size_t size) 
static int nfsd_fill_super(struct super_block * sb, void * data, int silent)

{

	static struct tree_descr nfsd_files[] = {

		[NFSD_List] = {"exports", &exports_operations, S_IRUGO},

		[NFSD_List] = {"exports", &exports_nfsd_operations, S_IRUGO},

		[NFSD_Export_features] = {"export_features",

					&export_features_operations, S_IRUGO},

		[NFSD_FO_UnlockIP] = {"unlock_ip",
@@ -1081,7 +1099,8 @@ static int create_proc_exports_entry(void) 
	entry = proc_mkdir("fs/nfs", NULL);

	if (!entry)

		return -ENOMEM;

	entry = proc_create("exports", 0, entry, &exports_operations);

	entry = proc_create("exports", 0, entry,

				 &exports_proc_operations);

	if (!entry)

		return -ENOMEM;

	return 0;