git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-2.6.34-incoming' into for-2.6.35-incoming
[pandora-kernel.git]
/
fs
/
cifs
/
cifsglob.h
diff --git
a/fs/cifs/cifsglob.h
b/fs/cifs/cifsglob.h
index
ecf0ffb
..
0c2fd17
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;