From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Theodore Tso <tytso@MIT.EDU>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Dmitry Monakhov <dmonakhov@openvz.org>, Jan Kara <jack@suse.cz>,
Eric Sandeen <sandeen@redhat.com>
Subject: linux-next: manual merge of the ext4 tree with Linus' tree
Date: Sat, 22 May 2010 15:50:33 +1000 [thread overview]
Message-ID: <20100522155033.8616811d.sfr@canb.auug.org.au> (raw)
Hi Ted,
Today's linux-next merge of the ext4 tree got a conflict in
include/linux/quotaops.h between commit
12755627bdcddcdb30a1bfb9a09395a52b1d6838 ("quota: unify quota init
condition in setattr") from Linus' tree and commits
2b03a9dee57f0a567b17571774d6a6ee8e0135b6 ("quota: use flags interface for
dquot alloc/free space") and facd5e10d2eca8b0eb85eba94494d9302c3740ad
("quota: add the option to not fail with EDQUOT in block") from the ext4
tree.
Juts overlapping additions. I fixed it up (see below) and can carry the
fix for a while.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc include/linux/quotaops.h
index 0c77cd8,8f858ce..0000000
--- a/include/linux/quotaops.h
+++ b/include/linux/quotaops.h
@@@ -14,14 -14,10 +14,18 @@@ static inline struct quota_info *sb_dqo
return &sb->s_dquot;
}
+/* i_mutex must being held */
+static inline bool is_quota_modification(struct inode *inode, struct iattr *ia)
+{
+ return (ia->ia_valid & ATTR_SIZE && ia->ia_size != inode->i_size) ||
+ (ia->ia_valid & ATTR_UID && ia->ia_uid != inode->i_uid) ||
+ (ia->ia_valid & ATTR_GID && ia->ia_gid != inode->i_gid);
+}
+
+ #define DQUOT_SPACE_WARN 0x1
+ #define DQUOT_SPACE_RESERVE 0x2
+ #define DQUOT_SPACE_NOFAIL 0x4
+
#if defined(CONFIG_QUOTA)
/*
next reply other threads:[~2010-05-22 6:32 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-22 5:50 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-06-27 0:39 linux-next: manual merge of the ext4 tree with Linus' tree Stephen Rothwell
2023-06-27 6:37 ` Christoph Hellwig
2023-06-27 7:26 ` Stephen Rothwell
2021-06-07 0:27 Stephen Rothwell
2020-12-17 23:12 Stephen Rothwell
2020-10-20 23:03 Stephen Rothwell
2019-09-19 11:44 Mark Brown
2016-03-21 0:29 Stephen Rothwell
2013-08-13 1:33 Stephen Rothwell
2011-03-25 1:56 Stephen Rothwell
2011-03-25 14:45 ` Tejun Heo
2011-03-25 16:30 ` Sedat Dilek
2011-03-25 19:58 ` Ted Ts'o
2011-02-14 2:19 Stephen Rothwell
2010-10-28 0:45 Stephen Rothwell
2009-09-17 1:56 linux-next: manual merge of the ext4 tree with Linus tree Stephen Rothwell
2009-09-17 13:22 ` Theodore Tso
2009-09-17 13:30 ` Stephen Rothwell
2009-02-02 2:56 linux-next: manual merge of the ext4 tree with Linus' 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=20100522155033.8616811d.sfr@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=dmonakhov@openvz.org \
--cc=jack@suse.cz \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sandeen@redhat.com \
--cc=tytso@MIT.EDU \
/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;
as well as URLs for NNTP newsgroup(s).