---

yaml
---
r: 217055
b: refs/heads/master
c: 7c563cc
h: refs/heads/master
i:
  217053: 15411a4
  217051: 555b526
  217047: e56db31
  217039: 0c0f075
  217023: 72f3656
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ef84303ebc77a9041265faaccd56b7fcef151077
+refs/heads/master: 7c563cc9f3f4aca70c27bd08a135499227f67014

trunk/fs/nfs/super.c

@@ -632,6 +632,7 @@ static void nfs_show_mount_options(struct seq_file *m, struct nfs_server *nfss,
 	const struct proc_nfs_info *nfs_infop;
 	struct nfs_client *clp = nfss->nfs_client;
 	u32 version = clp->rpc_ops->version;
+	int local_flock, local_fcntl;
 
 	seq_printf(m, ",vers=%u", version);
 	seq_printf(m, ",rsize=%u", nfss->rsize);
@@ -680,6 +681,18 @@ static void nfs_show_mount_options(struct seq_file *m, struct nfs_server *nfss,
 		else
 			seq_printf(m, ",lookupcache=pos");
 	}
+
+	local_flock = nfss->flags & NFS_MOUNT_LOCAL_FLOCK;
+	local_fcntl = nfss->flags & NFS_MOUNT_LOCAL_FCNTL;
+
+	if (!local_flock && !local_fcntl)
+		seq_printf(m, ",local_lock=none");
+	else if (local_flock && local_fcntl)
+		seq_printf(m, ",local_lock=all");
+	else if (local_flock)
+		seq_printf(m, ",local_lock=flock");
+	else
+		seq_printf(m, ",local_lock=posix");
 }
 
 /*