Merge branch 'for-linus' of git://git.kernel.dk/linux-block

[linux-2.6-microblaze.git] / drivers / block / nbd.c

diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index 6b98ec2..e9e2a9e 100644 (file)
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -381,7 +381,7 @@ static int sock_xmit(struct nbd_device *nbd, int index, int send,
                        *sent += result;
        } while (msg_data_left(&msg));
 
-       tsk_restore_flags(current, pflags, PF_MEMALLOC);
+       current_restore_flags(pflags, PF_MEMALLOC);
 
        return result;
 }
@@ -1661,7 +1661,7 @@ again:
                                goto out;
                        }
                        ret = nla_parse_nested(socks, NBD_SOCK_MAX, attr,
-                                              nbd_sock_policy);
+                                              nbd_sock_policy, info->extack);
                        if (ret != 0) {
                                printk(KERN_ERR "nbd: error processing sock list\n");
                                ret = -EINVAL;
@@ -1817,7 +1817,7 @@ static int nbd_genl_reconfigure(struct sk_buff *skb, struct genl_info *info)
                                goto out;
                        }
                        ret = nla_parse_nested(socks, NBD_SOCK_MAX, attr,
-                                              nbd_sock_policy);
+                                              nbd_sock_policy, info->extack);
                        if (ret != 0) {
                                printk(KERN_ERR "nbd: error processing sock list\n");
                                ret = -EINVAL;