From 3506d96eead5ab4c2b262b10904cdfe856b73eef Mon Sep 17 00:00:00 2001 From: Miklos Szeredi Date: Tue, 28 Apr 2009 16:56:41 +0200 Subject: [PATCH] --- yaml --- r: 147955 b: refs/heads/master c: 797759aaf31351a1ab1b9130c4f180ce496f46c5 h: refs/heads/master i: 147953: bb6a130eac506642c83b61451374e7148e3cbbb3 147951: 92355784f0b10ac514e6143ae5c7bb3529f512a0 v: v3 --- [refs] | 2 +- trunk/fs/fuse/file.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 42339c96cd10..7430c91bb159 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d36f248710c05714f37d921258b630bd1456b99f +refs/heads/master: 797759aaf31351a1ab1b9130c4f180ce496f46c5 diff --git a/trunk/fs/fuse/file.c b/trunk/fs/fuse/file.c index 9f0ade0b4ce8..c5de60e873cb 100644 --- a/trunk/fs/fuse/file.c +++ b/trunk/fs/fuse/file.c @@ -1894,9 +1894,8 @@ static void fuse_register_polled_file(struct fuse_conn *fc, static unsigned fuse_file_poll(struct file *file, poll_table *wait) { - struct inode *inode = file->f_dentry->d_inode; struct fuse_file *ff = file->private_data; - struct fuse_conn *fc = get_fuse_conn(inode); + struct fuse_conn *fc = ff->fc; struct fuse_poll_in inarg = { .fh = ff->fh, .kh = ff->kh }; struct fuse_poll_out outarg; struct fuse_req *req; @@ -1921,7 +1920,7 @@ static unsigned fuse_file_poll(struct file *file, poll_table *wait) return PTR_ERR(req); req->in.h.opcode = FUSE_POLL; - req->in.h.nodeid = get_node_id(inode); + req->in.h.nodeid = ff->nodeid; req->in.numargs = 1; req->in.args[0].size = sizeof(inarg); req->in.args[0].value = &inarg;