Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1765833AbXLUAnW (ORCPT ); Thu, 20 Dec 2007 19:43:22 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1759079AbXLUAnK (ORCPT ); Thu, 20 Dec 2007 19:43:10 -0500 Received: from netops-testserver-3-out.sgi.com ([192.48.171.28]:45539 "EHLO relay.sgi.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1756606AbXLUAnJ (ORCPT ); Thu, 20 Dec 2007 19:43:09 -0500 Date: Fri, 21 Dec 2007 11:42:59 +1100 To: torvalds@linux-foundation.org Cc: linux-kernel@vger.kernel.org, xfs@oss.sgi.com, akpm@linux-foundation.org Subject: [GIT PULL] XFS update for 2.6.24-rc6 User-Agent: nail 11.25 7/29/05 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Message-Id: <20071221004259.8C12858C4C0F@chook.melbourne.sgi.com> From: lachlan@sgi.com (Lachlan McIlroy) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2214 Lines: 56 Please pull from the for-linus branch: git pull git://oss.sgi.com:8090/xfs/xfs-2.6.git for-linus This will update the following files: fs/xfs/linux-2.6/xfs_file.c | 1 + fs/xfs/linux-2.6/xfs_iops.c | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) through these commits: commit 4743e0ec1217fd00f57461ebdd7979d31af18700 Author: Lachlan McIlroy Date: Fri Dec 21 11:00:23 2007 +1100 [XFS] Initialise current offset in xfs_file_readdir correctly After reading the directory contents into the temporary buffer, we grab each dirent and pass it to filldir witht eh current offset of the dirent. The current offset was not being set for the first dirent in the temporary buffer, which coul dresult in bad offsets being set in the f_pos field result in looping and duplicate entries being returned from readdir. SGI-PV: 974905 SGI-Modid: xfs-linux-melb:xfs-kern:30282a Signed-off-by: David Chinner Signed-off-by: Tim Shimmin Signed-off-by: Lachlan McIlroy commit bad60fdd14df32459e31cc75ab681e4458bf25cf Author: Christoph Hellwig Date: Fri Dec 21 10:58:56 2007 +1100 [XFS] Fix mknod regression This was broken by my '[XFS] simplify xfs_create/mknod/symlink prototype', which assigned the re-shuffled ondisk dev_t back to the rdev variable in xfs_vn_mknod. Because of that i_rdev is set to the ondisk dev_t instead of the linux dev_t later down the function. Fortunately the fix for it is trivial: we can just remove the assignment because xfs_revalidate_inode has done the proper job before unlocking the inode. SGI-PV: 974873 SGI-Modid: xfs-linux-melb:xfs-kern:30273a Signed-off-by: Christoph Hellwig Signed-off-by: David Chinner Signed-off-by: Lachlan McIlroy -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/