Merge tag 'x86_bugs_pbrsb' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

[linux-2.6-microblaze.git] / fs / gfs2 / file.c

diff --git a/fs/gfs2/file.c b/fs/gfs2/file.c
index 2cceb19..892006f 100644 (file)
--- a/fs/gfs2/file.c
+++ b/fs/gfs2/file.c
@@ -780,7 +780,7 @@ static inline bool should_fault_in_pages(struct iov_iter *i,
 
        if (!count)
                return false;
-       if (!iter_is_iovec(i))
+       if (!user_backed_iter(i))
                return false;
 
        size = PAGE_SIZE;
@@ -1066,8 +1066,7 @@ out_unlock:
                gfs2_glock_dq(gh);
 out_uninit:
        gfs2_holder_uninit(gh);
-       if (statfs_gh)
-               kfree(statfs_gh);
+       kfree(statfs_gh);
        from->count = orig_count - written;
        return written ? written : ret;
 }