Merge branch 'work.splice_read' of git://git.kernel.org/pub/scm/linux/kernel/git...

[cascardo/linux.git] / drivers / staging / lustre / lustre / llite / vvp_internal.h

diff --git a/drivers/staging/lustre/lustre/llite/vvp_internal.h b/drivers/staging/lustre/lustre/llite/vvp_internal.h
index 2fa49cc..4464ad2 100644 (file)
--- a/drivers/staging/lustre/lustre/llite/vvp_internal.h
+++ b/drivers/staging/lustre/lustre/llite/vvp_internal.h
@@ -203,11 +203,12 @@ struct vvp_object {
        struct list_head        vob_pending_list;
 
        /**
-        * Access this counter is protected by inode->i_sem. Now that
-        * the lifetime of transient pages must be covered by inode sem,
-        * we don't need to hold any lock..
+        * Number of transient pages.  This is no longer protected by i_sem,
+        * and needs to be atomic.  This is not actually used for anything,
+        * and can probably be removed.
         */
-       int                     vob_transient_pages;
+       atomic_t                vob_transient_pages;
+
        /**
         * Number of outstanding mmaps on this file.
         *
@@ -233,9 +234,9 @@ struct vvp_object {
  */
 struct vvp_page {
        struct cl_page_slice vpg_cl;
-       int               vpg_defer_uptodate;
-       int               vpg_ra_used;
-       int               vpg_write_queued;
+       unsigned int    vpg_defer_uptodate:1,
+                       vpg_ra_used:1,
+                       vpg_write_queued:1;
        /**
         * Non-empty iff this page is already counted in
         * vvp_object::vob_pending_list. This list is only used as a flag,