diff options
author | Steve French <sfrench@us.ibm.com> | 2010-05-13 22:19:32 +0000 |
---|---|---|
committer | Steve French <sfrench@us.ibm.com> | 2010-05-13 22:19:32 +0000 |
commit | baa456331738b4e76a92318b62b354377a30ad80 (patch) | |
tree | 75c828a7c8a9f1b5f7f41b2e53271eafb7e561ef /fs/cifs/cifsglob.h | |
parent | aa3e5572c538d753dce11bf93532a75f95d22b40 (diff) | |
parent | 4462dc02842698f173f518c1f5ce79c0fb89395a (diff) | |
download | kernel_samsung_tuna-baa456331738b4e76a92318b62b354377a30ad80.zip kernel_samsung_tuna-baa456331738b4e76a92318b62b354377a30ad80.tar.gz kernel_samsung_tuna-baa456331738b4e76a92318b62b354377a30ad80.tar.bz2 |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
fs/cifs/inode.c
Diffstat (limited to 'fs/cifs/cifsglob.h')
-rw-r--r-- | fs/cifs/cifsglob.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h index 4a99487..a88479c 100644 --- a/fs/cifs/cifsglob.h +++ b/fs/cifs/cifsglob.h @@ -507,6 +507,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; |