Merge git://git.kernel.org/pub/scm/linux/kernel/git/joern/logfs

[sfrench/cifs-2.6.git] / fs / cifs / cifsglob.h

diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h
index ecf0ffbe2b6420799149a7721c92a1111c4fa9ba..0c2fd17439c8c5246fb01e460f46820d3b8eb0c1 100644 (file)
--- a/fs/cifs/cifsglob.h
+++ b/fs/cifs/cifsglob.h
@@ -502,6 +502,7 @@ struct dfs_info3_param {
 #define CIFS_FATTR_DFS_REFERRAL                0x1
 #define CIFS_FATTR_DELETE_PENDING      0x2
 #define CIFS_FATTR_NEED_REVAL          0x4
+#define CIFS_FATTR_INO_COLLISION       0x8
 
 struct cifs_fattr {
        u32             cf_flags;