diff --git a/[refs] b/[refs]
index f304effe2d96..78acbc60dfda 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0a5c33e23c4d781ecc815002c54f1f91012c703d
+refs/heads/master: 18d9a2ca2ea1aa963a077fb49e7efcc3b0237a9b
diff --git a/trunk/fs/nfsd/fault_inject.c b/trunk/fs/nfsd/fault_inject.c
index 7a7b079fbdb1..e761ee95617f 100644
--- a/trunk/fs/nfsd/fault_inject.c
+++ b/trunk/fs/nfsd/fault_inject.c
@@ -122,7 +122,7 @@ static ssize_t fault_inject_write(struct file *file, const char __user *buf,
 				  size_t len, loff_t *ppos)
 {
 	char write_buf[INET6_ADDRSTRLEN];
-	size_t size = min(sizeof(write_buf), len) - 1;
+	size_t size = min(sizeof(write_buf) - 1, len);
 	struct net *net = current->nsproxy->net_ns;
 	struct sockaddr_storage sa;
 	u64 val;