Merge branch 'master' of /home/trondmy/repositories/git/linux-2.6/

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)
 {
         struct rpc_inode *rpci = (struct rpc_inode *) foo;
 
-        if (flags & SLAB_CTOR_CONSTRUCTOR) {
-                inode_init_once(&rpci->vfs_inode);
-                rpci->private = NULL;
-                rpci->nreaders = 0;
-                rpci->nwriters = 0;
-                INIT_LIST_HEAD(&rpci->in_upcall);
-                INIT_LIST_HEAD(&rpci->pipe);
-                rpci->pipelen = 0;
-                init_waitqueue_head(&rpci->waitq);
-                INIT_DELAYED_WORK(&rpci->queue_timeout,
-                                    rpc_timeout_upcall_queue);
-                rpci->ops = NULL;
-        }
+        inode_init_once(&rpci->vfs_inode);
+        rpci->private = NULL;
+        rpci->nreaders = 0;
+        rpci->nwriters = 0;
+        INIT_LIST_HEAD(&rpci->in_upcall);
+        INIT_LIST_HEAD(&rpci->pipe);
+        rpci->pipelen = 0;
+        init_waitqueue_head(&rpci->waitq);
+        INIT_DELAYED_WORK(&rpci->queue_timeout,
+                            rpc_timeout_upcall_queue);
+        rpci->ops = NULL;
 }
 
 int register_rpc_pipefs(void)