Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

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

diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h
index 8dfd6f24d4884dbdaa024cbea8a7c4b63d2a2af7..c791e5b5a914e087fa5c5a20a3a48d58f7fa4cc0 100644 (file)
--- a/fs/cifs/cifsglob.h
+++ b/fs/cifs/cifsglob.h
@@ -285,6 +285,7 @@ struct cifsTconInfo {
        bool seal:1;      /* transport encryption for this mounted share */
        bool unix_ext:1;  /* if false disable Linux extensions to CIFS protocol
                                for this mount even if server would support */
+       bool local_lease:1; /* check leases (only) on local system not remote */
        /* BB add field for back pointer to sb struct(s)? */
 };
 
@@ -309,6 +310,7 @@ struct cifs_search_info {
        __u32 resume_key;
        char *ntwrk_buf_start;
        char *srch_entries_start;
+       char *last_entry;
        char *presume_name;
        unsigned int resume_name_len;
        bool endOfSearch:1;
@@ -352,6 +354,7 @@ struct cifsInodeInfo {
        bool clientCanCacheRead:1;      /* read oplock */
        bool clientCanCacheAll:1;       /* read and writebehind oplock */
        bool oplockPending:1;
+       bool delete_pending:1;          /* DELETE_ON_CLOSE is set */
        struct inode vfs_inode;
 };