From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 14793 invoked by alias); 29 Jul 2009 13:43:29 -0000 Received: (qmail 14782 invoked by alias); 29 Jul 2009 13:43:29 -0000 X-SWARE-Spam-Status: No, hits=-1.6 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Status: No, hits=-1.6 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Check-By: sourceware.org X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on bastion2.fedora.phx.redhat.com Subject: gfs1-utils: master - gfs: Make gfs build with newer kernels To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: gfs1-utils.git X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: a5b702ebca0ef783d1c4dc3b6cf0d55221fb45d5 X-Git-Newrev: 59273e07bc76d2520c1c14b57d2bc5f5410c7ce6 From: Steven Whitehouse Message-Id: <20090729132353.036FB12026C@lists.fedorahosted.org> Date: Wed, 29 Jul 2009 13:43:00 -0000 X-Scanned-By: MIMEDefang 2.58 on 172.16.52.254 Mailing-List: contact cluster-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cluster-cvs-owner@sourceware.org X-SW-Source: 2009-q3/txt/msg00124.txt.bz2 Gitweb: http://git.fedorahosted.org/git/gfs1-utils.git?p=gfs1-utils.git;a=commitdiff;h=59273e07bc76d2520c1c14b57d2bc5f5410c7ce6 Commit: 59273e07bc76d2520c1c14b57d2bc5f5410c7ce6 Parent: a5b702ebca0ef783d1c4dc3b6cf0d55221fb45d5 Author: Steven Whitehouse AuthorDate: Wed Jul 29 15:21:27 2009 +0100 Committer: Steven Whitehouse CommitterDate: Wed Jul 29 15:21:27 2009 +0100 gfs: Make gfs build with newer kernels Now builds with the latest upstream kernel: 2.6.31-rc4 Signed-off-by: Steven Whitehouse --- gfs-kernel/src/gfs/acl.c | 1 + gfs-kernel/src/gfs/ops_file.c | 2 +- gfs-kernel/src/gfs/ops_fstype.c | 4 ++-- gfs-kernel/src/gfs/proc.c | 1 - 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gfs-kernel/src/gfs/acl.c b/gfs-kernel/src/gfs/acl.c index a9312ba..3936baa 100644 --- a/gfs-kernel/src/gfs/acl.c +++ b/gfs-kernel/src/gfs/acl.c @@ -1,4 +1,5 @@ #include +#include #include #include #include diff --git a/gfs-kernel/src/gfs/ops_file.c b/gfs-kernel/src/gfs/ops_file.c index e5b6c4c..fa72924 100644 --- a/gfs-kernel/src/gfs/ops_file.c +++ b/gfs-kernel/src/gfs/ops_file.c @@ -352,7 +352,7 @@ do_read_direct(struct file *file, char *buf, size_t size, loff_t *offset, goto out_gunlock; if (gfs_is_stuffed(ip)) { - size_t mask = bdev_hardsect_size(inode->i_sb->s_bdev) - 1; + size_t mask = bdev_logical_block_size(inode->i_sb->s_bdev) - 1; if (((*offset) & mask) || (((unsigned long)buf) & mask)) goto out_gunlock; diff --git a/gfs-kernel/src/gfs/ops_fstype.c b/gfs-kernel/src/gfs/ops_fstype.c index 93bf4d1..d72b74a 100644 --- a/gfs-kernel/src/gfs/ops_fstype.c +++ b/gfs-kernel/src/gfs/ops_fstype.c @@ -300,9 +300,9 @@ static int init_sb(struct gfs_sbd *sdp, int silent, int undo) sizes, version #s, locations of important on-disk inodes, etc. */ error = -EINVAL; - if (sdp->sd_sb.sb_bsize < bdev_hardsect_size(sb->s_bdev)) { + if (sdp->sd_sb.sb_bsize < bdev_logical_block_size(sb->s_bdev)) { printk("GFS: fsid=%s: FS block size (%u) is too small for device block size (%u)\n", - sdp->sd_fsname, sdp->sd_sb.sb_bsize, bdev_hardsect_size(sb->s_bdev)); + sdp->sd_fsname, sdp->sd_sb.sb_bsize, bdev_logical_block_size(sb->s_bdev)); goto fail; } if (sdp->sd_sb.sb_bsize > PAGE_SIZE) { diff --git a/gfs-kernel/src/gfs/proc.c b/gfs-kernel/src/gfs/proc.c index b25cd1c..069b39d 100644 --- a/gfs-kernel/src/gfs/proc.c +++ b/gfs-kernel/src/gfs/proc.c @@ -470,7 +470,6 @@ gfs_proc_init(void) if (!pde) return -ENOMEM; - pde->owner = THIS_MODULE; pde->proc_fops = &gfs_proc_fops; return 0;