Merge branch 'nfs-for-2.6.36' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6

[firefly-linux-kernel-4.4.55.git] / fs / nfs / internal.h

diff --git a/fs/nfs/internal.h b/fs/nfs/internal.h
index e70f44b9b3f43ff5a837435e886fd73f2372a20c..4c2150d867147fefd1d9239e1fa46931f2a70285 100644 (file)
--- a/fs/nfs/internal.h
+++ b/fs/nfs/internal.h
@@ -370,10 +370,9 @@ unsigned int nfs_page_array_len(unsigned int base, size_t len)
  * Helper for restarting RPC calls in the possible presence of NFSv4.1
  * sessions.
  */
-static inline void nfs_restart_rpc(struct rpc_task *task, const struct nfs_client *clp)
+static inline int nfs_restart_rpc(struct rpc_task *task, const struct nfs_client *clp)
 {
        if (nfs4_has_session(clp))
-               rpc_restart_call_prepare(task);
-       else
-               rpc_restart_call(task);
+               return rpc_restart_call_prepare(task);
+       return rpc_restart_call(task);
 }