From: Linus Torvalds Date: Fri, 20 Jul 2012 18:43:53 +0000 (-0700) Subject: Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ce9f8d6b39b0d8f62092477b8d96a835860fb45a;p=linux-beck.git Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd Pull pnfs/ore fixes from Boaz Harrosh: "These are catastrophic fixes to the pnfs objects-layout that were just discovered. They are also destined for @stable. I have found these and worked on them at around RC1 time but unfortunately went to the hospital for kidney stones and had a very slow recovery. I refrained from sending them as is, before proper testing, and surly I have found a bug just yesterday. So now they are all well tested, and have my sign-off. Other then fixing the problem at hand, and assuming there are no bugs at the new code, there is low risk to any surrounding code. And in anyway they affect only these paths that are now broken. That is RAID5 in pnfs objects-layout code. It does also affect exofs (which was not broken) but I have tested exofs and it is lower priority then objects-layout because no one is using exofs, but objects-layout has lots of users." * 'for-linus' of git://git.open-osd.org/linux-open-osd: pnfs-obj: Fix __r4w_get_page when offset is beyond i_size pnfs-obj: don't leak objio_state if ore_write/read fails ore: Unlock r4w pages in exact reverse order of locking ore: Remove support of partial IO request (NFS crash) ore: Fix NFS crash by supporting any unaligned RAID IO --- ce9f8d6b39b0d8f62092477b8d96a835860fb45a