2007-01-29 20:05:15

by Mark Fasheh

Subject: [git patches] ocfs2 fixes

Hi Linus,
I made a silly error in my last upstream push. This patch makes
ocfs2 build again.
--Mark

Please pull from 'upstream-linus' branch of
git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2.git upstream-linus

to receive the following updates:

fs/ocfs2/ocfs2_fs.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

Mark Fasheh:
ocfs2: fix thinko in ocfs2_backup_super_blkno()

diff --git a/fs/ocfs2/ocfs2_fs.h b/fs/ocfs2/ocfs2_fs.h
index c99e905..e61e218 100644
--- a/fs/ocfs2/ocfs2_fs.h
+++ b/fs/ocfs2/ocfs2_fs.h
@@ -587,7 +587,7 @@ static inline u64 ocfs2_backup_super_blk

if (index >= 0 && index < OCFS2_MAX_BACKUP_SUPERBLOCKS) {
offset <<= (2 * index);
- offset /= sb->s_blocksize;
+ offset >>= sb->s_blocksize_bits;
return offset;
}

2007-01-29 21:19:34

by Mark Fasheh

Subject: Re: [Ocfs2-devel] [git patches] ocfs2 fixes

On Mon, Jan 29, 2007 at 12:04:59PM -0800, Mark Fasheh wrote:
> Hi Linus,
> I made a silly error in my last upstream push. This patch makes
> ocfs2 build again.

Ok, never mind - I just noticed that you directly applied my patch on
Friday. Thanks!
--Mark

--
Mark Fasheh
Senior Software Developer, Oracle
[email protected]