From: Clark Williams <williams@redhat.com>
To: Ryan Hope <rmh3093@gmail.com>
Cc: LKML <linux-kernel@vger.kernel.org>, Ingo Molnar <mingo@elte.hu>
Subject: Re: [-rt][patches] fix compilation errors
Date: Wed, 23 Jul 2008 16:39:49 -0500 [thread overview]
Message-ID: <4887A525.4000202@redhat.com> (raw)
In-Reply-To: <48f7fe350807231412v1d655caew74a79f3a4d42ea71@mail.gmail.com>
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Ryan Hope wrote:
> Here is another compile fix:
>
> diff --git a/fs/xfs/linux-2.6/xfs_fs_subr.c b/fs/xfs/linux-2.6/xfs_fs_subr.c
> index 1eefe61..097feb0 100644
> --- a/fs/xfs/linux-2.6/xfs_fs_subr.c
> +++ b/fs/xfs/linux-2.6/xfs_fs_subr.c
> @@ -33,7 +33,7 @@ xfs_tosspages(
> {
> struct address_space *mapping = ip->i_vnode->i_mapping;
>
> - if (mapping->nrpages)
> + if (mapping_nrpages(mapping))
> truncate_inode_pages(mapping, first);
> }
>
> @@ -47,7 +47,7 @@ xfs_flushinval_pages(
> struct address_space *mapping = ip->i_vnode->i_mapping;
> int ret = 0;
>
> - if (mapping->nrpages) {
> + if (mapping_nrpages(mapping)) {
> xfs_iflags_clear(ip, XFS_ITRUNCATED);
> ret = filemap_write_and_wait(mapping);
> if (!ret)
> diff --git a/fs/xfs/linux-2.6/xfs_lrw.c b/fs/xfs/linux-2.6/xfs_lrw.c
> index 5e3b575..b6b8d39 100644
> --- a/fs/xfs/linux-2.6/xfs_lrw.c
> +++ b/fs/xfs/linux-2.6/xfs_lrw.c
> @@ -242,7 +242,7 @@ xfs_read(
> }
>
> if (unlikely(ioflags & IO_ISDIRECT)) {
> - if (inode->i_mapping->nrpages)
> + if (mapping_nrpages(inode->i_mapping))
> ret = xfs_flushinval_pages(ip, (*offset & PAGE_CACHE_MASK),
> -1, FI_REMAPF_LOCKED);
> mutex_unlock(&inode->i_mutex);
> @@ -654,7 +654,7 @@ start:
> return XFS_ERROR(-EINVAL);
> }
>
> - if (!need_i_mutex && (mapping->nrpages || pos > xip->i_size)) {
> + if (!need_i_mutex && (mapping_nrpages(mapping) || pos > xip->i_size)) {
> xfs_iunlock(xip, XFS_ILOCK_EXCL|iolock);
> iolock = XFS_IOLOCK_EXCL;
> need_i_mutex = 1;
> @@ -722,7 +722,7 @@ retry:
> current->backing_dev_info = mapping->backing_dev_info;
>
> if ((ioflags & IO_ISDIRECT)) {
> - if (mapping->nrpages) {
> + if (mapping_nrpages(mapping)) {
> WARN_ON(need_i_mutex == 0);
> xfs_inval_cached_trace(xip, pos, -1,
> (pos & PAGE_CACHE_MASK), -1);
>
>
Applied. Make sure you update, since there are a couple of bug fixes up there as
well. Also, I'm focusing on 64-bit atm, so your 32-bit fixes are appreciated.
Clark
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org
iEYEARECAAYFAkiHpSUACgkQHyuj/+TTEp0fPQCePSXacZUseSSy8jWgFF0dTWsK
SMwAoJQc4Lfq8nNh0Y/S3sorkgdDqBNk
=NoDF
-----END PGP SIGNATURE-----
prev parent reply other threads:[~2008-07-23 21:40 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-20 21:16 [-rt][patches] fix compilation errors Ryan Hope
2008-07-22 23:41 ` Ryan Hope
2008-07-23 21:12 ` Ryan Hope
2008-07-23 21:39 ` Clark Williams [this message]
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=4887A525.4000202@redhat.com \
--to=williams@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=rmh3093@gmail.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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.