nfsctl: switch to simple_recursive_removal()

	Use simple_recursive_removal() in nfsd_client_rmdir() rather than
open-coding it.  And use less heavy-handed locking to get from nfsctl
inode to its ->i_private...

Reviewed-by: Jeff Layton <jlayton@redhat.com>
Tested-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c
index 3e15b72f421d4c104574728ae75b2dc16cf38015..50df5e9d00698c2076dcd1b9a09b5a3efa3a7ead 100644 (file)
--- a/fs/nfsd/nfsctl.c
+++ b/fs/nfsd/nfsctl.c
@@ -1236,63 +1236,34 @@ static inline void _nfsd_symlink(struct dentry *parent, const char *name,
 
 #endif
 
-static void clear_ncl(struct inode *inode)
+static void clear_ncl(struct dentry *dentry)
 {
+       struct inode *inode = d_inode(dentry);
        struct nfsdfs_client *ncl = inode->i_private;
 
+       spin_lock(&inode->i_lock);
        inode->i_private = NULL;
+       spin_unlock(&inode->i_lock);
        kref_put(&ncl->cl_ref, ncl->cl_release);
 }
 
-static struct nfsdfs_client *__get_nfsdfs_client(struct inode *inode)
-{
-       struct nfsdfs_client *nc = inode->i_private;
-
-       if (nc)
-               kref_get(&nc->cl_ref);
-       return nc;
-}
-
 struct nfsdfs_client *get_nfsdfs_client(struct inode *inode)
 {
        struct nfsdfs_client *nc;
 
-       inode_lock_shared(inode);
-       nc = __get_nfsdfs_client(inode);
-       inode_unlock_shared(inode);
+       spin_lock(&inode->i_lock);
+       nc = inode->i_private;
+       if (nc)
+               kref_get(&nc->cl_ref);
+       spin_unlock(&inode->i_lock);
        return nc;
 }
-/* from __rpc_unlink */
-static void nfsdfs_remove_file(struct inode *dir, struct dentry *dentry)
-{
-       int ret;
-
-       clear_ncl(d_inode(dentry));
-       dget(dentry);
-       ret = simple_unlink(dir, dentry);
-       d_drop(dentry);
-       fsnotify_unlink(dir, dentry);
-       dput(dentry);
-       WARN_ON_ONCE(ret);
-}
-
-static void nfsdfs_remove_files(struct dentry *root)
-{
-       struct dentry *dentry, *tmp;
-
-       list_for_each_entry_safe(dentry, tmp, &root->d_subdirs, d_child) {
-               if (!simple_positive(dentry)) {
-                       WARN_ON_ONCE(1); /* I think this can't happen? */
-                       continue;
-               }
-               nfsdfs_remove_file(d_inode(root), dentry);
-       }
-}
 
 /* XXX: cut'n'paste from simple_fill_super; figure out if we could share
  * code instead. */
 static  int nfsdfs_create_files(struct dentry *root,
                                const struct tree_descr *files,
+                               struct nfsdfs_client *ncl,
                                struct dentry **fdentries)
 {
        struct inode *dir = d_inode(root);
@@ -1311,8 +1282,9 @@ static  int nfsdfs_create_files(struct dentry *root,
                        dput(dentry);
                        goto out;
                }
+               kref_get(&ncl->cl_ref);
                inode->i_fop = files->ops;
-               inode->i_private = __get_nfsdfs_client(dir);
+               inode->i_private = ncl;
                d_add(dentry, inode);
                fsnotify_create(dir, dentry);
                if (fdentries)
@@ -1321,7 +1293,6 @@ static  int nfsdfs_create_files(struct dentry *root,
        inode_unlock(dir);
        return 0;
 out:
-       nfsdfs_remove_files(root);
        inode_unlock(dir);
        return -ENOMEM;
 }
@@ -1341,7 +1312,7 @@ struct dentry *nfsd_client_mkdir(struct nfsd_net *nn,
        dentry = nfsd_mkdir(nn->nfsd_client_dir, ncl, name);
        if (IS_ERR(dentry)) /* XXX: tossing errors? */
                return NULL;
-       ret = nfsdfs_create_files(dentry, files, fdentries);
+       ret = nfsdfs_create_files(dentry, files, ncl, fdentries);
        if (ret) {
                nfsd_client_rmdir(dentry);
                return NULL;
@@ -1352,20 +1323,7 @@ struct dentry *nfsd_client_mkdir(struct nfsd_net *nn,
 /* Taken from __rpc_rmdir: */
 void nfsd_client_rmdir(struct dentry *dentry)
 {
-       struct inode *dir = d_inode(dentry->d_parent);
-       struct inode *inode = d_inode(dentry);
-       int ret;
-
-       inode_lock(dir);
-       nfsdfs_remove_files(dentry);
-       clear_ncl(inode);
-       dget(dentry);
-       ret = simple_rmdir(dir, dentry);
-       WARN_ON_ONCE(ret);
-       d_drop(dentry);
-       fsnotify_rmdir(dir, dentry);
-       dput(dentry);
-       inode_unlock(dir);
+       simple_recursive_removal(dentry, clear_ncl);
 }
 
 static int nfsd_fill_super(struct super_block *sb, struct fs_context *fc)