@@ -915,7 +915,7 @@ static noinline int prepare_pages(struct inode *inode, struct page **pages,
915
915
unsigned long index = pos >> PAGE_SHIFT ;
916
916
gfp_t mask = get_prepare_gfp_flags (inode , nowait );
917
917
fgf_t fgp_flags = get_prepare_fgp_flags (nowait );
918
- int err = 0 ;
918
+ int ret = 0 ;
919
919
int faili ;
920
920
921
921
for (i = 0 ; i < num_pages ; i ++ ) {
@@ -925,28 +925,28 @@ static noinline int prepare_pages(struct inode *inode, struct page **pages,
925
925
if (!pages [i ]) {
926
926
faili = i - 1 ;
927
927
if (nowait )
928
- err = - EAGAIN ;
928
+ ret = - EAGAIN ;
929
929
else
930
- err = - ENOMEM ;
930
+ ret = - ENOMEM ;
931
931
goto fail ;
932
932
}
933
933
934
- err = set_page_extent_mapped (pages [i ]);
935
- if (err < 0 ) {
934
+ ret = set_page_extent_mapped (pages [i ]);
935
+ if (ret < 0 ) {
936
936
faili = i ;
937
937
goto fail ;
938
938
}
939
939
940
940
if (i == 0 )
941
- err = prepare_uptodate_page (inode , pages [i ], pos ,
941
+ ret = prepare_uptodate_page (inode , pages [i ], pos ,
942
942
force_uptodate );
943
- if (!err && i == num_pages - 1 )
944
- err = prepare_uptodate_page (inode , pages [i ],
943
+ if (!ret && i == num_pages - 1 )
944
+ ret = prepare_uptodate_page (inode , pages [i ],
945
945
pos + write_bytes , false);
946
- if (err ) {
946
+ if (ret ) {
947
947
put_page (pages [i ]);
948
- if (!nowait && err == - EAGAIN ) {
949
- err = 0 ;
948
+ if (!nowait && ret == - EAGAIN ) {
949
+ ret = 0 ;
950
950
goto again ;
951
951
}
952
952
faili = i - 1 ;
@@ -962,7 +962,7 @@ static noinline int prepare_pages(struct inode *inode, struct page **pages,
962
962
put_page (pages [faili ]);
963
963
faili -- ;
964
964
}
965
- return err ;
965
+ return ret ;
966
966
967
967
}
968
968
0 commit comments