Merge tag 'driver-core-4.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[mirror_ubuntu-artful-kernel.git] / fs / nfsd / nfs4layouts.c

diff --git a/fs/nfsd/nfs4layouts.c b/fs/nfsd/nfs4layouts.c
index 1fc07a9c70e9c6028342e8c97d183dfe914a343b..e122da696f1b17abc1befa94b95f3a9396d52757 100644 (file)
--- a/fs/nfsd/nfs4layouts.c
+++ b/fs/nfsd/nfs4layouts.c
@@ -614,6 +614,7 @@ nfsd4_cb_layout_fail(struct nfs4_layout_stateid *ls)
 {
        struct nfs4_client *clp = ls->ls_stid.sc_client;
        char addr_str[INET6_ADDRSTRLEN];
+       static char const nfsd_recall_failed[] = "/sbin/nfsd-recall-failed";
        static char *envp[] = {
                "HOME=/",
                "TERM=linux",
@@ -629,12 +630,13 @@ nfsd4_cb_layout_fail(struct nfs4_layout_stateid *ls)
                "nfsd: client %s failed to respond to layout recall. "
                "  Fencing..\n", addr_str);
 
-       argv[0] = "/sbin/nfsd-recall-failed";
+       argv[0] = (char *)nfsd_recall_failed;
        argv[1] = addr_str;
        argv[2] = ls->ls_file->f_path.mnt->mnt_sb->s_id;
        argv[3] = NULL;
 
-       error = call_usermodehelper(argv[0], argv, envp, UMH_WAIT_PROC);
+       error = call_usermodehelper(nfsd_recall_failed, argv, envp,
+                                   UMH_WAIT_PROC);
        if (error) {
                printk(KERN_ERR "nfsd: fence failed for client %s: %d!\n",
                        addr_str, error);