* linux-next: manual merge of the ocfs2 tree with Linus' tree
@ 2011-03-28 1:00 Stephen Rothwell
0 siblings, 0 replies; 6+ messages in thread
From: Stephen Rothwell @ 2011-03-28 1:00 UTC (permalink / raw)
To: Joel Becker; +Cc: linux-next, linux-kernel, Tejun Heo, Tao Ma
[-- Attachment #1: Type: text/plain, Size: 1166 bytes --]
Hi Joel,
Today's linux-next merge of the ocfs2 tree got a conflict in
fs/ocfs2/super.c between commit 316873c958ee ("ocfs2: use system_wq
instead of ocfs2_quota_wq") from Linus' tree and commit ef6b689b63b9
("ocfs2: Remove ENTRY from masklog") from the ocfs2 tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc fs/ocfs2/super.c
index 236ed1b,0e40839..0000000
--- a/fs/ocfs2/super.c
+++ b/fs/ocfs2/super.c
@@@ -1662,12 -1654,12 +1650,11 @@@ static int __init ocfs2_init(void
status = register_quota_format(&ocfs2_quota_format);
leave:
if (status < 0) {
- ocfs2_quota_shutdown();
ocfs2_free_mem_caches();
exit_ocfs2_uptodate_cache();
+ mlog_errno(status);
}
- mlog_exit(status);
-
if (status >= 0) {
return register_filesystem(&ocfs2_fs_type);
} else
@@@ -1676,8 -1668,8 +1663,6 @@@
static void __exit ocfs2_exit(void)
{
- mlog_entry_void();
-
- ocfs2_quota_shutdown();
-
if (ocfs2_wq) {
flush_workqueue(ocfs2_wq);
destroy_workqueue(ocfs2_wq);
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* linux-next: manual merge of the ocfs2 tree with Linus' tree
@ 2010-08-13 0:33 Stephen Rothwell
0 siblings, 0 replies; 6+ messages in thread
From: Stephen Rothwell @ 2010-08-13 0:33 UTC (permalink / raw)
To: Joel Becker; +Cc: linux-next, linux-kernel, Tao Ma, Christoph Hellwig
[-- Attachment #1: Type: text/plain, Size: 537 bytes --]
Hi Joel,
Today's linux-next merge of the ocfs2 tree got a conflict in
fs/ocfs2/file.c between commit 2c27c65ed0696f0b5df2dad2cf6462d72164d547
("check ATTR_SIZE contraints in inode_change_ok") from Linus' tree and
commit 7b2beb150acfe03445fc61c1302c4225c633776c ("ocfs2: Remove obscure
error handling in direct_write") from the ocfs2 tree.
The latter just removes that code that the former is modifying, so I did
that.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* linux-next: manual merge of the ocfs2 tree with Linus' tree
@ 2009-12-17 23:51 Stephen Rothwell
0 siblings, 0 replies; 6+ messages in thread
From: Stephen Rothwell @ 2009-12-17 23:51 UTC (permalink / raw)
To: Joel Becker; +Cc: linux-next, linux-kernel, Tao Ma, Christoph Hellwig
Hi Joel,
Today's linux-next merge of the ocfs2 tree got a conflict in
fs/ocfs2/file.c between commit 6b2f3d1f769be5779b479c37800229d9a4809fc3
("vfs: Implement proper O_SYNC semantics") from Linus' tree and commit
a8227ccc585025735bcf350f71fa9c1ffd005d8d ("ocfs2: Handle O_DIRECT when
writing to a refcounted cluster") from the ocfs2 tree.
I fixed it up (see below) and can carry the fix for a while. Since this
is a conflict against Linus' tree, it is fixable in the ocfs2 tree by
doing a merge with Linus' tree.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc fs/ocfs2/file.c
index 3d30a1c,04e178e..0000000
--- a/fs/ocfs2/file.c
+++ b/fs/ocfs2/file.c
@@@ -2006,7 -2013,8 +2013,8 @@@ out_dio
/* buffered aio wouldn't have proper lock coverage today */
BUG_ON(ret == -EIOCBQUEUED && !(file->f_flags & O_DIRECT));
- if ((file->f_flags & O_DSYNC && !direct_io) || IS_SYNC(inode)) {
- if ((file->f_flags & O_SYNC && !direct_io) || IS_SYNC(inode) ||
++ if ((file->f_flags & O_DSYNC && !direct_io) || IS_SYNC(inode) ||
+ (file->f_flags & O_DIRECT && has_refcount)) {
ret = filemap_fdatawrite_range(file->f_mapping, pos,
pos + count - 1);
if (ret < 0)
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: manual merge of the ocfs2 tree with Linus' tree
2009-09-23 3:14 ` Joel Becker
@ 2009-09-23 5:25 ` Stephen Rothwell
0 siblings, 0 replies; 6+ messages in thread
From: Stephen Rothwell @ 2009-09-23 5:25 UTC (permalink / raw)
To: Joel Becker; +Cc: linux-next, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 354 bytes --]
Hi Joel,
On Tue, 22 Sep 2009 20:14:50 -0700 Joel Becker <Joel.Becker@oracle.com> wrote:
>
> The syscall is dropping while it's reworked. I should have a
> tree up shortly without the syscall.
OK, thanks. I will pick it up tomorrow.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: manual merge of the ocfs2 tree with Linus' tree
2009-09-23 0:45 Stephen Rothwell
@ 2009-09-23 3:14 ` Joel Becker
2009-09-23 5:25 ` Stephen Rothwell
0 siblings, 1 reply; 6+ messages in thread
From: Joel Becker @ 2009-09-23 3:14 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel
On Wed, Sep 23, 2009 at 10:45:37AM +1000, Stephen Rothwell wrote:
> Today's linux-next merge of the ocfs2 tree got conflicts in
> arch/x86/ia32/ia32entry.S, arch/x86/include/asm/unistd_32.h,
> arch/x86/include/asm/unistd_64.h and arch/x86/kernel/syscall_table_32.S
> between various commits from Linus' tree and commit
> 25767b48501de19421ae86c406b2dd42df37baf3 ("fs: Add the reflink()
> operation and reflinkat(2) system call") from the ocfs2 tree.
>
> I fixed it up (see below) and can carry the fix for a short while. Given
> the ongoing discussions about this patch with Linus, however, it may be
> worth dropping for now?
The syscall is dropping while it's reworked. I should have a
tree up shortly without the syscall.
Joel
--
Life's Little Instruction Book #15
"Own a great stereo system."
Joel Becker
Principal Software Developer
Oracle
E-mail: joel.becker@oracle.com
Phone: (650) 506-8127
^ permalink raw reply [flat|nested] 6+ messages in thread
* linux-next: manual merge of the ocfs2 tree with Linus' tree
@ 2009-09-23 0:45 Stephen Rothwell
2009-09-23 3:14 ` Joel Becker
0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2009-09-23 0:45 UTC (permalink / raw)
To: Joel Becker; +Cc: linux-next, linux-kernel
Hi Joel,
Today's linux-next merge of the ocfs2 tree got conflicts in
arch/x86/ia32/ia32entry.S, arch/x86/include/asm/unistd_32.h,
arch/x86/include/asm/unistd_64.h and arch/x86/kernel/syscall_table_32.S
between various commits from Linus' tree and commit
25767b48501de19421ae86c406b2dd42df37baf3 ("fs: Add the reflink()
operation and reflinkat(2) system call") from the ocfs2 tree.
I fixed it up (see below) and can carry the fix for a short while. Given
the ongoing discussions about this patch with Linus, however, it may be
worth dropping for now?
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/x86/ia32/ia32entry.S
index 74619c4,5fede3e..0000000
--- a/arch/x86/ia32/ia32entry.S
+++ b/arch/x86/ia32/ia32entry.S
@@@ -831,5 -831,6 +831,6 @@@ ia32_sys_call_table
.quad compat_sys_preadv
.quad compat_sys_pwritev
.quad compat_sys_rt_tgsigqueueinfo /* 335 */
- .quad sys_perf_counter_open
+ .quad sys_perf_event_open
+ .quad sys_reflinkat
ia32_syscall_end:
diff --cc arch/x86/include/asm/unistd_32.h
index 6fb3c20,a7924e9..0000000
--- a/arch/x86/include/asm/unistd_32.h
+++ b/arch/x86/include/asm/unistd_32.h
@@@ -341,12 -341,11 +341,13 @@@
#define __NR_preadv 333
#define __NR_pwritev 334
#define __NR_rt_tgsigqueueinfo 335
-#define __NR_perf_counter_open 336
+#define __NR_perf_event_open 336
+ #define __NR_reflinkat 337
#ifdef __KERNEL__
- #define NR_syscalls 337
++#define NR_syscalls 338
+
#define __ARCH_WANT_IPC_PARSE_VERSION
#define __ARCH_WANT_OLD_READDIR
#define __ARCH_WANT_OLD_STAT
diff --cc arch/x86/include/asm/unistd_64.h
index 8d3ad0a,b8df7a2..0000000
--- a/arch/x86/include/asm/unistd_64.h
+++ b/arch/x86/include/asm/unistd_64.h
@@@ -659,8 -659,10 +659,10 @@@ __SYSCALL(__NR_preadv, sys_preadv
__SYSCALL(__NR_pwritev, sys_pwritev)
#define __NR_rt_tgsigqueueinfo 297
__SYSCALL(__NR_rt_tgsigqueueinfo, sys_rt_tgsigqueueinfo)
-#define __NR_perf_counter_open 298
-__SYSCALL(__NR_perf_counter_open, sys_perf_counter_open)
+#define __NR_perf_event_open 298
+__SYSCALL(__NR_perf_event_open, sys_perf_event_open)
+ #define __NR_reflinkat 299
+ __SYSCALL(__NR_reflinkat, sys_reflinkat)
#ifndef __NO_STUBS
#define __ARCH_WANT_OLD_READDIR
diff --cc arch/x86/kernel/syscall_table_32.S
index 0157cd2,d3b6ebe..0000000
--- a/arch/x86/kernel/syscall_table_32.S
+++ b/arch/x86/kernel/syscall_table_32.S
@@@ -335,4 -335,5 +335,5 @@@ ENTRY(sys_call_table
.long sys_preadv
.long sys_pwritev
.long sys_rt_tgsigqueueinfo /* 335 */
- .long sys_perf_counter_open
+ .long sys_perf_event_open
+ .long sys_reflinkat
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2011-03-28 1:00 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-03-28 1:00 linux-next: manual merge of the ocfs2 tree with Linus' tree Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2010-08-13 0:33 Stephen Rothwell
2009-12-17 23:51 Stephen Rothwell
2009-09-23 0:45 Stephen Rothwell
2009-09-23 3:14 ` Joel Becker
2009-09-23 5:25 ` Stephen Rothwell
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 NNTP newsgroup(s).