[PATCH] nfsd: sign conversion obscuring errors in nfsd_set_posix_acl()

[linux-2.6-omap-h63xx.git] / fs / cifs / cifsglob.h

diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h
index 862e403ff211ad28608fe1a6421bdb1534e2e793..006eb33bff5ff7e6a576b5804e95ec22eb50bb52 100644 (file)
--- a/fs/cifs/cifsglob.h
+++ b/fs/cifs/cifsglob.h
@@ -1,7 +1,7 @@
 /*
  *   fs/cifs/cifsglob.h
  *
- *   Copyright (C) International Business Machines  Corp., 2002,2005
+ *   Copyright (C) International Business Machines  Corp., 2002,2006
  *   Author(s): Steve French (sfrench@us.ibm.com)
  *
  *   This library is free software; you can redistribute it and/or modify
@@ -233,6 +233,8 @@ struct cifsTconInfo {
        atomic_t num_hardlinks;
        atomic_t num_symlinks;
        atomic_t num_locks;
+       atomic_t num_acl_get;
+       atomic_t num_acl_set;
 #ifdef CONFIG_CIFS_STATS2
        unsigned long long time_writes;
        unsigned long long time_reads;
@@ -428,6 +430,15 @@ struct dir_notify_req {
 #define   CIFS_LARGE_BUFFER     2
 #define   CIFS_IOVEC            4    /* array of response buffers */
 
+/* Type of session setup needed */
+#define   CIFS_PLAINTEXT       0
+#define   CIFS_LANMAN          1
+#define   CIFS_NTLM            2
+#define   CIFS_NTLMSSP_NEG     3
+#define   CIFS_NTLMSSP_AUTH    4
+#define   CIFS_SPNEGO_INIT     5
+#define   CIFS_SPNEGO_TARG     6
+
 /*
  *****************************************************************
  * All constants go here