4 files changed, 58 insertions, 96 deletions

diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h
index f143975627e0..9a3c85bdd77e 100644
--- a/fs/cifs/cifsglob.h
+++ b/fs/cifs/cifsglob.h
@@ -339,6 +339,34 @@ static inline const char CIFS_DIR_SEP(const struct cifs_sb_info *cifs_sb)
                 return '\\';
 }
 
+#ifdef CONFIG_CIFS_STATS
+#define cifs_stats_inc atomic_inc
+
+static inline void cifs_stats_bytes_written(struct cifsTconInfo *tcon,
+                                            unsigned int bytes)
+{
+        if (bytes) {
+                spin_lock(&tcon->stat_lock);
+                tcon->bytes_written += bytes;
+                spin_unlock(&tcon->stat_lock);
+        }
+}
+
+static inline void cifs_stats_bytes_read(struct cifsTconInfo *tcon,
+                                         unsigned int bytes)
+{
+        spin_lock(&tcon->stat_lock);
+        tcon->bytes_read += bytes;
+        spin_unlock(&tcon->stat_lock);
+}
+#else
+
+#define  cifs_stats_inc(field) do {} while(0)
+#define  cifs_stats_bytes_written(tcon, bytes) do {} while(0)
+#define  cifs_stats_bytes_read(tcon, bytes) do {} while(0)
+
+#endif
+
 /* one of these for every pending CIFS request to the server */
 struct mid_q_entry {
         struct list_head qhead; /* mids waiting on reply from this server */
diff --git a/fs/cifs/cifssmb.c b/fs/cifs/cifssmb.c
index 811ab3dffafa..698cdcebca04 100644
--- a/fs/cifs/cifssmb.c
+++ b/fs/cifs/cifssmb.c
@@ -166,11 +166,9 @@ small_smb_init(int smb_command, int wct, struct cifsTconInfo *tcon,
 
         header_assemble((struct smb_hdr *) *request_buf, smb_command, tcon,wct);
 
-#ifdef CONFIG_CIFS_STATS
-        if(tcon != NULL) {
-                atomic_inc(&tcon->num_smbs_sent);
-        }
-#endif /* CONFIG_CIFS_STATS */
+        if(tcon != NULL)
+                cifs_stats_inc(&tcon->num_smbs_sent);
+
         return rc;
 }  
 
@@ -269,11 +267,9 @@ smb_init(int smb_command, int wct, struct cifsTconInfo *tcon,
         header_assemble((struct smb_hdr *) *request_buf, smb_command, tcon,
                         wct /*wct */ );
 
-#ifdef CONFIG_CIFS_STATS
-        if(tcon != NULL) {
-                atomic_inc(&tcon->num_smbs_sent);
-        }
-#endif /* CONFIG_CIFS_STATS */
+        if(tcon != NULL)
+                cifs_stats_inc(&tcon->num_smbs_sent);
+
         return rc;
 }
 
@@ -584,9 +580,7 @@ DelFileRetry:
         pSMB->ByteCount = cpu_to_le16(name_len + 1);
         rc = SendReceive(xid, tcon->ses, (struct smb_hdr *) pSMB,
                          (struct smb_hdr *) pSMBr, &bytes_returned, 0);
-#ifdef CONFIG_CIFS_STATS
-        atomic_inc(&tcon->num_deletes);
-#endif
+        cifs_stats_inc(&tcon->num_deletes);
         if (rc) {
                 cFYI(1, ("Error in RMFile = %d", rc));
         } 
@@ -631,9 +625,7 @@ RmDirRetry:
         pSMB->ByteCount = cpu_to_le16(name_len + 1);
         rc = SendReceive(xid, tcon->ses, (struct smb_hdr *) pSMB,
                          (struct smb_hdr *) pSMBr, &bytes_returned, 0);
-#ifdef CONFIG_CIFS_STATS
-        atomic_inc(&tcon->num_rmdirs);
-#endif
+        cifs_stats_inc(&tcon->num_rmdirs);
         if (rc) {
                 cFYI(1, ("Error in RMDir = %d", rc));
         }
@@ -677,9 +669,7 @@ MkDirRetry:
         pSMB->ByteCount = cpu_to_le16(name_len + 1);
         rc = SendReceive(xid, tcon->ses, (struct smb_hdr *) pSMB,
                          (struct smb_hdr *) pSMBr, &bytes_returned, 0);
-#ifdef CONFIG_CIFS_STATS
-        atomic_inc(&tcon->num_mkdirs);
-#endif
+        cifs_stats_inc(&tcon->num_mkdirs);
         if (rc) {
                 cFYI(1, ("Error in Mkdir = %d", rc));
         }
@@ -767,9 +757,7 @@ openRetry:
         /* long_op set to 1 to allow for oplock break timeouts */
         rc = SendReceive(xid, tcon->ses, (struct smb_hdr *) pSMB,
                          (struct smb_hdr *) pSMBr, &bytes_returned, 1);
-#ifdef CONFIG_CIFS_STATS
-        atomic_inc(&tcon->num_opens);
-#endif
+        cifs_stats_inc(&tcon->num_opens);
         if (rc) {
                 cFYI(1, ("Error in Open = %d", rc));
         } else {
@@ -833,9 +821,7 @@ CIFSSMBRead(const int xid, struct cifsTconInfo *tcon,
 
         rc = SendReceive(xid, tcon->ses, (struct smb_hdr *) pSMB,
                          (struct smb_hdr *) pSMBr, &bytes_returned, 0);
-#ifdef CONFIG_CIFS_STATS
-        atomic_inc(&tcon->num_reads);
-#endif  
+        cifs_stats_inc(&tcon->num_reads);
         if (rc) {
                 cERROR(1, ("Send error in read = %d", rc));
         } else {
@@ -938,9 +924,7 @@ CIFSSMBWrite(const int xid, struct cifsTconInfo *tcon,
 
         rc = SendReceive(xid, tcon->ses, (struct smb_hdr *) pSMB,
                          (struct smb_hdr *) pSMBr, &bytes_returned, long_op);
-#ifdef CONFIG_CIFS_STATS
-        atomic_inc(&tcon->num_writes);
-#endif
+        cifs_stats_inc(&tcon->num_writes);
         if (rc) {
                 cFYI(1, ("Send error in write = %d", rc));
                 *nbytes = 0;
@@ -1013,9 +997,7 @@ CIFSSMBWrite2(const int xid, struct cifsTconInfo *tcon,
 
         rc = SendReceive2(xid, tcon->ses, (struct smb_hdr *) pSMB, smb_hdr_len,
                           buf, bytes_sent, &bytes_returned, long_op);
-#ifdef CONFIG_CIFS_STATS
-        atomic_inc(&tcon->num_writes);
-#endif
+        cifs_stats_inc(&tcon->num_writes);
         if (rc) {
                 cFYI(1, ("Send error in write = %d", rc));
                 *nbytes = 0;
@@ -1091,9 +1073,7 @@ CIFSSMBLock(const int xid, struct cifsTconInfo *tcon,
 
         rc = SendReceive(xid, tcon->ses, (struct smb_hdr *) pSMB,
                          (struct smb_hdr *) pSMBr, &bytes_returned, timeout);
-#ifdef CONFIG_CIFS_STATS
-        atomic_inc(&tcon->num_locks);
-#endif
+        cifs_stats_inc(&tcon->num_locks);
         if (rc) {
                 cFYI(1, ("Send error in Lock = %d", rc));
         }
@@ -1127,9 +1107,7 @@ CIFSSMBClose(const int xid, struct cifsTconInfo *tcon, int smb_file_id)
         pSMB->ByteCount = 0;
         rc = SendReceive(xid, tcon->ses, (struct smb_hdr *) pSMB,
                          (struct smb_hdr *) pSMBr, &bytes_returned, 0);
-#ifdef CONFIG_CIFS_STATS
-        atomic_inc(&tcon->num_closes);
-#endif 
+        cifs_stats_inc(&tcon->num_closes);
         if (rc) {
                 if(rc!=-EINTR) {
                         /* EINTR is expected when user ctl-c to kill app */
@@ -1202,9 +1180,7 @@ renameRetry:
 
         rc = SendReceive(xid, tcon->ses, (struct smb_hdr *) pSMB,
                          (struct smb_hdr *) pSMBr, &bytes_returned, 0);
-#ifdef CONFIG_CIFS_STATS
-        atomic_inc(&tcon->num_renames);
-#endif
+        cifs_stats_inc(&tcon->num_renames);
         if (rc) {
                 cFYI(1, ("Send error in rename = %d", rc));
         } 
@@ -1283,9 +1259,7 @@ int CIFSSMBRenameOpenFile(const int xid,struct cifsTconInfo *pTcon,
         pSMB->ByteCount = cpu_to_le16(byte_count);
         rc = SendReceive(xid, pTcon->ses, (struct smb_hdr *) pSMB,
                          (struct smb_hdr *) pSMBr, &bytes_returned, 0);
-#ifdef CONFIG_CIFS_STATS
-        atomic_inc(&pTcon->num_t2renames);
-#endif 
+        cifs_stats_inc(&pTcon->num_t2renames);
         if (rc) {
                 cFYI(1,("Send error in Rename (by file handle) = %d", rc));
         }
@@ -1443,9 +1417,7 @@ createSymLinkRetry:
         pSMB->ByteCount = cpu_to_le16(byte_count);
         rc = SendReceive(xid, tcon->ses, (struct smb_hdr *) pSMB,
                          (struct smb_hdr *) pSMBr, &bytes_returned, 0);
-#ifdef CONFIG_CIFS_STATS
-        atomic_inc(&tcon->num_symlinks);
-#endif
+        cifs_stats_inc(&tcon->num_symlinks);
         if (rc) {
                 cFYI(1,
                      ("Send error in SetPathInfo (create symlink) = %d",
@@ -1535,9 +1507,7 @@ createHardLinkRetry:
         pSMB->ByteCount = cpu_to_le16(byte_count);
         rc = SendReceive(xid, tcon->ses, (struct smb_hdr *) pSMB,
                          (struct smb_hdr *) pSMBr, &bytes_returned, 0);
-#ifdef CONFIG_CIFS_STATS
-        atomic_inc(&tcon->num_hardlinks);
-#endif
+        cifs_stats_inc(&tcon->num_hardlinks);
         if (rc) {
                 cFYI(1, ("Send error in SetPathInfo (hard link) = %d", rc));
         }
@@ -1608,9 +1578,7 @@ winCreateHardLinkRetry:
 
         rc = SendReceive(xid, tcon->ses, (struct smb_hdr *) pSMB,
                          (struct smb_hdr *) pSMBr, &bytes_returned, 0);
-#ifdef CONFIG_CIFS_STATS
-        atomic_inc(&tcon->num_hardlinks);
-#endif
+        cifs_stats_inc(&tcon->num_hardlinks);
         if (rc) {
                 cFYI(1, ("Send error in hard link (NT rename) = %d", rc));
         }
@@ -2490,9 +2458,7 @@ findUniqueRetry:
         if (rc) {
                 cFYI(1, ("Send error in FindFileDirInfo = %d", rc));
         } else {                /* decode response */
-#ifdef CONFIG_CIFS_STATS
-                atomic_inc(&tcon->num_ffirst);
-#endif
+                cifs_stats_inc(&tcon->num_ffirst);
                 /* BB fill in */
         }
 
@@ -2592,9 +2558,7 @@ findFirstRetry:
 
         rc = SendReceive(xid, tcon->ses, (struct smb_hdr *) pSMB,
                          (struct smb_hdr *) pSMBr, &bytes_returned, 0);
-#ifdef CONFIG_CIFS_STATS
-        atomic_inc(&tcon->num_ffirst);
-#endif
+        cifs_stats_inc(&tcon->num_ffirst);
 
         if (rc) {/* BB add logic to retry regular search if Unix search rejected unexpectedly by server */
                 /* BB Add code to handle unsupported level rc */
@@ -2716,9 +2680,7 @@ int CIFSFindNext(const int xid, struct cifsTconInfo *tcon,
                                                                                               
         rc = SendReceive(xid, tcon->ses, (struct smb_hdr *) pSMB,
                         (struct smb_hdr *) pSMBr, &bytes_returned, 0);
-#ifdef CONFIG_CIFS_STATS
-        atomic_inc(&tcon->num_fnext);
-#endif                                                                                          
+        cifs_stats_inc(&tcon->num_fnext);
         if (rc) {
                 if (rc == -EBADF) {
                         psrch_inf->endOfSearch = TRUE;
@@ -2795,9 +2757,7 @@ CIFSFindClose(const int xid, struct cifsTconInfo *tcon, const __u16 searchHandle
         if (rc) {
                 cERROR(1, ("Send error in FindClose = %d", rc));
         }
-#ifdef CONFIG_CIFS_STATS
-        atomic_inc(&tcon->num_fclose);
-#endif
+        cifs_stats_inc(&tcon->num_fclose);
         cifs_small_buf_release(pSMB);
 
         /* Since session is dead, search handle closed on server already */
diff --git a/fs/cifs/file.c b/fs/cifs/file.c
index b054df2dee1e..5857d12611e6 100644
--- a/fs/cifs/file.c
+++ b/fs/cifs/file.c
@@ -744,13 +744,7 @@ ssize_t cifs_user_write(struct file *file, const char __user *write_data,
                                     15 seconds is plenty */
         }
 
-#ifdef CONFIG_CIFS_STATS
-        if (total_written > 0) {
-                spin_lock(&pTcon->stat_lock);
-                pTcon->bytes_written += total_written;
-                spin_unlock(&pTcon->stat_lock);
-        }
-#endif          
+        cifs_stats_bytes_written(pTcon, total_written);
 
         /* since the write may have blocked check these pointers again */
         if (file->f_dentry) {
@@ -878,13 +872,7 @@ static ssize_t cifs_write(struct file *file, const char *write_data,
                                     15 seconds is plenty */
         }
 
-#ifdef CONFIG_CIFS_STATS
-        if (total_written > 0) {
-                spin_lock(&pTcon->stat_lock);
-                pTcon->bytes_written += total_written;
-                spin_unlock(&pTcon->stat_lock);
-        }
-#endif          
+        cifs_stats_bytes_written(pTcon, total_written);
 
         /* since the write may have blocked check these pointers again */
         if (file->f_dentry) {
@@ -1245,11 +1233,7 @@ ssize_t cifs_user_read(struct file *file, char __user *read_data,
                                 return rc;
                         }
                 } else {
-#ifdef CONFIG_CIFS_STATS
-                        spin_lock(&pTcon->stat_lock);
-                        pTcon->bytes_read += total_read;
-                        spin_unlock(&pTcon->stat_lock);
-#endif
+                        cifs_stats_bytes_read(pTcon, bytes_read);
                         *poffset += bytes_read;
                 }
         }
@@ -1312,11 +1296,7 @@ static ssize_t cifs_read(struct file *file, char *read_data, size_t read_size,
                                 return rc;
                         }
                 } else {
-#ifdef CONFIG_CIFS_STATS
-                        spin_lock(&pTcon->stat_lock);
-                        pTcon->bytes_read += total_read;
-                        spin_unlock(&pTcon->stat_lock);
-#endif
+                        cifs_stats_bytes_read(pTcon, total_read);
                         *poffset += bytes_read;
                 }
         }
@@ -1488,11 +1468,7 @@ static int cifs_readpages(struct file *file, struct address_space *mapping,
                                 le16_to_cpu(pSMBr->DataOffset), &lru_pvec);
 
                         i +=  bytes_read >> PAGE_CACHE_SHIFT;
-#ifdef CONFIG_CIFS_STATS
-                        spin_lock(&pTcon->stat_lock);
-                        pTcon->bytes_read += bytes_read;
-                        spin_unlock(&pTcon->stat_lock);
-#endif
+                        cifs_stats_bytes_read(pTcon, bytes_read);
                         if ((int)(bytes_read & PAGE_CACHE_MASK) != bytes_read) {
                                 i++; /* account for partial page */
 
diff --git a/fs/cifs/misc.c b/fs/cifs/misc.c
index 40d50b77bfe7..fafbdbfa63a1 100644
--- a/fs/cifs/misc.c
+++ b/fs/cifs/misc.c
@@ -520,9 +520,7 @@ is_valid_oplock_break(struct smb_hdr *buf)
         list_for_each(tmp, &GlobalTreeConnectionList) {
                 tcon = list_entry(tmp, struct cifsTconInfo, cifsConnectionList);
                 if (tcon->tid == buf->Tid) {
-#ifdef CONFIG_CIFS_STATS
-                        atomic_inc(&tcon->num_oplock_brks);
-#endif
+                        cifs_stats_inc(&tcon->num_oplock_brks);
                         list_for_each(tmp1,&tcon->openFileList){
                                 netfile = list_entry(tmp1,struct cifsFileInfo,
                                                      tlist);