diff options
| author | Andy Whitcroft <apw@canonical.com> | 2011-06-20 09:18:45 +0100 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2011-09-23 08:51:48 -0600 |
| commit | ce7a82521459939cbcc8279ca5c6795c71050447 (patch) | |
| tree | ea9366deb0e3e9aa4f431c7bc58141472722403f /ubuntu | |
| parent | 9dac022f7e48080d3e99a71a97896eb9a4477241 (diff) | |
UBUNTU: ubuntu: AUFS -- update to 0e2bafab74f0d1463383faeb93f9fc5eb8c2c54e
Remaining Ubuntu Changes:
UBUNTU: ubuntu: AUFS -- suppress benign plink warning messages
commit c94e2dda3f44d30237d0272e12a138a8330b897e
Author: J. R. Okajima <hooanon05@yahoo.co.jp>
Date: Fri Jun 17 20:06:08 2011 +0900
aufs stdalone: for 3.0, type of lock->owner
Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
commit 7cabd9e84f1f7e3fa9abaf3446ac43cd8f8d3249
Author: J. R. Okajima <hooanon05@yahoo.co.jp>
Date: Fri Jun 17 20:05:04 2011 +0900
aufs: for 3.0, type of i_state
Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
commit 1ff923dab46675db350cd5badd6214a549149a80
Author: J. R. Okajima <hooanon05@yahoo.co.jp>
Date: Thu Jun 16 21:30:53 2011 +0900
aufs: version string for linux-3.0
Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
commit 458e5469315321cf5c72f251343488189091c73a
Author: J. R. Okajima <hooanon05@yahoo.co.jp>
Date: Thu Jun 16 21:22:39 2011 +0900
aufs: version string for 2.1-39
Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Diffstat (limited to 'ubuntu')
| -rw-r--r-- | ubuntu/aufs/BOM | 4 | ||||
| -rw-r--r-- | ubuntu/aufs/debug.c | 2 | ||||
| -rw-r--r-- | ubuntu/aufs/inode.c | 2 | ||||
| -rw-r--r-- | ubuntu/aufs/mtx.h | 4 | ||||
| -rw-r--r-- | ubuntu/include/linux/aufs_type.h | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/ubuntu/aufs/BOM b/ubuntu/aufs/BOM index 7e00c74bd46..3eb658162e5 100644 --- a/ubuntu/aufs/BOM +++ b/ubuntu/aufs/BOM @@ -1,3 +1,3 @@ URL: http://git.c3sl.ufpr.br/pub/scm/aufs/aufs2-standalone.git -COMMIT: e96367386e93fff556a6396f6a4fd540303f608e -CHANGELOG: c6b76974311efc5bf3eddf921cd015b6aae46935 +COMMIT: 0e2bafab74f0d1463383faeb93f9fc5eb8c2c54e +CHANGELOG: c94e2dda3f44d30237d0272e12a138a8330b897e diff --git a/ubuntu/aufs/debug.c b/ubuntu/aufs/debug.c index 0b51ff521b0..39ada88882d 100644 --- a/ubuntu/aufs/debug.c +++ b/ubuntu/aufs/debug.c @@ -98,7 +98,7 @@ static int do_pri_inode(aufs_bindex_t bindex, struct inode *inode, } dpri("i%d: i%lu, %s, cnt %d, nl %u, 0%o, sz %llu, blk %llu," - " ct %lld, np %lu, st 0x%lx, f 0x%x, v %llu, g %x%s%.*s\n", + " ct %lld, np %lu, st 0x%x, f 0x%x, v %llu, g %x%s%.*s\n", bindex, inode->i_ino, inode->i_sb ? au_sbtype(inode->i_sb) : "??", atomic_read(&inode->i_count), inode->i_nlink, inode->i_mode, diff --git a/ubuntu/aufs/inode.c b/ubuntu/aufs/inode.c index 00ae8877b7d..44e4516cbd1 100644 --- a/ubuntu/aufs/inode.c +++ b/ubuntu/aufs/inode.c @@ -365,7 +365,7 @@ new_ino: if (IS_ERR(inode)) goto out; - AuDbg("%lx, new %d\n", inode->i_state, !!(inode->i_state & I_NEW)); + AuDbg("%x, new %d\n", inode->i_state, !!(inode->i_state & I_NEW)); if (inode->i_state & I_NEW) { ii_write_lock_new_child(inode); err = set_inode(inode, dentry); diff --git a/ubuntu/aufs/mtx.h b/ubuntu/aufs/mtx.h index 31f1abc736a..df1250aa000 100644 --- a/ubuntu/aufs/mtx.h +++ b/ubuntu/aufs/mtx.h @@ -33,13 +33,13 @@ struct thread_info; #ifdef CONFIG_DEBUG_MUTEXES static inline void mutex_set_owner(struct mutex *lock) { - lock->owner = current_thread_info(); + lock->owner = current; } #else static inline void mutex_set_owner(struct mutex *lock) { #ifdef CONFIG_SMP - lock->owner = current_thread_info(); + lock->owner = current; #endif } #endif diff --git a/ubuntu/include/linux/aufs_type.h b/ubuntu/include/linux/aufs_type.h index 487a693a213..387737b3cab 100644 --- a/ubuntu/include/linux/aufs_type.h +++ b/ubuntu/include/linux/aufs_type.h @@ -24,7 +24,7 @@ #include <linux/limits.h> #include <linux/types.h> -#define AUFS_VERSION "2.1-standalone.tree-39-rcN-20110418" +#define AUFS_VERSION "2.1-standalone.tree-3.0-rcN-20110620" /* todo? move this to linux-2.6.19/include/magic.h */ #define AUFS_SUPER_MAGIC ('a' << 24 | 'u' << 16 | 'f' << 8 | 's') |