From patchwork Mon Dec 20 11:54:28 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kirill A. Shutemov" X-Patchwork-Id: 420591 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oBKBxjlp008235 for ; Mon, 20 Dec 2010 11:59:46 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932444Ab0LTL7L (ORCPT ); Mon, 20 Dec 2010 06:59:11 -0500 Received: from shutemov.name ([188.40.19.243]:38436 "EHLO shutemov.name" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757247Ab0LTLym (ORCPT ); Mon, 20 Dec 2010 06:54:42 -0500 Received: by shutemov.name (Postfix, from userid 500) id F3F34D4214; Mon, 20 Dec 2010 13:54:40 +0200 (EET) From: "Kirill A. Shutsemov" To: Trond Myklebust , "J. Bruce Fields" , Neil Brown Cc: Pavel Emelyanov , linux-nfs@vger.kernel.org, "David S. Miller" , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, "Kirill A. Shutemov" Subject: [PATCH 02/12] sunrpc: introduce init_rpc_pipefs Date: Mon, 20 Dec 2010 13:54:28 +0200 Message-Id: <1292846078-31793-3-git-send-email-kirill@shutemov.name> X-Mailer: git-send-email 1.7.2.3 In-Reply-To: <1292846078-31793-1-git-send-email-kirill@shutemov.name> References: <1292846078-31793-1-git-send-email-kirill@shutemov.name> Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Mon, 20 Dec 2010 11:59:46 +0000 (UTC) diff --git a/fs/nfs/cache_lib.c b/fs/nfs/cache_lib.c index 8469031..dd7ca5f 100644 --- a/fs/nfs/cache_lib.c +++ b/fs/nfs/cache_lib.c @@ -117,7 +117,7 @@ int nfs_cache_register(struct cache_detail *cd) struct vfsmount *mnt; int ret; - mnt = rpc_get_mount(); + mnt = mntget(init_rpc_pipefs); if (IS_ERR(mnt)) return PTR_ERR(mnt); ret = vfs_path_lookup(mnt->mnt_root, mnt, "/cache", 0, &nd); @@ -129,13 +129,13 @@ int nfs_cache_register(struct cache_detail *cd) if (!ret) return ret; err: - rpc_put_mount(); + mntput(mnt); return ret; } void nfs_cache_unregister(struct cache_detail *cd) { sunrpc_cache_unregister_pipefs(cd); - rpc_put_mount(); + mntput(init_rpc_pipefs); } diff --git a/include/linux/sunrpc/rpc_pipe_fs.h b/include/linux/sunrpc/rpc_pipe_fs.h index cf14db9..b09bfa5 100644 --- a/include/linux/sunrpc/rpc_pipe_fs.h +++ b/include/linux/sunrpc/rpc_pipe_fs.h @@ -44,6 +44,8 @@ RPC_I(struct inode *inode) return container_of(inode, struct rpc_inode, vfs_inode); } +extern struct vfsmount *init_rpc_pipefs; + extern int rpc_queue_upcall(struct inode *, struct rpc_pipe_msg *); struct rpc_clnt; @@ -60,8 +62,6 @@ extern void rpc_remove_cache_dir(struct dentry *); extern struct dentry *rpc_mkpipe(struct dentry *, const char *, void *, const struct rpc_pipe_ops *, int flags); extern int rpc_unlink(struct dentry *); -extern struct vfsmount *rpc_get_mount(void); -extern void rpc_put_mount(void); extern int register_rpc_pipefs(void); extern void unregister_rpc_pipefs(void); diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c index 92ce94f..da2507a 100644 --- a/net/sunrpc/clnt.c +++ b/net/sunrpc/clnt.c @@ -112,9 +112,7 @@ rpc_setup_pipedir(struct rpc_clnt *clnt, char *dir_name) if (dir_name == NULL) return 0; - path.mnt = rpc_get_mount(); - if (IS_ERR(path.mnt)) - return PTR_ERR(path.mnt); + path.mnt = mntget(init_rpc_pipefs); error = vfs_path_lookup(path.mnt->mnt_root, path.mnt, dir_name, 0, &nd); if (error) goto err; @@ -140,7 +138,7 @@ rpc_setup_pipedir(struct rpc_clnt *clnt, char *dir_name) err_path_put: path_put(&nd.path); err: - rpc_put_mount(); + mntput(path.mnt); return error; } @@ -251,7 +249,7 @@ static struct rpc_clnt * rpc_new_client(const struct rpc_create_args *args, stru out_no_auth: if (!IS_ERR(clnt->cl_path.dentry)) { rpc_remove_client_dir(clnt->cl_path.dentry); - rpc_put_mount(); + mntput(clnt->cl_path.mnt); } out_no_path: kfree(clnt->cl_principal); @@ -472,7 +470,7 @@ rpc_free_client(struct rpc_clnt *clnt) clnt->cl_protname, clnt->cl_server); if (!IS_ERR(clnt->cl_path.dentry)) { rpc_remove_client_dir(clnt->cl_path.dentry); - rpc_put_mount(); + mntput(clnt->cl_path.mnt); } if (clnt->cl_parent != clnt) { rpc_release_client(clnt->cl_parent); diff --git a/net/sunrpc/rpc_pipe.c b/net/sunrpc/rpc_pipe.c index 7f3fbdd..b1e299b 100644 --- a/net/sunrpc/rpc_pipe.c +++ b/net/sunrpc/rpc_pipe.c @@ -28,9 +28,10 @@ #include #include -static struct vfsmount *rpc_mnt __read_mostly; +struct vfsmount *init_rpc_pipefs __read_mostly; static struct file_system_type rpc_pipe_fs_type; +EXPORT_SYMBOL_GPL(init_rpc_pipefs); static struct kmem_cache *rpc_inode_cachep __read_mostly; @@ -412,18 +413,6 @@ struct rpc_filelist { umode_t mode; }; -struct vfsmount *rpc_get_mount(void) -{ - return mntget(rpc_mnt); -} -EXPORT_SYMBOL_GPL(rpc_get_mount); - -void rpc_put_mount(void) -{ - mntput(rpc_mnt); -} -EXPORT_SYMBOL_GPL(rpc_put_mount); - static int rpc_delete_dentry(struct dentry *dentry) { return 1; @@ -1060,9 +1049,9 @@ int register_rpc_pipefs(void) if (err) goto destroy_cache; - rpc_mnt = kern_mount(&rpc_pipe_fs_type); - if (IS_ERR(rpc_mnt)) { - err = PTR_ERR(rpc_mnt); + init_rpc_pipefs = kern_mount(&rpc_pipe_fs_type); + if (IS_ERR(init_rpc_pipefs)) { + err = PTR_ERR(init_rpc_pipefs); goto unregister_fs; } @@ -1077,7 +1066,7 @@ destroy_cache: void unregister_rpc_pipefs(void) { - mntput(rpc_mnt); + mntput(init_rpc_pipefs); kmem_cache_destroy(rpc_inode_cachep); unregister_filesystem(&rpc_pipe_fs_type); }