Merge branch 'for-4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup

[mirror_ubuntu-artful-kernel.git] / fs / afs / vlclient.c

diff --git a/fs/afs/vlclient.c b/fs/afs/vlclient.c
index 94bcd97d22b86789e5e192b38d450eb784eaedaa..a5e4cc561b6cd52172c3a3f4a9480b2cbae225ab 100644 (file)
--- a/fs/afs/vlclient.c
+++ b/fs/afs/vlclient.c
@@ -147,7 +147,7 @@ int afs_vl_get_entry_by_name(struct in_addr *addr,
                             struct key *key,
                             const char *volname,
                             struct afs_cache_vlocation *entry,
-                            const struct afs_wait_mode *wait_mode)
+                            bool async)
 {
        struct afs_call *call;
        size_t volnamesz, reqsz, padsz;
@@ -177,7 +177,7 @@ int afs_vl_get_entry_by_name(struct in_addr *addr,
                memset((void *) bp + volnamesz, 0, padsz);
 
        /* initiate the call */
-       return afs_make_call(addr, call, GFP_KERNEL, wait_mode);
+       return afs_make_call(addr, call, GFP_KERNEL, async);
 }
 
 /*
@@ -188,7 +188,7 @@ int afs_vl_get_entry_by_id(struct in_addr *addr,
                           afs_volid_t volid,
                           afs_voltype_t voltype,
                           struct afs_cache_vlocation *entry,
-                          const struct afs_wait_mode *wait_mode)
+                          bool async)
 {
        struct afs_call *call;
        __be32 *bp;
@@ -211,5 +211,5 @@ int afs_vl_get_entry_by_id(struct in_addr *addr,
        *bp   = htonl(voltype);
 
        /* initiate the call */
-       return afs_make_call(addr, call, GFP_KERNEL, wait_mode);
+       return afs_make_call(addr, call, GFP_KERNEL, async);
 }