From: Stephen Rothwell <sfr-3FnU+UHB4dNDw9hX6IcOSA@public•gmane.org>
To: Tejun Heo <tj-DgEjT+Ai2ygdnm+yROfE0A@public•gmane.org>
Cc: linux-next-u79uwXL29TY76Z2rM5mHXA@public•gmane.org,
linux-kernel-u79uwXL29TY76Z2rM5mHXA@public•gmane.org,
Suresh Jayaraman <sjayaraman-l3A5Bk7waGM@public•gmane.org>,
Steve French <smfrench-Re5JQEeQqe8AvxtiuMwx3w@public•gmane.org>,
linux-cifs-u79uwXL29TY76Z2rM5mHXA@public•gmane.org
Subject: linux-next: manual merge of the workqueues tree with the cifs tree
Date: Fri, 23 Jul 2010 14:46:08 +1000 [thread overview]
Message-ID: <20100723144608.435f7e40.sfr@canb.auug.org.au> (raw)
Hi Tejun,
Today's linux-next merge of the workqueues tree got a conflict in
fs/cifs/file.c between commit 7d4716ba25ecc032d83ec4fa231edfcef8e17b62
("cifs: FS-Cache page management") from the cifs tree and commit
9b646972467fb5fdc677f9e4251875db20bdbb64 ("cifs: use workqueue instead of
slow-work") from the workqueues tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr-3FnU+UHB4dNDw9hX6IcOSA@public•gmane.org
diff --cc fs/cifs/file.c
index fa04a00d,e767bfa..0000000
--- a/fs/cifs/file.c
+++ b/fs/cifs/file.c
@@@ -2291,24 -2295,7 +2291,23 @@@ out
return rc;
}
+static int cifs_release_page(struct page *page, gfp_t gfp)
+{
+ if (PagePrivate(page))
+ return 0;
+
+ return cifs_fscache_release_page(page, gfp);
+}
+
+static void cifs_invalidate_page(struct page *page, unsigned long offset)
+{
+ struct cifsInodeInfo *cifsi = CIFS_I(page->mapping->host);
+
+ if (offset == 0)
+ cifs_fscache_invalidate_page(page, &cifsi->vfs_inode);
+}
+
- static void
- cifs_oplock_break(struct slow_work *work)
+ void cifs_oplock_break(struct work_struct *work)
{
struct cifsFileInfo *cfile = container_of(work, struct cifsFileInfo,
oplock_break);
next reply other threads:[~2010-07-23 4:46 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-23 4:46 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2010-07-23 4:46 linux-next: manual merge of the workqueues tree with the cifs tree Stephen Rothwell
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=20100723144608.435f7e40.sfr@canb.auug.org.au \
--to=sfr-3fnu+uhb4dndw9hx6icosa@public$(echo .)gmane.org \
--cc=linux-cifs-u79uwXL29TY76Z2rM5mHXA@public$(echo .)gmane.org \
--cc=linux-kernel-u79uwXL29TY76Z2rM5mHXA@public$(echo .)gmane.org \
--cc=linux-next-u79uwXL29TY76Z2rM5mHXA@public$(echo .)gmane.org \
--cc=sjayaraman-l3A5Bk7waGM@public$(echo .)gmane.org \
--cc=smfrench-Re5JQEeQqe8AvxtiuMwx3w@public$(echo .)gmane.org \
--cc=tj-DgEjT+Ai2ygdnm+yROfE0A@public$(echo .)gmane.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be 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