2010-04-06 15:14:15 -07:00
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
ceph: Fix up after semantic merge conflict
The previous ceph-client merge resulted in ceph not even building,
because there was a merge conflict that wasn't visible as an actual data
conflict: commit 7221fe4c2ed7 ("ceph: add acl for cephfs") added support
for POSIX ACL's into Ceph, but unluckily we also had the VFS tree change
a lot of the POSIX ACL helper functions to be much more helpful to
filesystems (see for example commits 2aeccbe957d0 "fs: add generic
xattr_acl handlers", 5bf3258fd2ac "fs: make posix_acl_chmod more useful"
and 37bc15392a23 "fs: make posix_acl_create more useful")
The reason this conflict wasn't obvious was many-fold: because it was a
semantic conflict rather than a data conflict, it wasn't visible in the
git merge as a conflict. And because the VFS tree hadn't been in
linux-next, people hadn't become aware of it that way. And because I
was at jury duty this morning, I was using my laptop and as a result not
doing constant "allmodconfig" builds.
Anyway, this fixes the build and generally removes a fair chunk of the
Ceph POSIX ACL support code, since the improved helpers seem to match
really well for Ceph too. But I don't actually have any way to *test*
the end result, and I was really hoping for some ACK's for this. Oh,
well.
Not compiling certainly doesn't make things easier to test, so I'm
committing this without the acks after having waited for four hours...
Plus it's what I would have done for the merge had I noticed the
semantic conflict..
Reported-by: Dave Jones <davej@redhat.com>
Cc: Sage Weil <sage@inktank.com>
Cc: Guangliang Zhao <lucienchao@gmail.com>
Cc: Li Wang <li.wang@ubuntykylin.com>
Cc: Christoph Hellwig <hch@infradead.org>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2014-01-28 18:06:18 -08:00
|
|
|
|
2014-04-18 16:00:30 +08:00
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
2010-04-06 15:14:15 -07:00
|
|
|
|
2013-08-21 17:29:54 -04:00
|
|
|
|
2010-04-06 15:14:15 -07:00
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2010-02-09 15:24:44 -08:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2011-01-21 16:44:03 -08:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2009-11-11 15:22:37 -08:00
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2010-05-22 12:01:14 +02:00
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2015-01-14 13:46:04 +08:00
|
|
|
|
|
|
|
|
|
2009-11-11 15:22:37 -08:00
|
|
|
|
|
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2013-11-11 15:18:03 +08:00
|
|
|
|
2014-01-29 06:22:25 -08:00
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2014-04-18 16:00:30 +08:00
|
|
|
|
|
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2014-04-18 16:00:30 +08:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2014-04-18 22:01:38 +08:00
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2014-04-18 22:01:38 +08:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
2014-04-18 22:01:38 +08:00
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2014-04-18 16:00:30 +08:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2011-11-30 09:47:09 -08:00
|
|
|
|
|
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
2014-11-14 21:41:55 +08:00
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
2015-06-16 20:48:56 +08:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
2010-11-16 11:14:34 -08:00
|
|
|
|
|
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2015-06-10 17:26:13 +08:00
|
|
|
|
2015-06-09 15:48:57 +08:00
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2013-08-12 21:42:15 -07:00
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2011-05-11 10:29:54 +00:00
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2015-10-27 18:36:06 +08:00
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2010-02-09 15:24:44 -08:00
|
|
|
|
|
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2013-08-21 17:29:54 -04:00
|
|
|
|
|
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2011-01-07 17:49:49 +11:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2013-08-21 17:29:54 -04:00
|
|
|
|
|
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
2010-03-09 12:59:08 -08:00
|
|
|
|
|
|
|
|
|
2014-04-18 09:57:11 +08:00
|
|
|
|
2010-03-09 12:59:08 -08:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2010-04-06 15:14:15 -07:00
|
|
|
|
2010-03-09 12:59:08 -08:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2009-12-07 12:17:17 -08:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
2011-01-07 17:49:49 +11:00
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
2013-09-20 19:55:31 +08:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2013-08-12 21:42:15 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2010-02-09 11:08:40 -08:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2013-08-12 21:42:15 -07:00
|
|
|
|
|
|
|
|
|
2010-02-09 11:08:40 -08:00
|
|
|
|
|
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2013-08-21 17:29:54 -04:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2010-11-08 09:24:34 -08:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2010-11-08 09:24:34 -08:00
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2014-11-14 21:56:29 +08:00
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2014-04-18 09:57:11 +08:00
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
2014-04-17 08:55:50 +08:00
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
2014-04-18 09:57:11 +08:00
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
2014-04-18 09:57:11 +08:00
|
|
|
|
2014-04-17 08:55:50 +08:00
|
|
|
|
|
|
|
|
|
2014-11-14 21:41:55 +08:00
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2014-04-18 09:57:11 +08:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2009-12-07 12:17:17 -08:00
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2011-11-30 09:47:09 -08:00
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2010-11-08 09:23:12 -08:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
2014-04-17 08:55:50 +08:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
2014-04-17 08:55:50 +08:00
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2014-04-17 08:55:50 +08:00
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
2014-04-17 08:55:50 +08:00
|
|
|
|
|
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
2013-01-31 03:40:12 -08:00
|
|
|
|
|
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
2013-01-31 04:05:39 -08:00
|
|
|
|
|
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
2014-04-17 08:55:50 +08:00
|
|
|
|
|
|
|
|
|
2011-10-28 14:13:29 +02:00
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
2014-04-17 08:55:50 +08:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
2014-04-17 08:55:50 +08:00
|
|
|
|
|
|
|
|
|
2015-04-27 15:33:28 +08:00
|
|
|
|
|
|
|
|
|
2014-04-17 08:55:50 +08:00
|
|
|
|
2015-04-27 15:33:28 +08:00
|
|
|
|
2014-04-17 08:55:50 +08:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2014-09-16 21:46:17 +08:00
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2013-11-11 15:18:03 +08:00
|
|
|
|
2010-04-29 09:28:11 -07:00
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2012-02-03 09:55:36 -05:00
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
2011-11-30 09:47:09 -08:00
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
2012-02-03 09:55:36 -05:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
2012-02-03 09:55:36 -05:00
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2011-11-30 09:47:09 -08:00
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2015-05-02 10:50:05 -04:00
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2010-12-14 17:37:52 -08:00
|
|
|
|
|
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2015-01-19 13:12:24 +08:00
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
2015-01-19 13:12:24 +08:00
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2014-04-18 09:57:11 +08:00
|
|
|
|
2015-01-19 13:12:24 +08:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2015-06-16 20:48:56 +08:00
|
|
|
|
2015-01-19 13:12:24 +08:00
|
|
|
|
2015-06-16 20:48:56 +08:00
|
|
|
|
|
|
|
|
|
2015-01-19 13:12:24 +08:00
|
|
|
|
|
|
|
|
|
2014-04-18 09:57:11 +08:00
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2010-05-07 11:26:34 -07:00
|
|
|
|
2014-06-06 14:35:37 -07:00
|
|
|
|
2010-05-07 11:26:34 -07:00
|
|
|
|
|
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
2014-11-14 21:41:55 +08:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2014-11-14 21:56:29 +08:00
|
|
|
|
|
|
|
|
|
2014-11-14 21:41:55 +08:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2011-11-30 09:47:09 -08:00
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
2014-11-14 21:41:55 +08:00
|
|
|
|
2014-11-14 21:56:29 +08:00
|
|
|
|
2014-11-14 21:41:55 +08:00
|
|
|
|
|
|
|
|
|
2014-04-18 09:57:11 +08:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
2010-02-09 15:24:44 -08:00
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
2014-04-18 16:00:30 +08:00
|
|
|
|
|
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2014-04-18 09:57:11 +08:00
|
|
|
|
|
|
|
|
|
2009-12-07 12:17:17 -08:00
|
|
|
|
|
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2011-07-26 11:28:25 -07:00
|
|
|
|
|
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
2015-03-17 22:25:59 +00:00
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
2011-07-26 11:28:25 -07:00
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2010-05-03 22:08:02 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2014-04-14 13:13:02 +08:00
|
|
|
|
2010-05-03 22:08:02 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2015-03-17 22:25:59 +00:00
|
|
|
|
2010-05-03 22:08:02 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2014-10-12 22:24:21 -04:00
|
|
|
|
2010-05-03 22:08:02 -07:00
|
|
|
|
2010-06-21 10:38:14 -07:00
|
|
|
|
|
|
|
|
|
2010-05-03 22:08:02 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2013-07-05 18:59:33 +04:00
|
|
|
|
|
|
|
|
|
2015-03-17 22:25:59 +00:00
|
|
|
|
2010-05-03 22:08:02 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2015-03-17 22:25:59 +00:00
|
|
|
|
2010-05-03 22:08:02 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2010-04-06 15:14:15 -07:00
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2010-05-14 10:02:57 -07:00
|
|
|
|
|
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2010-01-25 11:33:08 -08:00
|
|
|
|
|
|
|
|
|
2012-08-21 15:55:25 -07:00
|
|
|
|
2014-11-14 21:56:29 +08:00
|
|
|
|
|
|
|
|
|
2012-08-21 15:55:25 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2014-03-06 16:40:32 +08:00
|
|
|
|
2012-08-21 15:55:25 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2014-03-06 16:40:32 +08:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2015-03-17 22:25:59 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2014-03-06 16:40:32 +08:00
|
|
|
|
2015-03-17 22:25:59 +00:00
|
|
|
|
2014-03-06 16:40:32 +08:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2010-01-25 11:33:08 -08:00
|
|
|
|
|
|
|
|
|
2013-12-05 12:38:59 +08:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2014-11-14 21:56:29 +08:00
|
|
|
|
2013-12-05 12:38:59 +08:00
|
|
|
|
2014-04-01 20:34:18 +08:00
|
|
|
|
2013-12-05 12:38:59 +08:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2010-03-30 13:54:41 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2012-08-21 15:55:25 -07:00
|
|
|
|
2010-03-30 13:54:41 -07:00
|
|
|
|
2010-04-06 15:14:15 -07:00
|
|
|
|
2010-03-30 13:54:41 -07:00
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2015-03-17 22:25:59 +00:00
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2011-07-26 11:28:25 -07:00
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2014-04-14 13:13:02 +08:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2014-10-21 20:11:25 -04:00
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
2014-10-21 20:11:25 -04:00
|
|
|
|
|
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
2010-04-16 12:56:11 -07:00
|
|
|
|
2015-06-16 20:48:56 +08:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
2014-10-21 20:11:25 -04:00
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
2014-10-21 20:11:25 -04:00
|
|
|
|
|
|
|
|
|
2010-05-14 09:35:38 -07:00
|
|
|
|
2009-12-21 11:42:18 -08:00
|
|
|
|
|
|
|
|
|
2010-05-14 09:35:38 -07:00
|
|
|
|
|
|
|
|
|
2013-08-21 17:29:54 -04:00
|
|
|
|
2010-05-03 22:08:02 -07:00
|
|
|
|
2010-05-14 09:35:38 -07:00
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2015-03-17 22:25:59 +00:00
|
|
|
|
2014-10-21 18:09:56 -07:00
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2015-03-17 22:25:59 +00:00
|
|
|
|
2014-10-21 18:09:56 -07:00
|
|
|
|
2013-12-05 12:38:59 +08:00
|
|
|
|
2014-04-14 13:13:02 +08:00
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2015-03-17 22:25:59 +00:00
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
2015-03-17 22:25:59 +00:00
|
|
|
|
2013-12-05 12:38:59 +08:00
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2013-12-05 12:38:59 +08:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
2014-04-14 13:13:02 +08:00
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2014-04-14 13:13:02 +08:00
|
|
|
|
|
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
2014-10-21 18:09:56 -07:00
|
|
|
|
2013-12-05 12:38:59 +08:00
|
|
|
|
2014-04-14 13:13:02 +08:00
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2013-01-29 02:55:31 -05:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2014-11-14 21:56:29 +08:00
|
|
|
|
2013-01-29 02:55:31 -05:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2015-06-16 20:48:56 +08:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2013-12-05 12:38:59 +08:00
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2013-09-18 09:44:13 +08:00
|
|
|
|
2015-06-16 20:48:56 +08:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2013-09-18 09:44:13 +08:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2015-06-16 20:48:56 +08:00
|
|
|
|
2013-09-18 09:44:13 +08:00
|
|
|
|
2015-06-16 20:48:56 +08:00
|
|
|
|
2013-09-18 09:44:13 +08:00
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
2015-03-17 22:25:59 +00:00
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2015-03-17 22:25:59 +00:00
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
2015-06-16 20:48:56 +08:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2013-12-05 12:38:59 +08:00
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2013-12-05 12:38:59 +08:00
|
|
|
|
|
|
|
|
|
2010-07-22 14:11:56 -07:00
|
|
|
|
2013-12-05 12:38:59 +08:00
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
2010-07-22 14:11:56 -07:00
|
|
|
|
2015-03-17 22:25:59 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
2015-03-17 22:25:59 +00:00
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2015-03-17 22:25:59 +00:00
|
|
|
|
|
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
2010-08-25 09:11:35 +02:00
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
2012-09-26 21:41:05 -04:00
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
2010-08-25 09:11:35 +02:00
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2015-06-16 20:48:56 +08:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
2015-03-17 22:25:59 +00:00
|
|
|
|
2013-12-05 12:38:59 +08:00
|
|
|
|
|
|
|
|
|
2015-06-16 20:48:56 +08:00
|
|
|
|
2010-06-21 10:38:14 -07:00
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
2013-12-05 12:38:59 +08:00
|
|
|
|
2015-03-17 22:25:59 +00:00
|
|
|
|
2015-02-02 11:27:56 +08:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2013-12-05 12:38:59 +08:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2015-02-02 11:27:56 +08:00
|
|
|
|
2013-12-05 12:38:59 +08:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2015-06-16 20:48:56 +08:00
|
|
|
|
2013-12-05 12:38:59 +08:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2015-06-16 20:48:56 +08:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2010-06-21 10:38:14 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
2015-06-16 20:48:56 +08:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2011-11-30 09:47:09 -08:00
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2011-11-30 09:47:09 -08:00
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2010-02-09 15:24:44 -08:00
|
|
|
|
|
|
|
|
|
2011-11-05 22:06:31 -07:00
|
|
|
|
2010-02-09 15:24:44 -08:00
|
|
|
|
|
|
|
|
|
2010-02-17 15:45:51 -08:00
|
|
|
|
2010-02-09 15:24:44 -08:00
|
|
|
|
2010-02-17 15:45:51 -08:00
|
|
|
|
2011-11-05 22:06:31 -07:00
|
|
|
|
2010-02-09 15:24:44 -08:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2010-02-09 15:24:44 -08:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2011-11-05 22:06:31 -07:00
|
|
|
|
2010-02-09 15:24:44 -08:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2011-11-05 22:06:31 -07:00
|
|
|
|
2010-02-09 15:24:44 -08:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2010-02-09 15:24:44 -08:00
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2013-08-12 21:42:15 -07:00
|
|
|
|
2011-11-30 09:47:09 -08:00
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
2010-11-04 11:05:05 -07:00
|
|
|
|
2013-11-22 13:50:45 +08:00
|
|
|
|
|
|
|
|
|
2011-11-30 09:47:09 -08:00
|
|
|
|
2013-08-12 21:42:15 -07:00
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2011-11-30 09:47:09 -08:00
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
2014-06-08 05:08:56 +08:00
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
2011-11-30 09:47:09 -08:00
|
|
|
|
2010-11-04 11:05:05 -07:00
|
|
|
|
|
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
2010-11-04 11:05:05 -07:00
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
2010-11-04 11:05:05 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2013-11-22 13:50:45 +08:00
|
|
|
|
|
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
2011-11-30 09:47:09 -08:00
|
|
|
|
2013-08-12 21:42:15 -07:00
|
|
|
|
2013-11-22 13:50:45 +08:00
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2013-03-01 10:57:54 +08:00
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2010-02-09 15:24:44 -08:00
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2013-07-02 12:40:19 +08:00
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2010-02-09 15:24:44 -08:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2011-11-05 22:06:31 -07:00
|
|
|
|
2013-08-21 17:29:54 -04:00
|
|
|
|
2010-03-26 17:40:33 +08:00
|
|
|
|
2010-02-09 15:24:44 -08:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2011-11-05 22:06:31 -07:00
|
|
|
|
2010-02-09 15:24:44 -08:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2013-07-02 12:40:19 +08:00
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2012-11-19 10:49:08 +08:00
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
2013-08-12 21:42:15 -07:00
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
2011-11-30 09:47:09 -08:00
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
2011-11-30 09:47:09 -08:00
|
|
|
|
2013-08-12 21:42:15 -07:00
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2011-11-30 09:47:09 -08:00
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2013-08-12 21:42:15 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2011-11-30 09:47:09 -08:00
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
2014-06-08 05:08:56 +08:00
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
2011-11-30 09:47:09 -08:00
|
|
|
|
2012-11-19 10:49:08 +08:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2011-11-30 09:47:09 -08:00
|
|
|
|
2012-11-19 10:49:08 +08:00
|
|
|
|
|
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
2013-08-12 21:42:15 -07:00
|
|
|
|
|
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
2012-11-19 10:49:08 +08:00
|
|
|
|
|
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2015-05-02 10:50:05 -04:00
|
|
|
|
2013-04-07 16:28:49 +08:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2015-03-17 22:25:59 +00:00
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2010-04-06 15:14:15 -07:00
|
|
|
|
2015-06-10 17:26:13 +08:00
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2011-05-04 11:33:47 -07:00
|
|
|
|
2015-05-01 17:49:16 +08:00
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2015-06-10 17:26:13 +08:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
2015-06-10 17:26:13 +08:00
|
|
|
|
|
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
2015-06-10 17:26:13 +08:00
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
2011-11-30 09:47:09 -08:00
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
2015-05-01 17:49:16 +08:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2013-01-31 04:05:39 -08:00
|
|
|
|
|
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2013-01-31 03:40:12 -08:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2013-01-31 04:05:39 -08:00
|
|
|
|
|
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2013-01-31 03:40:12 -08:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2013-11-11 15:18:03 +08:00
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2015-06-10 17:26:13 +08:00
|
|
|
|
|
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2011-11-30 09:47:09 -08:00
|
|
|
|
2015-05-01 17:49:16 +08:00
|
|
|
|
|
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
2011-05-04 11:33:47 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2013-11-11 15:18:03 +08:00
|
|
|
|
ceph: Fix up after semantic merge conflict
The previous ceph-client merge resulted in ceph not even building,
because there was a merge conflict that wasn't visible as an actual data
conflict: commit 7221fe4c2ed7 ("ceph: add acl for cephfs") added support
for POSIX ACL's into Ceph, but unluckily we also had the VFS tree change
a lot of the POSIX ACL helper functions to be much more helpful to
filesystems (see for example commits 2aeccbe957d0 "fs: add generic
xattr_acl handlers", 5bf3258fd2ac "fs: make posix_acl_chmod more useful"
and 37bc15392a23 "fs: make posix_acl_create more useful")
The reason this conflict wasn't obvious was many-fold: because it was a
semantic conflict rather than a data conflict, it wasn't visible in the
git merge as a conflict. And because the VFS tree hadn't been in
linux-next, people hadn't become aware of it that way. And because I
was at jury duty this morning, I was using my laptop and as a result not
doing constant "allmodconfig" builds.
Anyway, this fixes the build and generally removes a fair chunk of the
Ceph POSIX ACL support code, since the improved helpers seem to match
really well for Ceph too. But I don't actually have any way to *test*
the end result, and I was really hoping for some ACK's for this. Oh,
well.
Not compiling certainly doesn't make things easier to test, so I'm
committing this without the acks after having waited for four hours...
Plus it's what I would have done for the merge had I noticed the
semantic conflict..
Reported-by: Dave Jones <davej@redhat.com>
Cc: Sage Weil <sage@inktank.com>
Cc: Guangliang Zhao <lucienchao@gmail.com>
Cc: Li Wang <li.wang@ubuntykylin.com>
Cc: Christoph Hellwig <hch@infradead.org>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2014-01-28 18:06:18 -08:00
|
|
|
|
2013-11-11 15:18:03 +08:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
2011-05-27 09:24:26 -07:00
|
|
|
|
|
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2013-02-05 13:52:29 -08:00
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2013-08-12 21:42:15 -07:00
|
|
|
|
|
|
|
|
|
2015-06-10 17:26:13 +08:00
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
2013-11-11 15:18:03 +08:00
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
2015-06-10 17:26:13 +08:00
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2014-11-14 21:56:29 +08:00
|
|
|
|
|
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
2010-04-06 15:14:15 -07:00
|
|
|
|
|
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2014-11-14 21:56:29 +08:00
|
|
|
|
|
|
|
|
|
2014-09-16 21:46:17 +08:00
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2011-05-27 09:24:26 -07:00
|
|
|
|
|
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
2014-11-14 21:56:29 +08:00
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
2014-11-14 21:56:29 +08:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2011-06-20 19:28:19 -04:00
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
2011-01-07 17:49:58 +11:00
|
|
|
|
|
|
|
|
|
2011-06-20 19:28:19 -04:00
|
|
|
|
2011-01-07 17:49:58 +11:00
|
|
|
|
|
|
|
|
|
2014-09-16 21:46:17 +08:00
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
2011-06-20 19:16:29 -04:00
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2015-03-17 22:25:59 +00:00
|
|
|
|
2009-10-21 11:21:49 -07:00
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
2014-09-16 21:46:17 +08:00
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
2011-01-21 16:44:03 -08:00
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2009-10-21 11:21:49 -07:00
|
|
|
|
2011-01-12 16:53:27 -08:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2009-10-21 11:21:49 -07:00
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
2009-10-21 11:21:49 -07:00
|
|
|
|
2009-10-06 11:31:08 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|