Cluster Project branch, RHEL4, updated. gfs-kernel_2_6_9_76-84-gc272e73

[rpeterso@sourceware.org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Cluster Project".

http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=c272e736b0b3990954eb757f9cb41f9ef0810eb6

The branch, RHEL4 has been updated
       via  c272e736b0b3990954eb757f9cb41f9ef0810eb6 (commit)
      from  978bcc9692281b816a56dd4589acbcb7dd5d95ac (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit c272e736b0b3990954eb757f9cb41f9ef0810eb6
Author: Bob Peterson <rpeterso@redhat.com>
Date:   Mon Jun 2 13:35:20 2008 -0500

    Resolves: bz 449330: stat() syscall on a file returns id of
    diapered device in st_dev

-----------------------------------------------------------------------

Summary of changes:
 gfs-kernel/src/gfs/ops_inode.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/gfs-kernel/src/gfs/ops_inode.c b/gfs-kernel/src/gfs/ops_inode.c
index 0e49679..7fc1941 100644
--- a/gfs-kernel/src/gfs/ops_inode.c
+++ b/gfs-kernel/src/gfs/ops_inode.c
@@ -29,6 +29,7 @@
 #include "gfs.h"
 #include "acl.h"
 #include "bmap.h"
+#include "diaper.h"
 #include "dio.h"
 #include "dir.h"
 #include "eaops.h"
@@ -1647,6 +1648,7 @@ gfs_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat)
 	struct inode *inode = dentry->d_inode;
 	struct gfs_inode *ip = vn2ip(inode);
 	struct gfs_holder gh;
+	struct block_device *blk_dev;
 	int error;
 
 	atomic_inc(&ip->i_sbd->sd_ops_inode);
@@ -1655,6 +1657,9 @@ gfs_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat)
 	if (!error)
 	{
 		generic_fillattr(inode, stat);
+		blk_dev = gfs_diaper_2real(inode->i_sb->s_bdev);
+		if (blk_dev)
+			stat->dev = blk_dev->bd_dev;
 		gfs_glock_dq_uninit(&gh);
 	}
 


hooks/post-receive
--
Cluster Project