aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSuresh Jayaraman <sjayaraman@suse.de>2010-09-23 14:26:48 -0400
committerTrond Myklebust <Trond.Myklebust@netapp.com>2010-09-23 14:26:48 -0400
commit7c563cc9f3f4aca70c27bd08a135499227f67014 (patch)
treefe83f56f100db15f84bbff2c41539595da9f5e1d
parentef84303ebc77a9041265faaccd56b7fcef151077 (diff)
nfs: show "local_lock" mount option in /proc/mounts
Display the status of 'local_lock' mount option in /proc/mounts. Signed-off-by: Suresh Jayaraman <sjayaraman@suse.de> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
-rw-r--r--fs/nfs/super.c13
1 files changed, 13 insertions, 0 deletions
diff --git a/fs/nfs/super.c b/fs/nfs/super.c
index 2e866d86c220..50ed035cabc4 100644
--- a/fs/nfs/super.c
+++ b/fs/nfs/super.c
@@ -632,6 +632,7 @@ static void nfs_show_mount_options(struct seq_file *m, struct nfs_server *nfss,
632 const struct proc_nfs_info *nfs_infop; 632 const struct proc_nfs_info *nfs_infop;
633 struct nfs_client *clp = nfss->nfs_client; 633 struct nfs_client *clp = nfss->nfs_client;
634 u32 version = clp->rpc_ops->version; 634 u32 version = clp->rpc_ops->version;
635 int local_flock, local_fcntl;
635 636
636 seq_printf(m, ",vers=%u", version); 637 seq_printf(m, ",vers=%u", version);
637 seq_printf(m, ",rsize=%u", nfss->rsize); 638 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,
680 else 681 else
681 seq_printf(m, ",lookupcache=pos"); 682 seq_printf(m, ",lookupcache=pos");
682 } 683 }
684
685 local_flock = nfss->flags & NFS_MOUNT_LOCAL_FLOCK;
686 local_fcntl = nfss->flags & NFS_MOUNT_LOCAL_FCNTL;
687
688 if (!local_flock && !local_fcntl)
689 seq_printf(m, ",local_lock=none");
690 else if (local_flock && local_fcntl)
691 seq_printf(m, ",local_lock=all");
692 else if (local_flock)
693 seq_printf(m, ",local_lock=flock");
694 else
695 seq_printf(m, ",local_lock=posix");
683} 696}
684 697
685/* 698/*