X-Git-Url: http://git.monstr.eu/?a=blobdiff_plain;f=fs%2Fgfs2%2Ffile.c;h=892006fbbb09f636e632bce3f5b1b4d911eb8e8a;hb=5318b987fe9f3430adb0f5d81d07052fd996835b;hp=2cceb193dcd85f029023293ecc0cc6602576958a;hpb=ce05f30dc3a04ca32f91f9fd2a3de7e0b52b0417;p=linux-2.6-microblaze.git

diff --git a/fs/gfs2/file.c b/fs/gfs2/file.c
index 2cceb193dcd8..892006fbbb09 100644
--- 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;
 }