From 24adf84dbef17c8ca19bfb700837ef2f253d7622 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Fri, 17 Jun 2011 09:32:10 -0400 Subject: [PATCH] --- yaml --- r: 254041 b: refs/heads/master c: 98ab494dd1d25388981114057cf9446250cc7dc7 h: refs/heads/master i: 254039: 5c4d5eec9129f79b548cb1854485eaa13eded664 v: v3 --- [refs] | 2 +- trunk/fs/cifs/cifsfs.c | 19 +------------------ 2 files changed, 2 insertions(+), 19 deletions(-) diff --git a/[refs] b/[refs] index 6e1690df688f..9c9f04375ff4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 97d1152acec0647b72f8c6ecc57da0d6fed574de +refs/heads/master: 98ab494dd1d25388981114057cf9446250cc7dc7 diff --git a/trunk/fs/cifs/cifsfs.c b/trunk/fs/cifs/cifsfs.c index 4004bc647a72..15de4561dbc5 100644 --- a/trunk/fs/cifs/cifsfs.c +++ b/trunk/fs/cifs/cifsfs.c @@ -163,30 +163,14 @@ cifs_read_super(struct super_block *sb) if (inode) iput(inode); - cifs_umount(cifs_sb); return rc; } -static void -cifs_put_super(struct super_block *sb) -{ - int rc = 0; - struct cifs_sb_info *cifs_sb; - - cFYI(1, "In cifs_put_super"); - cifs_sb = CIFS_SB(sb); - if (cifs_sb == NULL) { - cFYI(1, "Empty cifs superblock info passed to unmount"); - return; - } - - cifs_umount(cifs_sb); -} - static void cifs_kill_sb(struct super_block *sb) { struct cifs_sb_info *cifs_sb = CIFS_SB(sb); kill_anon_super(sb); + cifs_umount(cifs_sb); kfree(cifs_sb->mountdata); unload_nls(cifs_sb->local_nls); kfree(cifs_sb); @@ -537,7 +521,6 @@ static int cifs_drop_inode(struct inode *inode) } static const struct super_operations cifs_super_ops = { - .put_super = cifs_put_super, .statfs = cifs_statfs, .alloc_inode = cifs_alloc_inode, .destroy_inode = cifs_destroy_inode,