summaryrefslogtreecommitdiffstats
path: root/fs/nfs
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2008-04-24 07:21:56 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2008-04-25 09:23:25 -0400
commit42faad99658eed7ca8bd328ffa4bcb7d78c9bcca (patch)
tree8b57fb69d1922939c6ba13f512a0ae54a3a171ef /fs/nfs
parent78d31a3a87f84cf56004b7bc154831f2ee1186e8 (diff)
downloadop-kernel-dev-42faad99658eed7ca8bd328ffa4bcb7d78c9bcca.zip
op-kernel-dev-42faad99658eed7ca8bd328ffa4bcb7d78c9bcca.tar.gz
[PATCH] restore sane ->umount_begin() API
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/nfs')
-rw-r--r--fs/nfs/super.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/fs/nfs/super.c b/fs/nfs/super.c
index 20a1cb1..fa220dc 100644
--- a/fs/nfs/super.c
+++ b/fs/nfs/super.c
@@ -198,7 +198,7 @@ static match_table_t nfs_secflavor_tokens = {
};
-static void nfs_umount_begin(struct vfsmount *, int);
+static void nfs_umount_begin(struct super_block *);
static int nfs_statfs(struct dentry *, struct kstatfs *);
static int nfs_show_options(struct seq_file *, struct vfsmount *);
static int nfs_show_stats(struct seq_file *, struct vfsmount *);
@@ -647,13 +647,11 @@ static int nfs_show_stats(struct seq_file *m, struct vfsmount *mnt)
* Begin unmount by attempting to remove all automounted mountpoints we added
* in response to xdev traversals and referrals
*/
-static void nfs_umount_begin(struct vfsmount *vfsmnt, int flags)
+static void nfs_umount_begin(struct super_block *sb)
{
- struct nfs_server *server = NFS_SB(vfsmnt->mnt_sb);
+ struct nfs_server *server = NFS_SB(sb);
struct rpc_clnt *rpc;
- if (!(flags & MNT_FORCE))
- return;
/* -EIO all pending I/O */
rpc = server->client_acl;
if (!IS_ERR(rpc))
OpenPOWER on IntegriCloud