commit a8a8a669ea13d792296737505adc43ccacf3a648 Merge: 931ed94 a7d73d8 Author: Linus Torvalds Date: Thu Nov 19 20:29:34 2009 -0800 Merge branch 'i2c-pnx-fixes' of git://git.fluff.org/bjdooks/linux * 'i2c-pnx-fixes' of git://git.fluff.org/bjdooks/linux: i2c: i2c-pnx: Added missing mach/i2c.h and linux/io.h header file includes i2c: i2c-pnx: Made buf type unsigned to prevent sign extension i2c: i2c-pnx: Limit minimum jiffie timeout to 2 commit 931ed94430e36b9bea3904572424116092ba5663 Merge: 648f4e3 7aee47b Author: Linus Torvalds Date: Thu Nov 19 20:29:05 2009 -0800 Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2 * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2: ocfs2: Trivial cleanup of jbd compatibility layer removal ocfs2: Refresh documentation ocfs2: return f_fsid info in ocfs2_statfs() ocfs2: duplicate inline data properly during reflink. ocfs2: Move ocfs2_complete_reflink to the right place. ocfs2: Return -EINVAL when a device is not ocfs2. commit a7d73d8c686d919cc18dec63e5e194f0e5a7206e Author: Kevin Wells Date: Thu Nov 12 00:25:52 2009 +0100 i2c: i2c-pnx: Added missing mach/i2c.h and linux/io.h header file includes Added missing mach/i2c.h and linux/io.h header file includes Signed-off-by: Kevin Wells Signed-off-by: Ben Dooks commit 4ced24c8973f79113444d1e00ee8bd9e74fbf43e Author: Kevin Wells Date: Thu Nov 12 00:23:00 2009 +0100 i2c: i2c-pnx: Made buf type unsigned to prevent sign extension Made buf type unsigned to prevent sign extension Signed-off-by: Kevin Wells Signed-off-by: Ben Dooks commit b2f125bcf5eac41a6d74f75ac573b77753213b74 Author: Kevin Wells Date: Thu Nov 12 00:28:13 2009 +0100 i2c: i2c-pnx: Limit minimum jiffie timeout to 2 Limit minimum jiffie timeout to 2 to prevent early timeout on systems with low tick rates Signed-off-by: Kevin Wells Signed-off-by: Ben Dooks commit 7aee47b0bb9f93baecdbea205e878fe0f155f7da Author: Sunil Mushran Date: Fri Nov 6 14:50:22 2009 -0800 ocfs2: Trivial cleanup of jbd compatibility layer removal Mainline commit 53ef99cad9878f02f27bb30bc304fc42af8bdd6e removed the JBD compatibility layer from OCFS2. This patch removes the last remaining remnants of that. Signed-off-by: Sunil Mushran Signed-off-by: Joel Becker commit 7ab8f5244d6a8695688a91c8a3f6d3f40356ff97 Author: Sunil Mushran Date: Mon Nov 2 13:38:10 2009 -0800 ocfs2: Refresh documentation Signed-off-by: Sunil Mushran Signed-off-by: Joel Becker commit 837711f862bb71ac263837a0f0714dd8cc4ef7ea Author: Coly Li Date: Fri Jan 16 16:33:05 2009 +0800 ocfs2: return f_fsid info in ocfs2_statfs() Currently the f_fsid of struct kstatfs returned from ocfs2_statfs() is undefined (vfs layer fills in 0 as default). Since in some conditions, f_fsid value might be used in a (f_fsid, ino) pair to uniquely identify a file, ocfs2 should return a unique defined f_fsid value from ocfs2_statfs(). Because uuid_str is the same on big or litlle endian machine, it's endian consistent to use osb->uuid_str to generate f_fsid value. Signed-off-by: Coly Li Cc: Sunil Mushran Cc: Mark Fasheh Signed-off-by: Joel Becker commit 2f48d593b6ceb7bb63d34124ceba77d33be298cf Author: Tao Ma Date: Thu Oct 15 11:10:49 2009 +0800 ocfs2: duplicate inline data properly during reflink. The old reflink fails to handle inodes with inline data and will oops if it encounters them. This patch copies inline data to the new inode. Extended attributes may still be refcounted. Signed-off-by: Tao Ma Signed-off-by: Joel Becker Tested-by: Tristan Ye commit 87f4b1bb98696e6cf84f57df7de41f28c2a7dbeb Author: Tao Ma Date: Thu Oct 15 11:10:48 2009 +0800 ocfs2: Move ocfs2_complete_reflink to the right place. As its name ocfs2_complete_reflink indicates, it should be called after all the work for reflink is done, so it really should be called after we reflink xattr successfully. Signed-off-by: Tao Ma Signed-off-by: Joel Becker Tested-by: Tristan Ye commit fb5cbe9efd741b16e72133613747f76490bbecd3 Author: Joel Becker Date: Wed Oct 28 22:28:24 2009 -0700 ocfs2: Return -EINVAL when a device is not ocfs2. In case of non-modular kernels the root filesystem is mounted by trying several filesystems. If ocfs2 was tried before the actual filesystem type, the mount would fail because ocfs2_sb_probe() returns -EAGAIN instead of -EINVAL. ocfs2 will now return -EINVAL properly. Signed-off-by: Joel Becker Reported-by: Laszlo Attila Toth