Merge tag 'vexpress-fixes-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-block.git] / fs / ocfs2 / alloc.c

diff --git a/fs/ocfs2/alloc.c b/fs/ocfs2/alloc.c
index f165f867f3326f1c0dce98c4e1d031308fb65c51..d4ec0d8961a6e9dde216bc6ef649a0e7c28f8733 100644 (file)
--- a/fs/ocfs2/alloc.c
+++ b/fs/ocfs2/alloc.c
@@ -5194,7 +5194,7 @@ int ocfs2_change_extent_flag(handle_t *handle,
        rec = &el->l_recs[index];
        if (new_flags && (rec->e_flags & new_flags)) {
                mlog(ML_ERROR, "Owner %llu tried to set %d flags on an "
-                    "extent that already had them",
+                    "extent that already had them\n",
                     (unsigned long long)ocfs2_metadata_cache_owner(et->et_ci),
                     new_flags);
                goto out;
@@ -5202,7 +5202,7 @@ int ocfs2_change_extent_flag(handle_t *handle,
 
        if (clear_flags && !(rec->e_flags & clear_flags)) {
                mlog(ML_ERROR, "Owner %llu tried to clear %d flags on an "
-                    "extent that didn't have them",
+                    "extent that didn't have them\n",
                     (unsigned long long)ocfs2_metadata_cache_owner(et->et_ci),
                     clear_flags);
                goto out;
@@ -5713,8 +5713,7 @@ int ocfs2_remove_btree_range(struct inode *inode,
        struct ocfs2_refcount_tree *ref_tree = NULL;
 
        if ((flags & OCFS2_EXT_REFCOUNTED) && len) {
-               BUG_ON(!(OCFS2_I(inode)->ip_dyn_features &
-                        OCFS2_HAS_REFCOUNT_FL));
+               BUG_ON(!ocfs2_is_refcount_inode(inode));
 
                if (!refcount_tree_locked) {
                        ret = ocfs2_lock_refcount_tree(osb, refcount_loc, 1,
@@ -7293,7 +7292,7 @@ int ocfs2_truncate_inline(struct inode *inode, struct buffer_head *di_bh,
        }
 
        inode->i_blocks = ocfs2_inode_sector_count(inode);
-       inode->i_ctime = inode->i_mtime = CURRENT_TIME;
+       inode->i_ctime = inode->i_mtime = current_time(inode);
 
        di->i_ctime = di->i_mtime = cpu_to_le64(inode->i_ctime.tv_sec);
        di->i_ctime_nsec = di->i_mtime_nsec = cpu_to_le32(inode->i_ctime.tv_nsec);