Merge tag 'nfs-for-5.6-1' of git://git.linux-nfs.org/projects/anna/linux-nfs

[linux.git] / fs / udf / udf_i.h

diff --git a/fs/udf/udf_i.h b/fs/udf/udf_i.h
index 2ef0e212f08a3d55ce25b8c6e34843a03fa5f88c..4245d1f632589d557de419c3f4961dbf3cfbb8ab 100644 (file)
--- a/fs/udf/udf_i.h
+++ b/fs/udf/udf_i.h
@@ -38,16 +38,20 @@ struct udf_inode_info {
        __u32                   i_next_alloc_block;
        __u32                   i_next_alloc_goal;
        __u32                   i_checkpoint;
+       __u32                   i_extraPerms;
        unsigned                i_alloc_type : 3;
        unsigned                i_efe : 1;      /* extendedFileEntry */
        unsigned                i_use : 1;      /* unallocSpaceEntry */
        unsigned                i_strat4096 : 1;
-       unsigned                reserved : 26;
+       unsigned                i_streamdir : 1;
+       unsigned                reserved : 25;
        union {
                struct short_ad *i_sad;
                struct long_ad          *i_lad;
                __u8            *i_data;
        } i_ext;
+       struct kernel_lb_addr   i_locStreamdir;
+       __u64                   i_lenStreams;
        struct rw_semaphore     i_data_sem;
        struct udf_ext_cache cached_extent;
        /* Spinlock for protecting extent cache */