1 files changed, 64 insertions, 22 deletions

diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
index de7f9168a118..72e4efee1389 100644
--- a/fs/cifs/cifsfs.c
+++ b/fs/cifs/cifsfs.c
@@ -91,6 +91,30 @@ struct workqueue_struct	*cifsiod_wq;
 __u8 cifs_client_guid[SMB2_CLIENT_GUID_SIZE];
 #endif
 
+/*
+ * Bumps refcount for cifs super block.
+ * Note that it should be only called if a referece to VFS super block is
+ * already held, e.g. in open-type syscalls context. Otherwise it can race with
+ * atomic_dec_and_test in deactivate_locked_super.
+ */
+void
+cifs_sb_active(struct super_block *sb)
+{
+        struct cifs_sb_info *server = CIFS_SB(sb);
+
+        if (atomic_inc_return(&server->active) == 1)
+                atomic_inc(&sb->s_active);
+}
+
+void
+cifs_sb_deactive(struct super_block *sb)
+{
+        struct cifs_sb_info *server = CIFS_SB(sb);
+
+        if (atomic_dec_and_test(&server->active))
+                deactivate_super(sb);
+}
+
 static int
 cifs_read_super(struct super_block *sb)
 {
@@ -137,7 +161,7 @@ cifs_read_super(struct super_block *sb)
 
 #ifdef CONFIG_CIFS_NFSD_EXPORT
         if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_SERVER_INUM) {
-                cFYI(1, "export ops supported");
+                cifs_dbg(FYI, "export ops supported\n");
                 sb->s_export_op = &cifs_export_ops;
         }
 #endif /* CONFIG_CIFS_NFSD_EXPORT */
@@ -145,7 +169,7 @@ cifs_read_super(struct super_block *sb)
         return 0;
 
 out_no_root:
-        cERROR(1, "cifs_read_super: get root inode failed");
+        cifs_dbg(VFS, "%s: get root inode failed\n", __func__);
         return rc;
 }
 
@@ -375,13 +399,15 @@ cifs_show_options(struct seq_file *s, struct dentry *root)
                                    (int)(srcaddr->sa_family));
         }
 
-        seq_printf(s, ",uid=%u", cifs_sb->mnt_uid);
+        seq_printf(s, ",uid=%u",
+                   from_kuid_munged(&init_user_ns, cifs_sb->mnt_uid));
         if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_OVERR_UID)
                 seq_printf(s, ",forceuid");
         else
                 seq_printf(s, ",noforceuid");
 
-        seq_printf(s, ",gid=%u", cifs_sb->mnt_gid);
+        seq_printf(s, ",gid=%u",
+                   from_kgid_munged(&init_user_ns, cifs_sb->mnt_gid));
         if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_OVERR_GID)
                 seq_printf(s, ",forcegid");
         else
@@ -436,9 +462,13 @@ cifs_show_options(struct seq_file *s, struct dentry *root)
         if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NO_PERM)
                 seq_printf(s, ",noperm");
         if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_CIFS_BACKUPUID)
-                seq_printf(s, ",backupuid=%u", cifs_sb->mnt_backupuid);
+                seq_printf(s, ",backupuid=%u",
+                           from_kuid_munged(&init_user_ns,
+                                            cifs_sb->mnt_backupuid));
         if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_CIFS_BACKUPGID)
-                seq_printf(s, ",backupgid=%u", cifs_sb->mnt_backupgid);
+                seq_printf(s, ",backupgid=%u",
+                           from_kgid_munged(&init_user_ns,
+                                            cifs_sb->mnt_backupgid));
 
         seq_printf(s, ",rsize=%u", cifs_sb->rsize);
         seq_printf(s, ",wsize=%u", cifs_sb->wsize);
@@ -472,7 +502,7 @@ static void cifs_umount_begin(struct super_block *sb)
         /* cancel_brl_requests(tcon); */ /* BB mark all brl mids as exiting */
         /* cancel_notify_requests(tcon); */
         if (tcon->ses && tcon->ses->server) {
-                cFYI(1, "wake up tasks now - umount begin not complete");
+                cifs_dbg(FYI, "wake up tasks now - umount begin not complete\n");
                 wake_up_all(&tcon->ses->server->request_q);
                 wake_up_all(&tcon->ses->server->response_q);
                 msleep(1); /* yield */
@@ -543,7 +573,7 @@ cifs_get_root(struct smb_vol *vol, struct super_block *sb)
         if (full_path == NULL)
                 return ERR_PTR(-ENOMEM);
 
-        cFYI(1, "Get root dentry for %s", full_path);
+        cifs_dbg(FYI, "Get root dentry for %s\n", full_path);
 
         sep = CIFS_DIR_SEP(cifs_sb);
         dentry = dget(sb->s_root);
@@ -558,6 +588,11 @@ cifs_get_root(struct smb_vol *vol, struct super_block *sb)
                         dentry = ERR_PTR(-ENOENT);
                         break;
                 }
+                if (!S_ISDIR(dir->i_mode)) {
+                        dput(dentry);
+                        dentry = ERR_PTR(-ENOTDIR);
+                        break;
+                }
 
                 /* skip separators */
                 while (*s == sep)
@@ -597,7 +632,7 @@ cifs_do_mount(struct file_system_type *fs_type,
         struct cifs_mnt_data mnt_data;
         struct dentry *root;
 
-        cFYI(1, "Devname: %s flags: %d ", dev_name, flags);
+        cifs_dbg(FYI, "Devname: %s flags: %d\n", dev_name, flags);
 
         volume_info = cifs_get_volume_info((char *)data, dev_name);
         if (IS_ERR(volume_info))
@@ -620,7 +655,8 @@ cifs_do_mount(struct file_system_type *fs_type,
         rc = cifs_mount(cifs_sb, volume_info);
         if (rc) {
                 if (!(flags & MS_SILENT))
-                        cERROR(1, "cifs_mount failed w/return code = %d", rc);
+                        cifs_dbg(VFS, "cifs_mount failed w/return code = %d\n",
+                                 rc);
                 root = ERR_PTR(rc);
                 goto out_mountdata;
         }
@@ -640,7 +676,7 @@ cifs_do_mount(struct file_system_type *fs_type,
         }
 
         if (sb->s_root) {
-                cFYI(1, "Use existing superblock");
+                cifs_dbg(FYI, "Use existing superblock\n");
                 cifs_umount(cifs_sb);
         } else {
                 rc = cifs_read_super(sb);
@@ -656,7 +692,7 @@ cifs_do_mount(struct file_system_type *fs_type,
         if (IS_ERR(root))
                 goto out_super;
 
-        cFYI(1, "dentry root is: %p", root);
+        cifs_dbg(FYI, "dentry root is: %p\n", root);
         goto out;
 
 out_super:
@@ -677,7 +713,7 @@ out_nls:
 static ssize_t cifs_file_aio_write(struct kiocb *iocb, const struct iovec *iov,
                                    unsigned long nr_segs, loff_t pos)
 {
-        struct inode *inode = iocb->ki_filp->f_path.dentry->d_inode;
+        struct inode *inode = file_inode(iocb->ki_filp);
         ssize_t written;
         int rc;
 
@@ -688,7 +724,8 @@ static ssize_t cifs_file_aio_write(struct kiocb *iocb, const struct iovec *iov,
 
         rc = filemap_fdatawrite(inode->i_mapping);
         if (rc)
-                cFYI(1, "cifs_file_aio_write: %d rc on %p inode", rc, inode);
+                cifs_dbg(FYI, "cifs_file_aio_write: %d rc on %p inode\n",
+                         rc, inode);
 
         return written;
 }
@@ -701,7 +738,7 @@ static loff_t cifs_llseek(struct file *file, loff_t offset, int whence)
          */
         if (whence != SEEK_SET && whence != SEEK_CUR) {
                 int rc;
-                struct inode *inode = file->f_path.dentry->d_inode;
+                struct inode *inode = file_inode(file);
 
                 /*
                  * We need to be sure that all dirty pages are written and the
@@ -733,7 +770,7 @@ static int cifs_setlease(struct file *file, long arg, struct file_lock **lease)
 {
         /* note that this is called by vfs setlease with lock_flocks held
            to protect *lease from going away */
-        struct inode *inode = file->f_path.dentry->d_inode;
+        struct inode *inode = file_inode(file);
         struct cifsFileInfo *cfile = file->private_data;
 
         if (!(S_ISREG(inode->i_mode)))
@@ -766,6 +803,7 @@ struct file_system_type cifs_fs_type = {
         .kill_sb = cifs_kill_sb,
         /*  .fs_flags */
 };
+MODULE_ALIAS_FS("cifs");
 const struct inode_operations cifs_dir_inode_ops = {
         .create = cifs_create,
         .atomic_open = cifs_atomic_open,
@@ -994,7 +1032,10 @@ cifs_init_request_bufs(void)
         } else {
                 CIFSMaxBufSize &= 0x1FE00; /* Round size to even 512 byte mult*/
         }
-/*      cERROR(1, "CIFSMaxBufSize %d 0x%x",CIFSMaxBufSize,CIFSMaxBufSize); */
+/*
+        cifs_dbg(VFS, "CIFSMaxBufSize %d 0x%x\n",
+                 CIFSMaxBufSize, CIFSMaxBufSize);
+*/
         cifs_req_cachep = kmem_cache_create("cifs_request",
                                             CIFSMaxBufSize + max_hdr_size, 0,
                                             SLAB_HWCACHE_ALIGN, NULL);
@@ -1005,7 +1046,7 @@ cifs_init_request_bufs(void)
                 cifs_min_rcv = 1;
         else if (cifs_min_rcv > 64) {
                 cifs_min_rcv = 64;
-                cERROR(1, "cifs_min_rcv set to maximum (64)");
+                cifs_dbg(VFS, "cifs_min_rcv set to maximum (64)\n");
         }
 
         cifs_req_poolp = mempool_create_slab_pool(cifs_min_rcv,
@@ -1036,7 +1077,7 @@ cifs_init_request_bufs(void)
                 cifs_min_small = 2;
         else if (cifs_min_small > 256) {
                 cifs_min_small = 256;
-                cFYI(1, "cifs_min_small set to maximum (256)");
+                cifs_dbg(FYI, "cifs_min_small set to maximum (256)\n");
         }
 
         cifs_sm_req_poolp = mempool_create_slab_pool(cifs_min_small,
@@ -1127,10 +1168,11 @@ init_cifs(void)
 
         if (cifs_max_pending < 2) {
                 cifs_max_pending = 2;
-                cFYI(1, "cifs_max_pending set to min of 2");
+                cifs_dbg(FYI, "cifs_max_pending set to min of 2\n");
         } else if (cifs_max_pending > CIFS_MAX_REQ) {
                 cifs_max_pending = CIFS_MAX_REQ;
-                cFYI(1, "cifs_max_pending set to max of %u", CIFS_MAX_REQ);
+                cifs_dbg(FYI, "cifs_max_pending set to max of %u\n",
+                         CIFS_MAX_REQ);
         }
 
         cifsiod_wq = alloc_workqueue("cifsiod", WQ_FREEZABLE|WQ_MEM_RECLAIM, 0);
@@ -1199,7 +1241,7 @@ out_clean_proc:
 static void __exit
 exit_cifs(void)
 {
-        cFYI(DBG2, "exit_cifs");
+        cifs_dbg(NOISY, "exit_cifs\n");
         unregister_filesystem(&cifs_fs_type);
         cifs_dfs_release_automount_timer();
 #ifdef CONFIG_CIFS_ACL