From patchwork Wed Jan 23 09:58:18 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: fanchaoting X-Patchwork-Id: 2023301 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 55A0BDF280 for ; Wed, 23 Jan 2013 09:58:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753773Ab3AWJ6A (ORCPT ); Wed, 23 Jan 2013 04:58:00 -0500 Received: from cn.fujitsu.com ([222.73.24.84]:28010 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1753972Ab3AWJ57 (ORCPT ); Wed, 23 Jan 2013 04:57:59 -0500 X-IronPort-AV: E=Sophos;i="4.84,521,1355068800"; d="scan'208";a="6635023" Received: from unknown (HELO tang.cn.fujitsu.com) ([10.167.250.3]) by song.cn.fujitsu.com with ESMTP; 23 Jan 2013 17:55:50 +0800 Received: from fnstmail02.fnst.cn.fujitsu.com (tang.cn.fujitsu.com [127.0.0.1]) by tang.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id r0N9vuwo004481; Wed, 23 Jan 2013 17:57:56 +0800 Received: from [127.0.0.1] ([10.167.225.240]) by fnstmail02.fnst.cn.fujitsu.com (Lotus Domino Release 8.5.3) with ESMTP id 2013012317570133-1116916 ; Wed, 23 Jan 2013 17:57:01 +0800 Message-ID: <50FFB43A.8030105@cn.fujitsu.com> Date: Wed, 23 Jan 2013 17:58:18 +0800 From: fanchaoting User-Agent: Thunderbird 2.0.0.9 (Windows/20071031) MIME-Version: 1.0 To: "bfields@fieldses.org" CC: "linux-nfs@vger.kernel.org" Subject: [PATCH] nfsd: Check the nfsd support version when enable or disable the minorversion X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/01/23 17:57:01, Serialize by Router on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/01/23 17:57:01, Serialize complete at 2013/01/23 17:57:01 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org when enable or disable the minorversion throw /proc/fs/nfsd/versions,it should check the support version. for example if we do like following: echo "+2 +3 +4 +7.1">/proc/fs/nfsd/versions echo "+2 +3 +4 -7.1">/proc/fs/nfsd/versions it will enable or disable nfs4.1, but now the number nfs7 didn't support. Signed-off-by: Fan Chaoting --- fs/nfsd/nfsctl.c | 2 +- fs/nfsd/nfsd.h | 1 + fs/nfsd/nfssvc.c | 4 ++++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c index dab350d..1a6e89c 100644 --- a/fs/nfsd/nfsctl.c +++ b/fs/nfsd/nfsctl.c @@ -532,7 +532,7 @@ static ssize_t __write_versions(struct file *file, char *buf, size_t size) else num = simple_strtol(vers, &minorp, 0); if (*minorp == '.') { - if (num < 4) + if (num < 4 || num >= nfsd_number_vers()) return -EINVAL; minor = simple_strtoul(minorp+1, NULL, 0); if (minor == 0) diff --git a/fs/nfsd/nfsd.h b/fs/nfsd/nfsd.h index 80d5ce4..c9d7203 100644 --- a/fs/nfsd/nfsd.h +++ b/fs/nfsd/nfsd.h @@ -104,6 +104,7 @@ int nfsd_vers(int vers, enum vers_op change); int nfsd_minorversion(u32 minorversion, enum vers_op change); void nfsd_reset_versions(void); int nfsd_create_serv(void); +int nfsd_number_vers(void); extern int nfsd_max_blksize; diff --git a/fs/nfsd/nfssvc.c b/fs/nfsd/nfssvc.c index 2013aa00..072cdb9 100644 --- a/fs/nfsd/nfssvc.c +++ b/fs/nfsd/nfssvc.c @@ -670,3 +670,7 @@ int nfsd_pool_stats_release(struct inode *inode, struct file *file) mutex_unlock(&nfsd_mutex); return ret; } + +int nfsd_number_vers(void) { + return NFSD_NRVERS; +}