adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-29 04:06:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

NFS: O_DIRECT async IO may lose context

Browse source 
The struct nfs_direct_req currently keeps a pointer to the file descriptor
without referencing it. This may cause problems if the parent process is
killed.

The nfs_open_context should normally have all the information that we're
currently using the filp for, and unlike fput(), is safe to release from
an rpciod process context.

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
Trond Myklebust 2006-03-20 13:44:36 -05:00
parent fad6149041
commit a8881f5a5c
1 changed files with 12 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
fs/nfs/direct.c
View file

@ -71,7 +71,7 @@ struct nfs_direct_req {
/* I/O parameters */ /* I/O parameters */
struct list_head list, /* nfs_read/write_data structs */ struct list_head list, /* nfs_read/write_data structs */
rewrite_list; /* saved nfs_write_data structs */ rewrite_list; /* saved nfs_write_data structs */
struct file * filp; /* file descriptor */ struct nfs_open_context *ctx; /* file open context info */
struct kiocb * iocb; /* controlling i/o request */ struct kiocb * iocb; /* controlling i/o request */
wait_queue_head_t wait; /* wait for i/o completion */ wait_queue_head_t wait; /* wait for i/o completion */
struct inode * inode; /* target file of i/o */ struct inode * inode; /* target file of i/o */
@ -176,6 +176,7 @@ static inline struct nfs_direct_req *nfs_direct_req_alloc(void)
INIT_LIST_HEAD(&dreq->list); INIT_LIST_HEAD(&dreq->list);
INIT_LIST_HEAD(&dreq->rewrite_list); INIT_LIST_HEAD(&dreq->rewrite_list);
dreq->iocb = NULL; dreq->iocb = NULL;
dreq->ctx = NULL;
spin_lock_init(&dreq->lock); spin_lock_init(&dreq->lock);
dreq->outstanding = 0; dreq->outstanding = 0;
dreq->count = 0; dreq->count = 0;
@ -188,6 +189,9 @@ static inline struct nfs_direct_req *nfs_direct_req_alloc(void)
static void nfs_direct_req_release(struct kref *kref) static void nfs_direct_req_release(struct kref *kref)
{ {
struct nfs_direct_req *dreq = container_of(kref, struct nfs_direct_req, kref); struct nfs_direct_req *dreq = container_of(kref, struct nfs_direct_req, kref);
if (dreq->ctx != NULL)
put_nfs_open_context(dreq->ctx);
kmem_cache_free(nfs_direct_cachep, dreq); kmem_cache_free(nfs_direct_cachep, dreq);
} }
@ -235,7 +239,6 @@ static void nfs_direct_complete(struct nfs_direct_req *dreq)
} else } else
wake_up(&dreq->wait); wake_up(&dreq->wait);
iput(dreq->inode);
kref_put(&dreq->kref, nfs_direct_req_release); kref_put(&dreq->kref, nfs_direct_req_release);
} }
@ -317,10 +320,8 @@ static const struct rpc_call_ops nfs_read_direct_ops = {
*/ */
static void nfs_direct_read_schedule(struct nfs_direct_req *dreq) static void nfs_direct_read_schedule(struct nfs_direct_req *dreq)
{ {
struct file *file = dreq->filp; struct nfs_open_context *ctx = dreq->ctx;
struct inode *inode = file->f_mapping->host; struct inode *inode = ctx->dentry->d_inode;
struct nfs_open_context *ctx = (struct nfs_open_context *)
file->private_data;
struct list_head *list = &dreq->list; struct list_head *list = &dreq->list;
struct page **pages = dreq->pages; struct page **pages = dreq->pages;
size_t count = dreq->user_count; size_t count = dreq->user_count;
@ -396,9 +397,8 @@ static ssize_t nfs_direct_read(struct kiocb *iocb, unsigned long user_addr, size
dreq->pos = pos; dreq->pos = pos;
dreq->pages = pages; dreq->pages = pages;
dreq->npages = nr_pages; dreq->npages = nr_pages;
igrab(inode);
dreq->inode = inode; dreq->inode = inode;
dreq->filp = iocb->ki_filp; dreq->ctx = get_nfs_open_context((struct nfs_open_context *)iocb->ki_filp->private_data);
if (!is_sync_kiocb(iocb)) if (!is_sync_kiocb(iocb))
dreq->iocb = iocb; dreq->iocb = iocb;
@ -462,14 +462,11 @@ static const struct rpc_call_ops nfs_commit_direct_ops = {
static void nfs_direct_commit_schedule(struct nfs_direct_req *dreq) static void nfs_direct_commit_schedule(struct nfs_direct_req *dreq)
{ {
struct file *file = dreq->filp;
struct nfs_open_context *ctx = (struct nfs_open_context *)
file->private_data;
struct nfs_write_data *data = dreq->commit_data; struct nfs_write_data *data = dreq->commit_data;
struct rpc_task *task = &data->task; struct rpc_task *task = &data->task;
data->inode = dreq->inode; data->inode = dreq->inode;
data->cred = ctx->cred; data->cred = dreq->ctx->cred;
data->args.fh = NFS_FH(data->inode); data->args.fh = NFS_FH(data->inode);
data->args.offset = dreq->pos; data->args.offset = dreq->pos;
@ -641,10 +638,8 @@ static const struct rpc_call_ops nfs_write_direct_ops = {
*/ */
static void nfs_direct_write_schedule(struct nfs_direct_req *dreq, int sync) static void nfs_direct_write_schedule(struct nfs_direct_req *dreq, int sync)
{ {
struct file *file = dreq->filp; struct nfs_open_context *ctx = dreq->ctx;
struct inode *inode = file->f_mapping->host; struct inode *inode = ctx->dentry->d_inode;
struct nfs_open_context *ctx = (struct nfs_open_context *)
file->private_data;
struct list_head *list = &dreq->list; struct list_head *list = &dreq->list;
struct page **pages = dreq->pages; struct page **pages = dreq->pages;
size_t count = dreq->user_count; size_t count = dreq->user_count;
@ -725,9 +720,8 @@ static ssize_t nfs_direct_write(struct kiocb *iocb, unsigned long user_addr, siz
dreq->pos = pos; dreq->pos = pos;
dreq->pages = pages; dreq->pages = pages;
dreq->npages = nr_pages; dreq->npages = nr_pages;
igrab(inode);
dreq->inode = inode; dreq->inode = inode;
dreq->filp = iocb->ki_filp; dreq->ctx = get_nfs_open_context((struct nfs_open_context *)iocb->ki_filp->private_data);
if (!is_sync_kiocb(iocb)) if (!is_sync_kiocb(iocb))
dreq->iocb = iocb; dreq->iocb = iocb;