[CIFS] Update thanks/contributor list with Miklos Szeredi

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / fs / cifs / cifsglob.h

diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h
index d3773e57acf99e75aa490f59d89bc18c9a133458..9a3c85bdd77eab8878860972a9d9612b915d03d6 100644 (file)
--- a/fs/cifs/cifsglob.h
+++ b/fs/cifs/cifsglob.h
@@ -110,8 +110,9 @@ enum protocolEnum {
  */
 
 struct TCP_Server_Info {
-       char server_Name[SERVER_NAME_LEN_WITH_NULL];    /* 15 chars + X'20'in 16th */
-       char unicode_server_Name[SERVER_NAME_LEN_WITH_NULL * 2];        /* Unicode version of server_Name */
+       /* 15 character server name + 0x20 16th byte indicating type = srv */
+       char server_RFC1001_name[SERVER_NAME_LEN_WITH_NULL];
+       char unicode_server_Name[SERVER_NAME_LEN_WITH_NULL * 2];
        struct socket *ssocket;
        union {
                struct sockaddr_in sockAddr;
@@ -147,8 +148,10 @@ struct TCP_Server_Info {
        /* (returned on Negotiate */
        int capabilities; /* allow selective disabling of caps by smb sess */
        __u16 timeZone;
+       __u16 CurrentMid;         /* multiplex id - rotating counter */
        char cryptKey[CIFS_CRYPTO_KEY_SIZE];
-       char workstation_RFC1001_name[16]; /* 16th byte is always zero */
+       /* 16th byte of RFC1001 workstation name is always null */
+       char workstation_RFC1001_name[SERVER_NAME_LEN_WITH_NULL];
        __u32 sequence_number; /* needed for CIFS PDU signature */
        char mac_signing_key[CIFS_SESSION_KEY_SIZE + 16]; 
 };
@@ -214,6 +217,7 @@ struct cifsTconInfo {
        atomic_t num_reads;
        atomic_t num_oplock_brks;
        atomic_t num_opens;
+       atomic_t num_closes;
        atomic_t num_deletes;
        atomic_t num_mkdirs;
        atomic_t num_rmdirs;
@@ -222,14 +226,32 @@ struct cifsTconInfo {
        atomic_t num_ffirst;
        atomic_t num_fnext;
        atomic_t num_fclose;
+       atomic_t num_hardlinks;
+       atomic_t num_symlinks;
+       atomic_t num_locks;
+#ifdef CONFIG_CIFS_STATS2
+       unsigned long long time_writes;
+       unsigned long long time_reads;
+       unsigned long long time_opens;
+       unsigned long long time_deletes;
+       unsigned long long time_closes;
+       unsigned long long time_mkdirs;
+       unsigned long long time_rmdirs;
+       unsigned long long time_renames;
+       unsigned long long time_t2renames;
+       unsigned long long time_ffirst;
+       unsigned long long time_fnext;
+       unsigned long long time_fclose;
+#endif /* CONFIG_CIFS_STATS2 */
        __u64    bytes_read;
        __u64    bytes_written;
        spinlock_t stat_lock;
-#endif
+#endif /* CONFIG_CIFS_STATS */
        FILE_SYSTEM_DEVICE_INFO fsDevInfo;
        FILE_SYSTEM_ATTRIBUTE_INFO fsAttrInfo;  /* ok if file system name truncated */
        FILE_SYSTEM_UNIX_INFO fsUnixInfo;
        unsigned retry:1;
+       unsigned nocase:1;
        /* BB add field for back pointer to sb struct? */
 };
 
@@ -317,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 */