From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Theodore Tso <tytso@MIT.EDU>
Cc: linux-next@vger.kernel.org, Frank Mayhar <fmayhar@google.com>,
Al Viro <viro@zeniv.linux.org.uk>
Subject: linux-next: manual merge of the ext4 tree
Date: Mon, 5 Jan 2009 13:49:06 +1100 [thread overview]
Message-ID: <20090105134906.32129cb8.sfr@canb.auug.org.au> (raw)
Hi Ted,
Today's linux-next merge of the ext4 tree got a conflict in
fs/ext4/ialloc.c between commit 6b38e842bb832a3dbeb17e382404aef3c40ac5f9
("nfsd race fixes: ext4") from Linus' tree and commit
3cbc16fb3066dabb66eddf192d9e657a14a7ad20 ("ext4: Allow ext4 to run
without a journal") from the ext4 tree.
Really just context changes. I fixed it up (see below) and can carry the
fix for now. You should fix this by merging with Linus' tree (or get
Linus to do it).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
diff --cc fs/ext4/ialloc.c
index 6e60528,3bcf197..0000000
--- a/fs/ext4/ialloc.c
+++ b/fs/ext4/ialloc.c
@@@ -825,11 -890,8 +890,11 @@@ got
ext4_set_inode_flags(inode);
if (IS_DIRSYNC(inode))
- handle->h_sync = 1;
+ ext4_handle_sync(handle);
- insert_inode_hash(inode);
+ if (insert_inode_locked(inode) < 0) {
+ err = -EINVAL;
+ goto fail_drop;
+ }
spin_lock(&sbi->s_next_gen_lock);
inode->i_generation = sbi->s_next_generation++;
spin_unlock(&sbi->s_next_gen_lock);
@@@ -884,9 -948,8 +951,9 @@@ fail_drop
DQUOT_DROP(inode);
inode->i_flags |= S_NOQUOTA;
inode->i_nlink = 0;
+ unlock_new_inode(inode);
iput(inode);
- brelse(bitmap_bh);
+ brelse(inode_bitmap_bh);
return ERR_PTR(err);
}
reply other threads:[~2009-01-05 2:49 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=20090105134906.32129cb8.sfr@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=fmayhar@google.com \
--cc=linux-next@vger.kernel.org \
--cc=tytso@MIT.EDU \
--cc=viro@zeniv.linux.org.uk \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox