Merge branch 'topic/hda-beep' into topic/hda

[~andy/linux] / net / sunrpc / clnt.c

diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c
index adf2990acebfd2ff7513f2344f0a143c326eb6ef..f56f045778aedf4a0da1fcf2566eacf69c7c6c8a 100644 (file)
--- a/net/sunrpc/clnt.c
+++ b/net/sunrpc/clnt.c
@@ -127,9 +127,7 @@ static struct dentry *rpc_setup_pipedir_sb(struct super_block *sb,
 {
        static uint32_t clntid;
        char name[15];
-       struct qstr q = {
-               .name = name,
-       };
+       struct qstr q = { .name = name };
        struct dentry *dir, *dentry;
        int error;
 
@@ -1288,6 +1286,8 @@ call_reserveresult(struct rpc_task *task)
        }
 
        switch (status) {
+       case -ENOMEM:
+               rpc_delay(task, HZ >> 2);
        case -EAGAIN:   /* woken up; retry */
                task->tk_action = call_reserve;
                return;