UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

NFS: replace global bl_mount_reply with per-net one 

This global variable is used for blocklayout downcall and thus can be corrupted
if case of existence of multiple networks namespaces.

Signed-off-by: Stanislav Kinsbursky <skinsbursky@parallels.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
Stanislav Kinsbursky 2012-03-11 18:20:23 +04:00 committed by Trond Myklebust
parent d6d6dc7cdf
commit cb9c1c4a88
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fs/nfs/blocklayout/blocklayout.h
View File

@ -153,11 +153,6 @@ BLK_LSEG2EXT(struct pnfs_layout_segment *lseg)
return BLK_LO2EXT(lseg->pls_layout); return BLK_LO2EXT(lseg->pls_layout);
} }
struct bl_dev_msg {
int32_t status;
uint32_t major, minor;
};
struct bl_msg_hdr { struct bl_msg_hdr {
u8 type; u8 type;
u16 totallen; /* length of entire message, including hdr itself */ u16 totallen; /* length of entire message, including hdr itself */

9
fs/nfs/blocklayout/blocklayoutdev.c
View File

@ -79,15 +79,16 @@ int nfs4_blkdev_put(struct block_device *bdev)
return blkdev_put(bdev, FMODE_READ); return blkdev_put(bdev, FMODE_READ);
} }
static struct bl_dev_msg bl_mount_reply;
ssize_t bl_pipe_downcall(struct file *filp, const char __user *src, ssize_t bl_pipe_downcall(struct file *filp, const char __user *src,
size_t mlen) size_t mlen)
{ {
struct nfs_net *nn = net_generic(filp->f_dentry->d_sb->s_fs_info,
nfs_net_id);
if (mlen != sizeof (struct bl_dev_msg)) if (mlen != sizeof (struct bl_dev_msg))
return -EINVAL; return -EINVAL;
if (copy_from_user(&bl_mount_reply, src, mlen) != 0) if (copy_from_user(&nn->bl_mount_reply, src, mlen) != 0)
return -EFAULT; return -EFAULT;
wake_up(&bl_wq); wake_up(&bl_wq);
@ -118,10 +119,10 @@ nfs4_blk_decode_device(struct nfs_server *server,
}; };
uint8_t *dataptr; uint8_t *dataptr;
DECLARE_WAITQUEUE(wq, current); DECLARE_WAITQUEUE(wq, current);
struct bl_dev_msg *reply = &bl_mount_reply;
int offset, len, i, rc; int offset, len, i, rc;
struct net *net = server->nfs_client->net; struct net *net = server->nfs_client->net;
struct nfs_net *nn = net_generic(net, nfs_net_id); struct nfs_net *nn = net_generic(net, nfs_net_id);
struct bl_dev_msg *reply = &nn->bl_mount_reply;
dprintk("%s CREATING PIPEFS MESSAGE\n", __func__); dprintk("%s CREATING PIPEFS MESSAGE\n", __func__);
dprintk("%s: deviceid: %s, mincount: %d\n", __func__, dev->dev_id.data, dprintk("%s: deviceid: %s, mincount: %d\n", __func__, dev->dev_id.data,

6
fs/nfs/netns.h
View File

@ -4,9 +4,15 @@
#include <net/net_namespace.h> #include <net/net_namespace.h>
#include <net/netns/generic.h> #include <net/netns/generic.h>
struct bl_dev_msg {
int32_t status;
uint32_t major, minor;
};
struct nfs_net { struct nfs_net {
struct cache_detail *nfs_dns_resolve; struct cache_detail *nfs_dns_resolve;
struct rpc_pipe *bl_device_pipe; struct rpc_pipe *bl_device_pipe;
struct bl_dev_msg bl_mount_reply;
struct list_head nfs_client_list; struct list_head nfs_client_list;
struct list_head nfs_volume_list; struct list_head nfs_volume_list;
#ifdef CONFIG_NFS_V4 #ifdef CONFIG_NFS_V4