diff options
author | Paul Mundt <lethal@linux-sh.org> | 2010-08-20 20:52:23 +0900 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2010-08-20 20:52:23 +0900 |
commit | b9afa3e015273a52718e0a7efe198a0df76be880 (patch) | |
tree | 88cf67276533fcd5622d4cc2165ba889a98bb0db /fs/nfs/super.c | |
parent | 144c7494239f12d554806439a17ad8203c7b2d3a (diff) | |
parent | 763008c4357b73c8d18396dfd8d79dc58fa3f99d (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
arch/sh/kernel/process_32.c
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'fs/nfs/super.c')
-rw-r--r-- | fs/nfs/super.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/fs/nfs/super.c b/fs/nfs/super.c index ee26316ad1f..ec3966e4706 100644 --- a/fs/nfs/super.c +++ b/fs/nfs/super.c @@ -655,6 +655,13 @@ static void nfs_show_mount_options(struct seq_file *m, struct nfs_server *nfss, if (nfss->options & NFS_OPTION_FSCACHE) seq_printf(m, ",fsc"); + + if (nfss->flags & NFS_MOUNT_LOOKUP_CACHE_NONEG) { + if (nfss->flags & NFS_MOUNT_LOOKUP_CACHE_NONE) + seq_printf(m, ",lookupcache=none"); + else + seq_printf(m, ",lookupcache=pos"); + } } /* |