2 files changed, 4 insertions, 2 deletions

diff --git a/fs/cifs/misc.c b/fs/cifs/misc.c
index 654d972a88f4..88786ba02d27 100644
--- a/fs/cifs/misc.c
+++ b/fs/cifs/misc.c
@@ -311,8 +311,6 @@ header_assemble(struct smb_hdr *buffer, char smb_command /* command */ ,
         buffer->Flags2 = SMBFLG2_KNOWS_LONG_NAMES;
         buffer->Pid = cpu_to_le16((__u16)current->tgid);
         buffer->PidHigh = cpu_to_le16((__u16)(current->tgid >> 16));
-        spin_lock(&GlobalMid_Lock);
-        spin_unlock(&GlobalMid_Lock);
         if (treeCon) {
                 buffer->Tid = treeCon->tid;
                 if (treeCon->ses) {
diff --git a/fs/ioctl.c b/fs/ioctl.c
index 33a6b7ecb8b8..d152856c371b 100644
--- a/fs/ioctl.c
+++ b/fs/ioctl.c
@@ -226,6 +226,8 @@ static int ioctl_fiemap(struct file *filp, unsigned long arg)
         return error;
 }
 
+#ifdef CONFIG_BLOCK
+
 #define blk_to_logical(inode, blk) (blk << (inode)->i_blkbits)
 #define logical_to_blk(inode, offset) (offset >> (inode)->i_blkbits);
 
@@ -342,6 +344,8 @@ int generic_block_fiemap(struct inode *inode,
 }
 EXPORT_SYMBOL(generic_block_fiemap);
 
+#endif  /*  CONFIG_BLOCK  */
+
 static int file_ioctl(struct file *filp, unsigned int cmd,
                 unsigned long arg)
 {