Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs

Pull btrfs updates from Chris Mason:
 "This pull is mostly cleanups and fixes:

   - The raid5/6 cleanups from Zhao Lei fixup some long standing warts
     in the code and add improvements on top of the scrubbing support
     from 3.19.

   - Josef has round one of our ENOSPC fixes coming from large btrfs
     clusters here at FB.

   - Dave Sterba continues a long series of cleanups (thanks Dave), and
     Filipe continues hammering on corner cases in fsync and others

  This all was held up a little trying to track down a use-after-free in
  btrfs raid5/6.  It's not clear yet if this is just made easier to
  trigger with this pull or if its a new bug from the raid5/6 cleanups.
  Dave Sterba is the only one to trigger it so far, but he has a
  consistent way to reproduce, so we'll get it nailed shortly"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs: (68 commits)
  Btrfs: don't remove extents and xattrs when logging new names
  Btrfs: fix fsync data loss after adding hard link to inode
  Btrfs: fix BUG_ON in btrfs_orphan_add() when delete unused block group
  Btrfs: account for large extents with enospc
  Btrfs: don't set and clear delalloc for O_DIRECT writes
  Btrfs: only adjust outstanding_extents when we do a short write
  btrfs: Fix out-of-space bug
  Btrfs: scrub, fix sleep in atomic context
  Btrfs: fix scheduler warning when syncing log
  Btrfs: Remove unnecessary placeholder in btrfs_err_code
  btrfs: cleanup init for list in free-space-cache
  btrfs: delete chunk allocation attemp when setting block group ro
  btrfs: clear bio reference after submit_one_bio()
  Btrfs: fix scrub race leading to use-after-free
  Btrfs: add missing cleanup on sysfs init failure
  Btrfs: fix race between transaction commit and empty block group removal
  btrfs: add more checks to btrfs_read_sys_array
  btrfs: cleanup, rename a few variables in btrfs_read_sys_array
  btrfs: add checks for sys_chunk_array sizes
  btrfs: more superblock checks, lower bounds on devices and sectorsize/nodesize
  ...

1 files changed, 22 insertions, 16 deletions

diff --git a/fs/btrfs/delayed-inode.c b/fs/btrfs/delayed-inode.c
index de4e70fb3cbb..82f0c7c95474 100644
--- a/fs/btrfs/delayed-inode.c
+++ b/fs/btrfs/delayed-inode.c
@@ -1755,27 +1755,31 @@ static void fill_stack_inode_item(struct btrfs_trans_handle *trans,
         btrfs_set_stack_inode_flags(inode_item, BTRFS_I(inode)->flags);
         btrfs_set_stack_inode_block_group(inode_item, 0);
 
-        btrfs_set_stack_timespec_sec(btrfs_inode_atime(inode_item),
+        btrfs_set_stack_timespec_sec(&inode_item->atime,
                                      inode->i_atime.tv_sec);
-        btrfs_set_stack_timespec_nsec(btrfs_inode_atime(inode_item),
+        btrfs_set_stack_timespec_nsec(&inode_item->atime,
                                       inode->i_atime.tv_nsec);
 
-        btrfs_set_stack_timespec_sec(btrfs_inode_mtime(inode_item),
+        btrfs_set_stack_timespec_sec(&inode_item->mtime,
                                      inode->i_mtime.tv_sec);
-        btrfs_set_stack_timespec_nsec(btrfs_inode_mtime(inode_item),
+        btrfs_set_stack_timespec_nsec(&inode_item->mtime,
                                       inode->i_mtime.tv_nsec);
 
-        btrfs_set_stack_timespec_sec(btrfs_inode_ctime(inode_item),
+        btrfs_set_stack_timespec_sec(&inode_item->ctime,
                                      inode->i_ctime.tv_sec);
-        btrfs_set_stack_timespec_nsec(btrfs_inode_ctime(inode_item),
+        btrfs_set_stack_timespec_nsec(&inode_item->ctime,
                                       inode->i_ctime.tv_nsec);
+
+        btrfs_set_stack_timespec_sec(&inode_item->otime,
+                                     BTRFS_I(inode)->i_otime.tv_sec);
+        btrfs_set_stack_timespec_nsec(&inode_item->otime,
+                                     BTRFS_I(inode)->i_otime.tv_nsec);
 }
 
 int btrfs_fill_inode(struct inode *inode, u32 *rdev)
 {
         struct btrfs_delayed_node *delayed_node;
         struct btrfs_inode_item *inode_item;
-        struct btrfs_timespec *tspec;
 
         delayed_node = btrfs_get_delayed_node(inode);
         if (!delayed_node)
@@ -1802,17 +1806,19 @@ int btrfs_fill_inode(struct inode *inode, u32 *rdev)
         *rdev = btrfs_stack_inode_rdev(inode_item);
         BTRFS_I(inode)->flags = btrfs_stack_inode_flags(inode_item);
 
-        tspec = btrfs_inode_atime(inode_item);
-        inode->i_atime.tv_sec = btrfs_stack_timespec_sec(tspec);
-        inode->i_atime.tv_nsec = btrfs_stack_timespec_nsec(tspec);
+        inode->i_atime.tv_sec = btrfs_stack_timespec_sec(&inode_item->atime);
+        inode->i_atime.tv_nsec = btrfs_stack_timespec_nsec(&inode_item->atime);
+
+        inode->i_mtime.tv_sec = btrfs_stack_timespec_sec(&inode_item->mtime);
+        inode->i_mtime.tv_nsec = btrfs_stack_timespec_nsec(&inode_item->mtime);
 
-        tspec = btrfs_inode_mtime(inode_item);
-        inode->i_mtime.tv_sec = btrfs_stack_timespec_sec(tspec);
-        inode->i_mtime.tv_nsec = btrfs_stack_timespec_nsec(tspec);
+        inode->i_ctime.tv_sec = btrfs_stack_timespec_sec(&inode_item->ctime);
+        inode->i_ctime.tv_nsec = btrfs_stack_timespec_nsec(&inode_item->ctime);
 
-        tspec = btrfs_inode_ctime(inode_item);
-        inode->i_ctime.tv_sec = btrfs_stack_timespec_sec(tspec);
-        inode->i_ctime.tv_nsec = btrfs_stack_timespec_nsec(tspec);
+        BTRFS_I(inode)->i_otime.tv_sec =
+                btrfs_stack_timespec_sec(&inode_item->otime);
+        BTRFS_I(inode)->i_otime.tv_nsec =
+                btrfs_stack_timespec_nsec(&inode_item->otime);
 
         inode->i_generation = BTRFS_I(inode)->generation;
         BTRFS_I(inode)->index_cnt = (u64)-1;