diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-05-17 11:36:59 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-05-17 11:36:59 -0400 |
| commit | dd504ea16f34a29da4aa933ae7ab917fcfd25fd7 (patch) | |
| tree | 0502645dc159be29c33c992e9e56dc3156074279 /net/sunrpc | |
| parent | 5cf4cf65a8ccca44ec9b357ebdb2b517269d7e8a (diff) | |
| parent | 0479ea0eab197b3e5d4c731f526c02e5e3fbfbd0 (diff) | |
Merge branch 'master' of /home/trondmy/repositories/git/linux-2.6/
Diffstat (limited to 'net/sunrpc')
| -rw-r--r-- | net/sunrpc/rpc_pipe.c | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/net/sunrpc/rpc_pipe.c b/net/sunrpc/rpc_pipe.c index a2f1893bde53..5887457dc936 100644 --- a/net/sunrpc/rpc_pipe.c +++ b/net/sunrpc/rpc_pipe.c | |||
| @@ -828,19 +828,17 @@ init_once(void * foo, struct kmem_cache * cachep, unsigned long flags) | |||
| 828 | { | 828 | { |
| 829 | struct rpc_inode *rpci = (struct rpc_inode *) foo; | 829 | struct rpc_inode *rpci = (struct rpc_inode *) foo; |
| 830 | 830 | ||
| 831 | if (flags & SLAB_CTOR_CONSTRUCTOR) { | 831 | inode_init_once(&rpci->vfs_inode); |
| 832 | inode_init_once(&rpci->vfs_inode); | 832 | rpci->private = NULL; |
| 833 | rpci->private = NULL; | 833 | rpci->nreaders = 0; |
| 834 | rpci->nreaders = 0; | 834 | rpci->nwriters = 0; |
| 835 | rpci->nwriters = 0; | 835 | INIT_LIST_HEAD(&rpci->in_upcall); |
| 836 | INIT_LIST_HEAD(&rpci->in_upcall); | 836 | INIT_LIST_HEAD(&rpci->pipe); |
| 837 | INIT_LIST_HEAD(&rpci->pipe); | 837 | rpci->pipelen = 0; |
| 838 | rpci->pipelen = 0; | 838 | init_waitqueue_head(&rpci->waitq); |
| 839 | init_waitqueue_head(&rpci->waitq); | 839 | INIT_DELAYED_WORK(&rpci->queue_timeout, |
| 840 | INIT_DELAYED_WORK(&rpci->queue_timeout, | 840 | rpc_timeout_upcall_queue); |
| 841 | rpc_timeout_upcall_queue); | 841 | rpci->ops = NULL; |
| 842 | rpci->ops = NULL; | ||
| 843 | } | ||
| 844 | } | 842 | } |
| 845 | 843 | ||
| 846 | int register_rpc_pipefs(void) | 844 | int register_rpc_pipefs(void) |