From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Andrew Morton <akpm@linux-foundation•org>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Theodore Ts'o <tytso@mit•edu>, Dave Chinner <dchinner@redhat•com>
Subject: linux-next: manual merge of the akpm tree with the ext4 tree
Date: Wed, 7 Aug 2013 15:19:03 +1000 [thread overview]
Message-ID: <20130807151903.6281b33735f4e3f79231bf5e@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1496 bytes --]
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in
fs/ext4/extents_status.c between commit 49c6efc7b80e ("ext4: add new
ioctl EXT4_IOC_PRECACHE_EXTENTS") from the ext4 tree and commit
"fs-convert-fs-shrinkers-to-new-scan-count-api-fix" from the akpm tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc fs/ext4/extents_status.c
index 28e2627,0361206..0000000
--- a/fs/ext4/extents_status.c
+++ b/fs/ext4/extents_status.c
@@@ -947,13 -909,23 +947,15 @@@ static int __ext4_es_shrink(struct ext4
struct ext4_inode_info *ei;
struct list_head *cur, *tmp;
LIST_HEAD(skiped);
- int ret, nr_shrunk = 0;
+ unsigned long nr_shrunk = 0;
+ int retried = 0, skip_precached = 1, nr_skipped = 0;
spin_lock(&sbi->s_es_lru_lock);
- /*
- * If the inode that is at the head of LRU list is newer than
- * last_sorted time, that means that we need to sort this list.
- */
- ei = list_first_entry(&sbi->s_es_lru, struct ext4_inode_info, i_es_lru);
- if (sbi->s_es_last_sorted < ei->i_touch_when) {
- list_sort(NULL, &sbi->s_es_lru, ext4_inode_touch_time_cmp);
- sbi->s_es_last_sorted = jiffies;
- }
-
+retry:
list_for_each_safe(cur, tmp, &sbi->s_es_lru) {
+ int ret;
+
/*
* If we have already reclaimed all extents from extent
* status tree, just stop the loop immediately.
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2013-08-07 5:19 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-07 5:19 Stephen Rothwell [this message]
2013-08-09 22:21 ` linux-next: manual merge of the akpm tree with the ext4 tree Kees Cook
2013-08-09 22:34 ` Andrew Morton
-- strict thread matches above, loose matches on Subject: below --
2013-08-07 5:16 Stephen Rothwell
2013-07-16 4:56 Stephen Rothwell
2013-07-16 4:53 Stephen Rothwell
2013-06-19 7:27 Stephen Rothwell
2013-06-19 7:44 ` Glauber Costa
2013-06-19 7:45 ` Stephen Rothwell
2013-06-19 14:20 ` Theodore Ts'o
2013-06-19 17:06 ` Andrew Morton
2013-06-19 18:59 ` Theodore Ts'o
2013-06-19 21:08 ` Glauber Costa
2013-06-19 7:48 ` Zheng Liu
2012-07-16 6:52 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=20130807151903.6281b33735f4e3f79231bf5e@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akpm@linux-foundation$(echo .)org \
--cc=dchinner@redhat$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=tytso@mit$(echo .)edu \
/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