public inbox for cluster-cvs@sourceware.org help / color / mirror / Atom feed
From: Steven Whitehouse <swhiteho@fedoraproject.org> To: cluster-cvs-relay@redhat.com Subject: gfs1-utils: master - gfs: Make gfs build with newer kernels Date: Wed, 29 Jul 2009 13:43:00 -0000 [thread overview] Message-ID: <20090729132353.036FB12026C@lists.fedorahosted.org> (raw) Gitweb: http://git.fedorahosted.org/git/gfs1-utils.git?p=gfs1-utils.git;a=commitdiff;h=59273e07bc76d2520c1c14b57d2bc5f5410c7ce6 Commit: 59273e07bc76d2520c1c14b57d2bc5f5410c7ce6 Parent: a5b702ebca0ef783d1c4dc3b6cf0d55221fb45d5 Author: Steven Whitehouse <swhiteho@redhat.com> AuthorDate: Wed Jul 29 15:21:27 2009 +0100 Committer: Steven Whitehouse <swhiteho@redhat.com> 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 <swhiteho@redhat.com> --- 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 <linux/sched.h> +#include <linux/fs_struct.h> #include <linux/slab.h> #include <linux/smp_lock.h> #include <linux/spinlock.h> 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;
reply other threads:[~2009-07-29 13:43 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20090729132353.036FB12026C@lists.fedorahosted.org \ --to=swhiteho@fedoraproject.org \ --cc=cluster-cvs-relay@redhat.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).