Skip to content

Commit f9ec213

Browse files
Matthew Wilcox (Oracle)brauner
authored andcommitted
orangefs: Unify error & success paths in orangefs_writepages_work()
Both arms of this conditional now have the same loop, so sink it out of the conditional. Signed-off-by: "Matthew Wilcox (Oracle)" <[email protected]> Link: https://lore.kernel.org/r/[email protected] Tested-by: Mike Marshall <[email protected]> Signed-off-by: Christian Brauner <[email protected]>
1 parent 6420f17 commit f9ec213

File tree

1 file changed

+13
-23
lines changed

1 file changed

+13
-23
lines changed

fs/orangefs/inode.c

Lines changed: 13 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -107,33 +107,23 @@ static int orangefs_writepages_work(struct orangefs_writepages *ow,
107107
wr.gid = ow->gid;
108108
ret = wait_for_direct_io(ORANGEFS_IO_WRITE, inode, &off, &iter, ow->len,
109109
0, &wr, NULL, NULL);
110-
if (ret < 0) {
110+
if (ret < 0)
111111
mapping_set_error(ow->mapping, ret);
112-
for (i = 0; i < ow->npages; i++) {
113-
if (PagePrivate(ow->pages[i])) {
114-
wrp = (struct orangefs_write_range *)
115-
page_private(ow->pages[i]);
116-
ClearPagePrivate(ow->pages[i]);
117-
put_page(ow->pages[i]);
118-
kfree(wrp);
119-
}
120-
end_page_writeback(ow->pages[i]);
121-
unlock_page(ow->pages[i]);
122-
}
123-
} else {
112+
else
124113
ret = 0;
125-
for (i = 0; i < ow->npages; i++) {
126-
if (PagePrivate(ow->pages[i])) {
127-
wrp = (struct orangefs_write_range *)
128-
page_private(ow->pages[i]);
129-
ClearPagePrivate(ow->pages[i]);
130-
put_page(ow->pages[i]);
131-
kfree(wrp);
132-
}
133-
end_page_writeback(ow->pages[i]);
134-
unlock_page(ow->pages[i]);
114+
115+
for (i = 0; i < ow->npages; i++) {
116+
if (PagePrivate(ow->pages[i])) {
117+
wrp = (struct orangefs_write_range *)
118+
page_private(ow->pages[i]);
119+
ClearPagePrivate(ow->pages[i]);
120+
put_page(ow->pages[i]);
121+
kfree(wrp);
135122
}
123+
end_page_writeback(ow->pages[i]);
124+
unlock_page(ow->pages[i]);
136125
}
126+
137127
return ret;
138128
}
139129

0 commit comments

Comments
 (0)