@@ -915,7 +915,7 @@ static noinline int prepare_pages(struct inode *inode, struct page **pages,
915915 unsigned long index = pos >> PAGE_SHIFT ;
916916 gfp_t mask = get_prepare_gfp_flags (inode , nowait );
917917 fgf_t fgp_flags = get_prepare_fgp_flags (nowait );
918- int err = 0 ;
918+ int ret = 0 ;
919919 int faili ;
920920
921921 for (i = 0 ; i < num_pages ; i ++ ) {
@@ -925,28 +925,28 @@ static noinline int prepare_pages(struct inode *inode, struct page **pages,
925925 if (!pages [i ]) {
926926 faili = i - 1 ;
927927 if (nowait )
928- err = - EAGAIN ;
928+ ret = - EAGAIN ;
929929 else
930- err = - ENOMEM ;
930+ ret = - ENOMEM ;
931931 goto fail ;
932932 }
933933
934- err = set_page_extent_mapped (pages [i ]);
935- if (err < 0 ) {
934+ ret = set_page_extent_mapped (pages [i ]);
935+ if (ret < 0 ) {
936936 faili = i ;
937937 goto fail ;
938938 }
939939
940940 if (i == 0 )
941- err = prepare_uptodate_page (inode , pages [i ], pos ,
941+ ret = prepare_uptodate_page (inode , pages [i ], pos ,
942942 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 ],
945945 pos + write_bytes , false);
946- if (err ) {
946+ if (ret ) {
947947 put_page (pages [i ]);
948- if (!nowait && err == - EAGAIN ) {
949- err = 0 ;
948+ if (!nowait && ret == - EAGAIN ) {
949+ ret = 0 ;
950950 goto again ;
951951 }
952952 faili = i - 1 ;
@@ -962,7 +962,7 @@ static noinline int prepare_pages(struct inode *inode, struct page **pages,
962962 put_page (pages [faili ]);
963963 faili -- ;
964964 }
965- return err ;
965+ return ret ;
966966
967967}
968968
0 commit comments