1 files changed, 3 insertions, 12 deletions

diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
index fcc434227691..a04b17e5a9d0 100644
--- a/fs/cifs/cifsfs.c
+++ b/fs/cifs/cifsfs.c
@@ -204,9 +204,8 @@ cifs_put_super(struct super_block *sb)
                 return;
         }
         rc = cifs_umount(sb, cifs_sb);
-        if (rc) {
+        if (rc)
                 cERROR(1, ("cifs_umount failed with return code %d", rc));
-        }
 #ifdef CONFIG_CIFS_DFS_UPCALL
         if (cifs_sb->mountdata) {
                 kfree(cifs_sb->mountdata);
@@ -461,7 +460,7 @@ int cifs_xstate_get(struct super_block *sb, struct fs_quota_stat *qstats)
 
 static struct quotactl_ops cifs_quotactl_ops = {
         .set_xquota     = cifs_xquota_set,
-        .get_xquota     = cifs_xquota_set,
+        .get_xquota     = cifs_xquota_get,
         .set_xstate     = cifs_xstate_set,
         .get_xstate     = cifs_xstate_get,
 };
@@ -472,9 +471,7 @@ static void cifs_umount_begin(struct vfsmount *vfsmnt, int flags)
         struct cifs_sb_info *cifs_sb;
         struct cifsTconInfo *tcon;
 
-#ifdef CONFIG_CIFS_DFS_UPCALL
         dfs_shrink_umount_helper(vfsmnt);
-#endif /* CONFIG CIFS_DFS_UPCALL */
 
         if (!(flags & MNT_FORCE))
                 return;
@@ -992,9 +989,7 @@ static int __init
 init_cifs(void)
 {
         int rc = 0;
-#ifdef CONFIG_PROC_FS
         cifs_proc_init();
-#endif
 /*      INIT_LIST_HEAD(&GlobalServerList);*/    /* BB not implemented yet */
         INIT_LIST_HEAD(&GlobalSMBSessionList);
         INIT_LIST_HEAD(&GlobalTreeConnectionList);
@@ -1095,19 +1090,15 @@ init_cifs(void)
  out_destroy_inodecache:
         cifs_destroy_inodecache();
  out_clean_proc:
-#ifdef CONFIG_PROC_FS
         cifs_proc_clean();
-#endif
         return rc;
 }
 
 static void __exit
 exit_cifs(void)
 {
-        cFYI(0, ("exit_cifs"));
-#ifdef CONFIG_PROC_FS
+        cFYI(DBG2, ("exit_cifs"));
         cifs_proc_clean();
-#endif
 #ifdef CONFIG_CIFS_DFS_UPCALL
         unregister_key_type(&key_type_dns_resolver);
 #endif