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

[powerpc.git] / fs / ntfs / volume.h

diff --git a/fs/ntfs/volume.h b/fs/ntfs/volume.h
index 62be73a..375cd20 100644 (file)
--- a/fs/ntfs/volume.h
+++ b/fs/ntfs/volume.h
@@ -125,6 +125,10 @@ typedef struct {
        /* $Quota stuff is NTFS3.0+ specific.  Unused/NULL otherwise. */
        struct inode *quota_ino;        /* The VFS inode of $Quota. */
        struct inode *quota_q_ino;      /* Attribute inode for $Quota/$Q. */
+       /* $UsnJrnl stuff is NTFS3.0+ specific.  Unused/NULL otherwise. */
+       struct inode *usnjrnl_ino;      /* The VFS inode of $UsnJrnl. */
+       struct inode *usnjrnl_max_ino;  /* Attribute inode for $UsnJrnl/$Max. */
+       struct inode *usnjrnl_j_ino;    /* Attribute inode for $UsnJrnl/$J. */
 #endif /* NTFS_RW */
        struct nls_table *nls_map;
 } ntfs_volume;
@@ -141,6 +145,7 @@ typedef enum {
                                      file names in WIN32 namespace. */
        NV_LogFileEmpty,        /* 1: $LogFile journal is empty. */
        NV_QuotaOutOfDate,      /* 1: $Quota is out of date. */
+       NV_UsnJrnlStamped,      /* 1: $UsnJrnl has been stamped. */
        NV_SparseEnabled,       /* 1: May create sparse files. */
 } ntfs_volume_flags;
 
@@ -168,6 +173,7 @@ NVOL_FNS(ShowSystemFiles)
 NVOL_FNS(CaseSensitive)
 NVOL_FNS(LogFileEmpty)
 NVOL_FNS(QuotaOutOfDate)
+NVOL_FNS(UsnJrnlStamped)
 NVOL_FNS(SparseEnabled)
 
 #endif /* _LINUX_NTFS_VOLUME_H */