Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb

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

diff --git a/fs/cifs/cifs_fs_sb.h b/fs/cifs/cifs_fs_sb.h
index ec00d61d53080b1b5e771ba3b0d0d2a83ce6e30a..fd1e52ebcee6c8fd1bc1a365ebc33353b0f7c4e4 100644 (file)
--- a/fs/cifs/cifs_fs_sb.h
+++ b/fs/cifs/cifs_fs_sb.h
@@ -24,6 +24,10 @@
 #define CIFS_MOUNT_DIRECT_IO    8 /* do not write nor read through page cache */
 #define CIFS_MOUNT_NO_XATTR  0x10 /* if set - disable xattr support */
 #define CIFS_MOUNT_MAP_SPECIAL_CHR 0x20 /* remap illegal chars in filenames */
+#define CIFS_MOUNT_POSIX_PATHS 0x40 /* Negotiate posix pathnames if possible. */
+#define CIFS_MOUNT_UNX_EMUL    0x80 /* Network compat with SFUnix emulation */
+#define CIFS_MOUNT_NO_BRL      0x100 /* No sending byte range locks to srv */
+#define CIFS_MOUNT_CIFS_ACL    0x200 /* send ACL requests to non-POSIX srv */
 
 struct cifs_sb_info {
        struct cifsTconInfo *tcon;      /* primary mount */
@@ -36,5 +40,7 @@ struct cifs_sb_info {
        mode_t  mnt_file_mode;
        mode_t  mnt_dir_mode;
        int     mnt_cifs_flags;
+       int     prepathlen;
+       char *  prepath;
 };
 #endif                         /* _CIFS_FS_SB_H */