3 diff --git a/fs/Kconfig b/fs/Kconfig
4 index 5f4c45d..357a8a6 100644
7 @@ -215,6 +215,7 @@ source "fs/pstore/Kconfig"
8 source "fs/sysv/Kconfig"
9 source "fs/ufs/Kconfig"
10 source "fs/exofs/Kconfig"
11 +source "fs/aufs/Kconfig"
13 endif # MISC_FILESYSTEMS
15 diff --git a/fs/Makefile b/fs/Makefile
16 index d2c3353..680ad8a 100644
19 @@ -123,3 +123,4 @@ obj-$(CONFIG_GFS2_FS) += gfs2/
20 obj-y += exofs/ # Multiple modules
21 obj-$(CONFIG_CEPH_FS) += ceph/
22 obj-$(CONFIG_PSTORE) += pstore/
23 +obj-$(CONFIG_AUFS_FS) += aufs/
24 diff --git a/include/linux/Kbuild b/include/linux/Kbuild
25 index 619b565..29f386b 100644
26 --- a/include/linux/Kbuild
27 +++ b/include/linux/Kbuild
28 @@ -65,6 +65,7 @@ header-y += atmppp.h
32 +header-y += aufs_type.h
34 header-y += auto_fs4.h
38 diff --git a/fs/namei.c b/fs/namei.c
39 index 5008f01..4cc94cf 100644
42 @@ -1753,7 +1753,7 @@ static struct dentry *__lookup_hash(struct qstr *name,
43 * needs parent already locked. Doesn't follow mounts.
46 -static struct dentry *lookup_hash(struct nameidata *nd)
47 +struct dentry *lookup_hash(struct nameidata *nd)
49 return __lookup_hash(&nd->last, nd->path.dentry, nd);
51 diff --git a/fs/splice.c b/fs/splice.c
52 index fa2defa..e3569b0 100644
55 @@ -1085,8 +1085,8 @@ EXPORT_SYMBOL(generic_splice_sendpage);
57 * Attempt to initiate a splice from pipe to file.
59 -static long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
60 - loff_t *ppos, size_t len, unsigned int flags)
61 +long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
62 + loff_t *ppos, size_t len, unsigned int flags)
64 ssize_t (*splice_write)(struct pipe_inode_info *, struct file *,
65 loff_t *, size_t, unsigned int);
66 @@ -1113,9 +1113,9 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
68 * Attempt to initiate a splice from a file to a pipe.
70 -static long do_splice_to(struct file *in, loff_t *ppos,
71 - struct pipe_inode_info *pipe, size_t len,
73 +long do_splice_to(struct file *in, loff_t *ppos,
74 + struct pipe_inode_info *pipe, size_t len,
77 ssize_t (*splice_read)(struct file *, loff_t *,
78 struct pipe_inode_info *, size_t, unsigned int);
79 diff --git a/include/linux/namei.h b/include/linux/namei.h
80 index ffc0213..ef35a31 100644
81 --- a/include/linux/namei.h
82 +++ b/include/linux/namei.h
83 @@ -85,6 +85,7 @@ extern int vfs_path_lookup(struct dentry *, struct vfsmount *,
84 extern struct file *lookup_instantiate_filp(struct nameidata *nd, struct dentry *dentry,
85 int (*open)(struct inode *, struct file *));
87 +extern struct dentry *lookup_hash(struct nameidata *nd);
88 extern struct dentry *lookup_one_len(const char *, struct dentry *, int);
90 extern int follow_down_one(struct path *);
91 diff --git a/include/linux/splice.h b/include/linux/splice.h
92 index 26e5b61..3ffef2f 100644
93 --- a/include/linux/splice.h
94 +++ b/include/linux/splice.h
95 @@ -91,4 +91,10 @@ extern void splice_shrink_spd(struct pipe_inode_info *,
96 extern void spd_release_page(struct splice_pipe_desc *, unsigned int);
98 extern const struct pipe_buf_operations page_cache_pipe_buf_ops;
100 +extern long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
101 + loff_t *ppos, size_t len, unsigned int flags);
102 +extern long do_splice_to(struct file *in, loff_t *ppos,
103 + struct pipe_inode_info *pipe, size_t len,
104 + unsigned int flags);
106 aufs3.2 standalone patch
108 diff --git a/fs/file_table.c b/fs/file_table.c
109 index c322794..2aad244 100644
110 --- a/fs/file_table.c
111 +++ b/fs/file_table.c
112 @@ -443,6 +443,8 @@ void file_sb_list_del(struct file *file)
116 +EXPORT_SYMBOL(file_sb_list_del);
121 diff --git a/fs/inode.c b/fs/inode.c
122 index ee4e66b..728042b 100644
125 @@ -65,6 +65,7 @@ static struct hlist_head *inode_hashtable __read_mostly;
126 static __cacheline_aligned_in_smp DEFINE_SPINLOCK(inode_hash_lock);
128 __cacheline_aligned_in_smp DEFINE_SPINLOCK(inode_sb_list_lock);
129 +EXPORT_SYMBOL(inode_sb_list_lock);
132 * Empty aops. Can be used for the cases where the user does not
133 diff --git a/fs/namei.c b/fs/namei.c
134 index 4cc94cf..af19e30 100644
137 @@ -1757,6 +1757,7 @@ struct dentry *lookup_hash(struct nameidata *nd)
139 return __lookup_hash(&nd->last, nd->path.dentry, nd);
141 +EXPORT_SYMBOL(lookup_hash);
144 * lookup_one_len - filesystem helper to lookup single pathname component
145 diff --git a/fs/namespace.c b/fs/namespace.c
146 index cfc6d44..173d15a 100644
149 @@ -1506,6 +1506,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg,
153 +EXPORT_SYMBOL(iterate_mounts);
155 static void cleanup_group_ids(struct vfsmount *mnt, struct vfsmount *end)
157 diff --git a/fs/notify/group.c b/fs/notify/group.c
158 index 63fc294..6f4adca 100644
159 --- a/fs/notify/group.c
160 +++ b/fs/notify/group.c
162 #include <linux/srcu.h>
163 #include <linux/rculist.h>
164 #include <linux/wait.h>
165 +#include <linux/module.h>
167 #include <linux/fsnotify_backend.h>
168 #include "fsnotify.h"
169 @@ -70,6 +71,7 @@ void fsnotify_put_group(struct fsnotify_group *group)
170 if (atomic_dec_and_test(&group->refcnt))
171 fsnotify_destroy_group(group);
173 +EXPORT_SYMBOL(fsnotify_put_group);
176 * Create a new fsnotify_group and hold a reference for the group returned.
177 @@ -102,3 +104,4 @@ struct fsnotify_group *fsnotify_alloc_group(const struct fsnotify_ops *ops)
181 +EXPORT_SYMBOL(fsnotify_alloc_group);
182 diff --git a/fs/notify/mark.c b/fs/notify/mark.c
183 index e14587d..be6533b 100644
184 --- a/fs/notify/mark.c
185 +++ b/fs/notify/mark.c
186 @@ -112,6 +112,7 @@ void fsnotify_put_mark(struct fsnotify_mark *mark)
187 if (atomic_dec_and_test(&mark->refcnt))
188 mark->free_mark(mark);
190 +EXPORT_SYMBOL(fsnotify_put_mark);
193 * Any time a mark is getting freed we end up here.
194 @@ -189,6 +190,7 @@ void fsnotify_destroy_mark(struct fsnotify_mark *mark)
195 if (unlikely(atomic_dec_and_test(&group->num_marks)))
196 fsnotify_final_destroy_group(group);
198 +EXPORT_SYMBOL(fsnotify_destroy_mark);
200 void fsnotify_set_mark_mask_locked(struct fsnotify_mark *mark, __u32 mask)
202 @@ -276,6 +278,7 @@ err:
206 +EXPORT_SYMBOL(fsnotify_add_mark);
209 * clear any marks in a group in which mark->flags & flags is true
210 @@ -331,6 +334,7 @@ void fsnotify_init_mark(struct fsnotify_mark *mark,
211 atomic_set(&mark->refcnt, 1);
212 mark->free_mark = free_mark;
214 +EXPORT_SYMBOL(fsnotify_init_mark);
216 static int fsnotify_mark_destroy(void *ignored)
218 diff --git a/fs/open.c b/fs/open.c
219 index 22c41b5..33b4033 100644
222 @@ -60,6 +60,7 @@ int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs,
223 mutex_unlock(&dentry->d_inode->i_mutex);
226 +EXPORT_SYMBOL(do_truncate);
228 static long do_sys_truncate(const char __user *pathname, loff_t length)
230 diff --git a/fs/splice.c b/fs/splice.c
231 index e3569b0..9dc07b7 100644
234 @@ -1109,6 +1109,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
236 return splice_write(pipe, out, ppos, len, flags);
238 +EXPORT_SYMBOL(do_splice_from);
241 * Attempt to initiate a splice from a file to a pipe.
242 @@ -1135,6 +1136,7 @@ long do_splice_to(struct file *in, loff_t *ppos,
244 return splice_read(in, ppos, pipe, len, flags);
246 +EXPORT_SYMBOL(do_splice_to);
249 * splice_direct_to_actor - splices data directly between two non-pipes
250 diff --git a/security/commoncap.c b/security/commoncap.c
251 index ee4f848..611fd70 100644
252 --- a/security/commoncap.c
253 +++ b/security/commoncap.c
254 @@ -975,3 +975,4 @@ int cap_file_mmap(struct file *file, unsigned long reqprot,
258 +EXPORT_SYMBOL(cap_file_mmap);
259 diff --git a/security/device_cgroup.c b/security/device_cgroup.c
260 index 4450fbe..bc94175 100644
261 --- a/security/device_cgroup.c
262 +++ b/security/device_cgroup.c
264 #include <linux/device_cgroup.h>
265 #include <linux/cgroup.h>
266 #include <linux/ctype.h>
267 +#include <linux/export.h>
268 #include <linux/list.h>
269 #include <linux/uaccess.h>
270 #include <linux/seq_file.h>
271 @@ -500,6 +501,7 @@ found:
275 +EXPORT_SYMBOL(__devcgroup_inode_permission);
277 int devcgroup_inode_mknod(int mode, dev_t dev)
279 diff --git a/security/security.c b/security/security.c
280 index e2f684a..892000c 100644
281 --- a/security/security.c
282 +++ b/security/security.c
283 @@ -411,6 +411,7 @@ int security_path_rmdir(struct path *dir, struct dentry *dentry)
285 return security_ops->path_rmdir(dir, dentry);
287 +EXPORT_SYMBOL(security_path_rmdir);
289 int security_path_unlink(struct path *dir, struct dentry *dentry)
291 @@ -427,6 +428,7 @@ int security_path_symlink(struct path *dir, struct dentry *dentry,
293 return security_ops->path_symlink(dir, dentry, old_name);
295 +EXPORT_SYMBOL(security_path_symlink);
297 int security_path_link(struct dentry *old_dentry, struct path *new_dir,
298 struct dentry *new_dentry)
299 @@ -435,6 +437,7 @@ int security_path_link(struct dentry *old_dentry, struct path *new_dir,
301 return security_ops->path_link(old_dentry, new_dir, new_dentry);
303 +EXPORT_SYMBOL(security_path_link);
305 int security_path_rename(struct path *old_dir, struct dentry *old_dentry,
306 struct path *new_dir, struct dentry *new_dentry)
307 @@ -453,6 +456,7 @@ int security_path_truncate(struct path *path)
309 return security_ops->path_truncate(path);
311 +EXPORT_SYMBOL(security_path_truncate);
313 int security_path_chmod(struct dentry *dentry, struct vfsmount *mnt,
315 @@ -461,6 +465,7 @@ int security_path_chmod(struct dentry *dentry, struct vfsmount *mnt,
317 return security_ops->path_chmod(dentry, mnt, mode);
319 +EXPORT_SYMBOL(security_path_chmod);
321 int security_path_chown(struct path *path, uid_t uid, gid_t gid)
323 @@ -468,6 +473,7 @@ int security_path_chown(struct path *path, uid_t uid, gid_t gid)
325 return security_ops->path_chown(path, uid, gid);
327 +EXPORT_SYMBOL(security_path_chown);
329 int security_path_chroot(struct path *path)
331 @@ -544,6 +550,7 @@ int security_inode_readlink(struct dentry *dentry)
333 return security_ops->inode_readlink(dentry);
335 +EXPORT_SYMBOL(security_inode_readlink);
337 int security_inode_follow_link(struct dentry *dentry, struct nameidata *nd)
339 @@ -558,6 +565,7 @@ int security_inode_permission(struct inode *inode, int mask)
341 return security_ops->inode_permission(inode, mask);
343 +EXPORT_SYMBOL(security_inode_permission);
345 int security_inode_setattr(struct dentry *dentry, struct iattr *attr)
347 @@ -673,6 +681,7 @@ int security_file_permission(struct file *file, int mask)
349 return fsnotify_perm(file, mask);
351 +EXPORT_SYMBOL(security_file_permission);
353 int security_file_alloc(struct file *file)
355 @@ -700,6 +709,7 @@ int security_file_mmap(struct file *file, unsigned long reqprot,
357 return ima_file_mmap(file, prot);
359 +EXPORT_SYMBOL(security_file_mmap);
361 int security_file_mprotect(struct vm_area_struct *vma, unsigned long reqprot,
363 diff -urN /usr/share/empty/Documentation/ABI/testing/debugfs-aufs linux/Documentation/ABI/testing/debugfs-aufs
364 --- /usr/share/empty/Documentation/ABI/testing/debugfs-aufs 1970-01-01 01:00:00.000000000 +0100
365 +++ linux/Documentation/ABI/testing/debugfs-aufs 2012-02-13 21:54:56.963104881 +0100
367 +What: /debug/aufs/si_<id>/
369 +Contact: J. R. Okajima <hooanon05@yahoo.co.jp>
371 + Under /debug/aufs, a directory named si_<id> is created
372 + per aufs mount, where <id> is a unique id generated
375 +What: /debug/aufs/si_<id>/xib
377 +Contact: J. R. Okajima <hooanon05@yahoo.co.jp>
379 + It shows the consumed blocks by xib (External Inode Number
380 + Bitmap), its block size and file size.
381 + When the aufs mount option 'noxino' is specified, it
382 + will be empty. About XINO files, see the aufs manual.
384 +What: /debug/aufs/si_<id>/xino0, xino1 ... xinoN
386 +Contact: J. R. Okajima <hooanon05@yahoo.co.jp>
388 + It shows the consumed blocks by xino (External Inode Number
389 + Translation Table), its link count, block size and file
391 + When the aufs mount option 'noxino' is specified, it
392 + will be empty. About XINO files, see the aufs manual.
394 +What: /debug/aufs/si_<id>/xigen
396 +Contact: J. R. Okajima <hooanon05@yahoo.co.jp>
398 + It shows the consumed blocks by xigen (External Inode
399 + Generation Table), its block size and file size.
400 + If CONFIG_AUFS_EXPORT is disabled, this entry will not
402 + When the aufs mount option 'noxino' is specified, it
403 + will be empty. About XINO files, see the aufs manual.
404 diff -urN /usr/share/empty/Documentation/ABI/testing/sysfs-aufs linux/Documentation/ABI/testing/sysfs-aufs
405 --- /usr/share/empty/Documentation/ABI/testing/sysfs-aufs 1970-01-01 01:00:00.000000000 +0100
406 +++ linux/Documentation/ABI/testing/sysfs-aufs 2012-02-13 21:54:56.963104881 +0100
408 +What: /sys/fs/aufs/si_<id>/
410 +Contact: J. R. Okajima <hooanon05@yahoo.co.jp>
412 + Under /sys/fs/aufs, a directory named si_<id> is created
413 + per aufs mount, where <id> is a unique id generated
416 +What: /sys/fs/aufs/si_<id>/br0, br1 ... brN
418 +Contact: J. R. Okajima <hooanon05@yahoo.co.jp>
420 + It shows the abolute path of a member directory (which
421 + is called branch) in aufs, and its permission.
423 +What: /sys/fs/aufs/si_<id>/xi_path
425 +Contact: J. R. Okajima <hooanon05@yahoo.co.jp>
427 + It shows the abolute path of XINO (External Inode Number
428 + Bitmap, Translation Table and Generation Table) file
429 + even if it is the default path.
430 + When the aufs mount option 'noxino' is specified, it
431 + will be empty. About XINO files, see the aufs manual.
432 diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/01intro.txt linux/Documentation/filesystems/aufs/design/01intro.txt
433 --- /usr/share/empty/Documentation/filesystems/aufs/design/01intro.txt 1970-01-01 01:00:00.000000000 +0100
434 +++ linux/Documentation/filesystems/aufs/design/01intro.txt 2012-02-13 21:54:56.963104881 +0100
437 +# Copyright (C) 2005-2011 Junjiro R. Okajima
439 +# This program is free software; you can redistribute it and/or modify
440 +# it under the terms of the GNU General Public License as published by
441 +# the Free Software Foundation; either version 2 of the License, or
442 +# (at your option) any later version.
444 +# This program is distributed in the hope that it will be useful,
445 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
446 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
447 +# GNU General Public License for more details.
449 +# You should have received a copy of the GNU General Public License
450 +# along with this program; if not, write to the Free Software
451 +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
454 +----------------------------------------
456 +aufs [ei ju: ef es] | [a u f s]
457 +1. abbrev. for "advanced multi-layered unification filesystem".
458 +2. abbrev. for "another unionfs".
459 +3. abbrev. for "auf das" in German which means "on the" in English.
460 + Ex. "Butter aufs Brot"(G) means "butter onto bread"(E).
461 + But "Filesystem aufs Filesystem" is hard to understand.
463 +AUFS is a filesystem with features:
464 +- multi layered stackable unification filesystem, the member directory
465 + is called as a branch.
466 +- branch permission and attribute, 'readonly', 'real-readonly',
467 + 'readwrite', 'whiteout-able', 'link-able whiteout' and their
469 +- internal "file copy-on-write".
470 +- logical deletion, whiteout.
471 +- dynamic branch manipulation, adding, deleting and changing permission.
472 +- allow bypassing aufs, user's direct branch access.
473 +- external inode number translation table and bitmap which maintains the
474 + persistent aufs inode number.
475 +- seekable directory, including NFS readdir.
476 +- file mapping, mmap and sharing pages.
477 +- pseudo-link, hardlink over branches.
478 +- loopback mounted filesystem as a branch.
479 +- several policies to select one among multiple writable branches.
480 +- revert a single systemcall when an error occurs in aufs.
484 +Multi Layered Stackable Unification Filesystem
485 +----------------------------------------------------------------------
486 +Most people already knows what it is.
487 +It is a filesystem which unifies several directories and provides a
488 +merged single directory. When users access a file, the access will be
489 +passed/re-directed/converted (sorry, I am not sure which English word is
490 +correct) to the real file on the member filesystem. The member
491 +filesystem is called 'lower filesystem' or 'branch' and has a mode
492 +'readonly' and 'readwrite.' And the deletion for a file on the lower
493 +readonly branch is handled by creating 'whiteout' on the upper writable
496 +On LKML, there have been discussions about UnionMount (Jan Blunck,
497 +Bharata B Rao and Valerie Aurora) and Unionfs (Erez Zadok). They took
498 +different approaches to implement the merged-view.
499 +The former tries putting it into VFS, and the latter implements as a
500 +separate filesystem.
501 +(If I misunderstand about these implementations, please let me know and
502 +I shall correct it. Because it is a long time ago when I read their
503 +source files last time).
505 +UnionMount's approach will be able to small, but may be hard to share
506 +branches between several UnionMount since the whiteout in it is
507 +implemented in the inode on branch filesystem and always
508 +shared. According to Bharata's post, readdir does not seems to be
510 +There are several missing features known in this implementations such as
511 +- for users, the inode number may change silently. eg. copy-up.
512 +- link(2) may break by copy-up.
513 +- read(2) may get an obsoleted filedata (fstat(2) too).
514 +- fcntl(F_SETLK) may be broken by copy-up.
515 +- unnecessary copy-up may happen, for example mmap(MAP_PRIVATE) after
518 +Unionfs has a longer history. When I started implementing a stacking filesystem
519 +(Aug 2005), it already existed. It has virtual super_block, inode,
520 +dentry and file objects and they have an array pointing lower same kind
521 +objects. After contributing many patches for Unionfs, I re-started my
522 +project AUFS (Jun 2006).
524 +In AUFS, the structure of filesystem resembles to Unionfs, but I
525 +implemented my own ideas, approaches and enhancements and it became
526 +totally different one.
528 +Comparing DM snapshot and fs based implementation
529 +- the number of bytes to be copied between devices is much smaller.
530 +- the type of filesystem must be one and only.
531 +- the fs must be writable, no readonly fs, even for the lower original
532 + device. so the compression fs will not be usable. but if we use
533 + loopback mount, we may address this issue.
535 + mount /cdrom/squashfs.img /sq
536 + losetup /sq/ext2.img
537 + losetup /somewhere/cow
538 + dmsetup "snapshot /dev/loop0 /dev/loop1 ..."
539 +- it will be difficult (or needs more operations) to extract the
540 + difference between the original device and COW.
541 +- DM snapshot-merge may help a lot when users try merging. in the
542 + fs-layer union, users will use rsync(1).
545 +Several characters/aspects of aufs
546 +----------------------------------------------------------------------
548 +Aufs has several characters or aspects.
549 +1. a filesystem, callee of VFS helper
550 +2. sub-VFS, caller of VFS helper for branches
551 +3. a virtual filesystem which maintains persistent inode number
552 +4. reader/writer of files on branches such like an application
554 +1. Callee of VFS Helper
555 +As an ordinary linux filesystem, aufs is a callee of VFS. For instance,
556 +unlink(2) from an application reaches sys_unlink() kernel function and
557 +then vfs_unlink() is called. vfs_unlink() is one of VFS helper and it
558 +calls filesystem specific unlink operation. Actually aufs implements the
559 +unlink operation but it behaves like a redirector.
561 +2. Caller of VFS Helper for Branches
562 +aufs_unlink() passes the unlink request to the branch filesystem as if
563 +it were called from VFS. So the called unlink operation of the branch
564 +filesystem acts as usual. As a caller of VFS helper, aufs should handle
565 +every necessary pre/post operation for the branch filesystem.
566 +- acquire the lock for the parent dir on a branch
567 +- lookup in a branch
568 +- revalidate dentry on a branch
569 +- mnt_want_write() for a branch
570 +- vfs_unlink() for a branch
571 +- mnt_drop_write() for a branch
572 +- release the lock on a branch
574 +3. Persistent Inode Number
575 +One of the most important issue for a filesystem is to maintain inode
576 +numbers. This is particularly important to support exporting a
577 +filesystem via NFS. Aufs is a virtual filesystem which doesn't have a
578 +backend block device for its own. But some storage is necessary to
579 +maintain inode number. It may be a large space and may not suit to keep
580 +in memory. Aufs rents some space from its first writable branch
581 +filesystem (by default) and creates file(s) on it. These files are
582 +created by aufs internally and removed soon (currently) keeping opened.
583 +Note: Because these files are removed, they are totally gone after
584 + unmounting aufs. It means the inode numbers are not persistent
585 + across unmount or reboot. I have a plan to make them really
586 + persistent which will be important for aufs on NFS server.
588 +4. Read/Write Files Internally (copy-on-write)
589 +Because a branch can be readonly, when you write a file on it, aufs will
590 +"copy-up" it to the upper writable branch internally. And then write the
591 +originally requested thing to the file. Generally kernel doesn't
592 +open/read/write file actively. In aufs, even a single write may cause a
593 +internal "file copy". This behaviour is very similar to cp(1) command.
595 +Some people may think it is better to pass such work to user space
596 +helper, instead of doing in kernel space. Actually I am still thinking
597 +about it. But currently I have implemented it in kernel space.
598 diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/02struct.txt linux/Documentation/filesystems/aufs/design/02struct.txt
599 --- /usr/share/empty/Documentation/filesystems/aufs/design/02struct.txt 1970-01-01 01:00:00.000000000 +0100
600 +++ linux/Documentation/filesystems/aufs/design/02struct.txt 2012-02-13 21:54:56.963104881 +0100
603 +# Copyright (C) 2005-2011 Junjiro R. Okajima
605 +# This program is free software; you can redistribute it and/or modify
606 +# it under the terms of the GNU General Public License as published by
607 +# the Free Software Foundation; either version 2 of the License, or
608 +# (at your option) any later version.
610 +# This program is distributed in the hope that it will be useful,
611 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
612 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
613 +# GNU General Public License for more details.
615 +# You should have received a copy of the GNU General Public License
616 +# along with this program; if not, write to the Free Software
617 +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
619 +Basic Aufs Internal Structure
621 +Superblock/Inode/Dentry/File Objects
622 +----------------------------------------------------------------------
623 +As like an ordinary filesystem, aufs has its own
624 +superblock/inode/dentry/file objects. All these objects have a
625 +dynamically allocated array and store the same kind of pointers to the
626 +lower filesystem, branch.
627 +For example, when you build a union with one readwrite branch and one
628 +readonly, mounted /au, /rw and /ro respectively.
630 +- /ro/fileA exists but /rw/fileA
632 +Aufs lookup operation finds /ro/fileA and gets dentry for that. These
633 +pointers are stored in a aufs dentry. The array in aufs dentry will be,
637 +This style of an array is essentially same to the aufs
638 +superblock/inode/dentry/file objects.
640 +Because aufs supports manipulating branches, ie. add/delete/change
641 +dynamically, these objects has its own generation. When branches are
642 +changed, the generation in aufs superblock is incremented. And a
643 +generation in other object are compared when it is accessed.
644 +When a generation in other objects are obsoleted, aufs refreshes the
649 +----------------------------------------------------------------------
650 +Additionally aufs superblock has some data for policies to select one
651 +among multiple writable branches, XIB files, pseudo-links and kobject.
652 +See below in detail.
653 +About the policies which supports copy-down a directory, see policy.txt
657 +Branch and XINO(External Inode Number Translation Table)
658 +----------------------------------------------------------------------
659 +Every branch has its own xino (external inode number translation table)
660 +file. The xino file is created and unlinked by aufs internally. When two
661 +members of a union exist on the same filesystem, they share the single
663 +The struct of a xino file is simple, just a sequence of aufs inode
664 +numbers which is indexed by the lower inode number.
665 +In the above sample, assume the inode number of /ro/fileA is i111 and
666 +aufs assigns the inode number i999 for fileA. Then aufs writes 999 as
667 +4(8) bytes at 111 * 4(8) bytes offset in the xino file.
669 +When the inode numbers are not contiguous, the xino file will be sparse
670 +which has a hole in it and doesn't consume as much disk space as it
671 +might appear. If your branch filesystem consumes disk space for such
672 +holes, then you should specify 'xino=' option at mounting aufs.
674 +Also a writable branch has three kinds of "whiteout bases". All these
675 +are existed when the branch is joined to aufs and the names are
676 +whiteout-ed doubly, so that users will never see their names in aufs
678 +1. a regular file which will be linked to all whiteouts.
679 +2. a directory to store a pseudo-link.
680 +3. a directory to store an "orphan-ed" file temporary.
683 + When you remove a file on a readonly branch, aufs handles it as a
684 + logical deletion and creates a whiteout on the upper writable branch
685 + as a hardlink of this file in order not to consume inode on the
688 + See below, Pseudo-link.
690 + When "fileC" exists on the lower readonly branch only and it is
691 + opened and removed with its parent dir, and then user writes
692 + something into it, then aufs copies-up fileC to this
693 + directory. Because there is no other dir to store fileC. After
694 + creating a file under this dir, the file is unlinked.
696 +Because aufs supports manipulating branches, ie. add/delete/change
697 +dynamically, a branch has its own id. When the branch order changes, aufs
698 +finds the new index by searching the branch id.
702 +----------------------------------------------------------------------
703 +Assume "fileA" exists on the lower readonly branch only and it is
704 +hardlinked to "fileB" on the branch. When you write something to fileA,
705 +aufs copies-up it to the upper writable branch. Additionally aufs
706 +creates a hardlink under the Pseudo-link Directory of the writable
707 +branch. The inode of a pseudo-link is kept in aufs super_block as a
708 +simple list. If fileB is read after unlinking fileA, aufs returns
709 +filedata from the pseudo-link instead of the lower readonly
710 +branch. Because the pseudo-link is based upon the inode, to keep the
711 +inode number by xino (see above) is important.
713 +All the hardlinks under the Pseudo-link Directory of the writable branch
714 +should be restored in a proper location later. Aufs provides a utility
715 +to do this. The userspace helpers executed at remounting and unmounting
717 +During this utility is running, it puts aufs into the pseudo-link
718 +maintenance mode. In this mode, only the process which began the
719 +maintenance mode (and its child processes) is allowed to operate in
720 +aufs. Some other processes which are not related to the pseudo-link will
721 +be allowed to run too, but the rest have to return an error or wait
722 +until the maintenance mode ends. If a process already acquires an inode
723 +mutex (in VFS), it has to return an error.
726 +XIB(external inode number bitmap)
727 +----------------------------------------------------------------------
728 +Addition to the xino file per a branch, aufs has an external inode number
729 +bitmap in a superblock object. It is also a file such like a xino file.
730 +It is a simple bitmap to mark whether the aufs inode number is in-use or
732 +To reduce the file I/O, aufs prepares a single memory page to cache xib.
734 +Aufs implements a feature to truncate/refresh both of xino and xib to
735 +reduce the number of consumed disk blocks for these files.
738 +Virtual or Vertical Dir, and Readdir in Userspace
739 +----------------------------------------------------------------------
740 +In order to support multiple layers (branches), aufs readdir operation
741 +constructs a virtual dir block on memory. For readdir, aufs calls
742 +vfs_readdir() internally for each dir on branches, merges their entries
743 +with eliminating the whiteout-ed ones, and sets it to file (dir)
744 +object. So the file object has its entry list until it is closed. The
745 +entry list will be updated when the file position is zero and becomes
746 +old. This decision is made in aufs automatically.
748 +The dynamically allocated memory block for the name of entries has a
749 +unit of 512 bytes (by default) and stores the names contiguously (no
750 +padding). Another block for each entry is handled by kmem_cache too.
751 +During building dir blocks, aufs creates hash list and judging whether
752 +the entry is whiteouted by its upper branch or already listed.
753 +The merged result is cached in the corresponding inode object and
754 +maintained by a customizable life-time option.
756 +Some people may call it can be a security hole or invite DoS attack
757 +since the opened and once readdir-ed dir (file object) holds its entry
758 +list and becomes a pressure for system memory. But I'd say it is similar
759 +to files under /proc or /sys. The virtual files in them also holds a
760 +memory page (generally) while they are opened. When an idea to reduce
761 +memory for them is introduced, it will be applied to aufs too.
762 +For those who really hate this situation, I've developed readdir(3)
763 +library which operates this merging in userspace. You just need to set
764 +LD_PRELOAD environment variable, and aufs will not consume no memory in
765 +kernel space for readdir(3).
769 +----------------------------------------------------------------------
770 +Aufs sometimes requires privilege access to a branch. For instance,
771 +in copy-up/down operation. When a user process is going to make changes
772 +to a file which exists in the lower readonly branch only, and the mode
773 +of one of ancestor directories may not be writable by a user
774 +process. Here aufs copy-up the file with its ancestors and they may
775 +require privilege to set its owner/group/mode/etc.
776 +This is a typical case of a application character of aufs (see
779 +Aufs uses workqueue synchronously for this case. It creates its own
780 +workqueue. The workqueue is a kernel thread and has privilege. Aufs
781 +passes the request to call mkdir or write (for example), and wait for
782 +its completion. This approach solves a problem of a signal handler
784 +If aufs didn't adopt the workqueue and changed the privilege of the
785 +process, and if the mkdir/write call arises SIGXFSZ or other signal,
786 +then the user process might gain a privilege or the generated core file
787 +was owned by a superuser.
789 +Also aufs uses the system global workqueue ("events" kernel thread) too
790 +for asynchronous tasks, such like handling inotify/fsnotify, re-creating a
791 +whiteout base and etc. This is unrelated to a privilege.
792 +Most of aufs operation tries acquiring a rw_semaphore for aufs
793 +superblock at the beginning, at the same time waits for the completion
794 +of all queued asynchronous tasks.
798 +----------------------------------------------------------------------
799 +The whiteout in aufs is very similar to Unionfs's. That is represented
800 +by its filename. UnionMount takes an approach of a file mode, but I am
801 +afraid several utilities (find(1) or something) will have to support it.
803 +Basically the whiteout represents "logical deletion" which stops aufs to
804 +lookup further, but also it represents "dir is opaque" which also stop
807 +In aufs, rmdir(2) and rename(2) for dir uses whiteout alternatively.
808 +In order to make several functions in a single systemcall to be
809 +revertible, aufs adopts an approach to rename a directory to a temporary
810 +unique whiteouted name.
811 +For example, in rename(2) dir where the target dir already existed, aufs
812 +renames the target dir to a temporary unique whiteouted name before the
813 +actual rename on a branch and then handles other actions (make it opaque,
814 +update the attributes, etc). If an error happens in these actions, aufs
815 +simply renames the whiteouted name back and returns an error. If all are
816 +succeeded, aufs registers a function to remove the whiteouted unique
817 +temporary name completely and asynchronously to the system global
822 +----------------------------------------------------------------------
823 +It is a well-known feature or concept.
824 +When user modifies a file on a readonly branch, aufs operate "copy-up"
825 +internally and makes change to the new file on the upper writable branch.
826 +When the trigger systemcall does not update the timestamps of the parent
827 +dir, aufs reverts it after copy-up.
828 diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/03lookup.txt linux/Documentation/filesystems/aufs/design/03lookup.txt
829 --- /usr/share/empty/Documentation/filesystems/aufs/design/03lookup.txt 1970-01-01 01:00:00.000000000 +0100
830 +++ linux/Documentation/filesystems/aufs/design/03lookup.txt 2012-02-13 21:54:56.963104881 +0100
833 +# Copyright (C) 2005-2011 Junjiro R. Okajima
835 +# This program is free software; you can redistribute it and/or modify
836 +# it under the terms of the GNU General Public License as published by
837 +# the Free Software Foundation; either version 2 of the License, or
838 +# (at your option) any later version.
840 +# This program is distributed in the hope that it will be useful,
841 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
842 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
843 +# GNU General Public License for more details.
845 +# You should have received a copy of the GNU General Public License
846 +# along with this program; if not, write to the Free Software
847 +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
850 +----------------------------------------------------------------------
851 +Since aufs has a character of sub-VFS (see Introduction), it operates
852 +lookup for branches as VFS does. It may be a heavy work. Generally
853 +speaking struct nameidata is a bigger structure and includes many
854 +information. But almost all lookup operation in aufs is the simplest
855 +case, ie. lookup only an entry directly connected to its parent. Digging
856 +down the directory hierarchy is unnecessary.
858 +VFS has a function lookup_one_len() for that use, but it is not usable
859 +for a branch filesystem which requires struct nameidata. So aufs
860 +implements a simple lookup wrapper function. When a branch filesystem
861 +allows NULL as nameidata, it calls lookup_one_len(). Otherwise it builds
862 +a simplest nameidata and calls lookup_hash().
863 +Here aufs applies "a principle in NFSD", ie. if the filesystem supports
864 +NFS-export, then it has to support NULL as a nameidata parameter for
865 +->create(), ->lookup() and ->d_revalidate(). So the lookup wrapper in
866 +aufs tests if ->s_export_op in the branch is NULL or not.
868 +When a branch is a remote filesystem, aufs basically trusts its
869 +->d_revalidate(), also aufs forces the hardest revalidate tests for
871 +For d_revalidate, aufs implements three levels of revalidate tests. See
872 +"Revalidate Dentry and UDBA" in detail.
876 +----------------------------------------------------------------------
877 +Basically aufs supports any type of filesystem and block device for a
878 +branch (actually there are some exceptions). But it is prohibited to add
879 +a loopback mounted one whose backend file exists in a filesystem which is
880 +already added to aufs. The reason is to protect aufs from a recursive
881 +lookup. If it was allowed, the aufs lookup operation might re-enter a
882 +lookup for the loopback mounted branch in the same context, and will
886 +Revalidate Dentry and UDBA (User's Direct Branch Access)
887 +----------------------------------------------------------------------
888 +Generally VFS helpers re-validate a dentry as a part of lookup.
889 +0. digging down the directory hierarchy.
890 +1. lock the parent dir by its i_mutex.
891 +2. lookup the final (child) entry.
893 +4. call the actual operation (create, unlink, etc.)
894 +5. unlock the parent dir
896 +If the filesystem implements its ->d_revalidate() (step 3), then it is
897 +called. Actually aufs implements it and checks the dentry on a branch is
899 +But it is not enough. Because aufs has to release the lock for the
900 +parent dir on a branch at the end of ->lookup() (step 2) and
901 +->d_revalidate() (step 3) while the i_mutex of the aufs dir is still
903 +If the file on a branch is changed directly, eg. bypassing aufs, after
904 +aufs released the lock, then the subsequent operation may cause
905 +something unpleasant result.
907 +This situation is a result of VFS architecture, ->lookup() and
908 +->d_revalidate() is separated. But I never say it is wrong. It is a good
909 +design from VFS's point of view. It is just not suitable for sub-VFS
912 +Aufs supports such case by three level of revalidation which is
914 +1. Simple Revalidate
915 + Addition to the native flow in VFS's, confirm the child-parent
916 + relationship on the branch just after locking the parent dir on the
917 + branch in the "actual operation" (step 4). When this validation
918 + fails, aufs returns EBUSY. ->d_revalidate() (step 3) in aufs still
919 + checks the validation of the dentry on branches.
920 +2. Monitor Changes Internally by Inotify/Fsnotify
921 + Addition to above, in the "actual operation" (step 4) aufs re-lookup
922 + the dentry on the branch, and returns EBUSY if it finds different
924 + Additionally, aufs sets the inotify/fsnotify watch for every dir on branches
925 + during it is in cache. When the event is notified, aufs registers a
926 + function to kernel 'events' thread by schedule_work(). And the
927 + function sets some special status to the cached aufs dentry and inode
928 + private data. If they are not cached, then aufs has nothing to
929 + do. When the same file is accessed through aufs (step 0-3) later,
930 + aufs will detect the status and refresh all necessary data.
931 + In this mode, aufs has to ignore the event which is fired by aufs
933 +3. No Extra Validation
934 + This is the simplest test and doesn't add any additional revalidation
935 + test, and skip therevalidatin in step 4. It is useful and improves
936 + aufs performance when system surely hide the aufs branches from user,
937 + by over-mounting something (or another method).
938 diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/04branch.txt linux/Documentation/filesystems/aufs/design/04branch.txt
939 --- /usr/share/empty/Documentation/filesystems/aufs/design/04branch.txt 1970-01-01 01:00:00.000000000 +0100
940 +++ linux/Documentation/filesystems/aufs/design/04branch.txt 2012-02-13 21:54:56.966438287 +0100
943 +# Copyright (C) 2005-2011 Junjiro R. Okajima
945 +# This program is free software; you can redistribute it and/or modify
946 +# it under the terms of the GNU General Public License as published by
947 +# the Free Software Foundation; either version 2 of the License, or
948 +# (at your option) any later version.
950 +# This program is distributed in the hope that it will be useful,
951 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
952 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
953 +# GNU General Public License for more details.
955 +# You should have received a copy of the GNU General Public License
956 +# along with this program; if not, write to the Free Software
957 +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
961 +Since aufs supports dynamic branch manipulation, ie. add/remove a branch
962 +and changing its permission/attribute, there are a lot of works to do.
966 +----------------------------------------------------------------------
967 +o Confirm the adding dir exists outside of aufs, including loopback
969 +- and other various attributes...
970 +o Initialize the xino file and whiteout bases if necessary.
973 +o Check the owner/group/mode of the directory
974 + When the owner/group/mode of the adding directory differs from the
975 + existing branch, aufs issues a warning because it may impose a
977 + For example, when a upper writable branch has a world writable empty
978 + top directory, a malicious user can create any files on the writable
979 + branch directly, like copy-up and modify manually. If something like
980 + /etc/{passwd,shadow} exists on the lower readonly branch but the upper
981 + writable branch, and the writable branch is world-writable, then a
982 + malicious guy may create /etc/passwd on the writable branch directly
983 + and the infected file will be valid in aufs.
984 + I am afraid it can be a security issue, but nothing to do except
985 + producing a warning.
989 +----------------------------------------------------------------------
990 +o Confirm the deleting branch is not busy
991 + To be general, there is one merit to adopt "remount" interface to
992 + manipulate branches. It is to discard caches. At deleting a branch,
993 + aufs checks the still cached (and connected) dentries and inodes. If
994 + there are any, then they are all in-use. An inode without its
995 + corresponding dentry can be alive alone (for example, inotify/fsnotify case).
997 + For the cached one, aufs checks whether the same named entry exists on
999 + If the cached one is a directory, because aufs provides a merged view
1000 + to users, as long as one dir is left on any branch aufs can show the
1001 + dir to users. In this case, the branch can be removed from aufs.
1002 + Otherwise aufs rejects deleting the branch.
1004 + If any file on the deleting branch is opened by aufs, then aufs
1008 +Modify the Permission of a Branch
1009 +----------------------------------------------------------------------
1010 +o Re-initialize or remove the xino file and whiteout bases if necessary.
1013 +o rw --> ro: Confirm the modifying branch is not busy
1014 + Aufs rejects the request if any of these conditions are true.
1015 + - a file on the branch is mmap-ed.
1016 + - a regular file on the branch is opened for write and there is no
1017 + same named entry on the upper branch.
1018 diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/05wbr_policy.txt linux/Documentation/filesystems/aufs/design/05wbr_policy.txt
1019 --- /usr/share/empty/Documentation/filesystems/aufs/design/05wbr_policy.txt 1970-01-01 01:00:00.000000000 +0100
1020 +++ linux/Documentation/filesystems/aufs/design/05wbr_policy.txt 2012-02-13 21:54:56.966438287 +0100
1023 +# Copyright (C) 2005-2011 Junjiro R. Okajima
1025 +# This program is free software; you can redistribute it and/or modify
1026 +# it under the terms of the GNU General Public License as published by
1027 +# the Free Software Foundation; either version 2 of the License, or
1028 +# (at your option) any later version.
1030 +# This program is distributed in the hope that it will be useful,
1031 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
1032 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1033 +# GNU General Public License for more details.
1035 +# You should have received a copy of the GNU General Public License
1036 +# along with this program; if not, write to the Free Software
1037 +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
1039 +Policies to Select One among Multiple Writable Branches
1040 +----------------------------------------------------------------------
1041 +When the number of writable branch is more than one, aufs has to decide
1042 +the target branch for file creation or copy-up. By default, the highest
1043 +writable branch which has the parent (or ancestor) dir of the target
1044 +file is chosen (top-down-parent policy).
1045 +By user's request, aufs implements some other policies to select the
1046 +writable branch, for file creation two policies, round-robin and
1047 +most-free-space policies. For copy-up three policies, top-down-parent,
1048 +bottom-up-parent and bottom-up policies.
1050 +As expected, the round-robin policy selects the branch in circular. When
1051 +you have two writable branches and creates 10 new files, 5 files will be
1052 +created for each branch. mkdir(2) systemcall is an exception. When you
1053 +create 10 new directories, all will be created on the same branch.
1054 +And the most-free-space policy selects the one which has most free
1055 +space among the writable branches. The amount of free space will be
1056 +checked by aufs internally, and users can specify its time interval.
1058 +The policies for copy-up is more simple,
1059 +top-down-parent is equivalent to the same named on in create policy,
1060 +bottom-up-parent selects the writable branch where the parent dir
1061 +exists and the nearest upper one from the copyup-source,
1062 +bottom-up selects the nearest upper writable branch from the
1063 +copyup-source, regardless the existence of the parent dir.
1065 +There are some rules or exceptions to apply these policies.
1066 +- If there is a readonly branch above the policy-selected branch and
1067 + the parent dir is marked as opaque (a variation of whiteout), or the
1068 + target (creating) file is whiteout-ed on the upper readonly branch,
1069 + then the result of the policy is ignored and the target file will be
1070 + created on the nearest upper writable branch than the readonly branch.
1071 +- If there is a writable branch above the policy-selected branch and
1072 + the parent dir is marked as opaque or the target file is whiteouted
1073 + on the branch, then the result of the policy is ignored and the target
1074 + file will be created on the highest one among the upper writable
1075 + branches who has diropq or whiteout. In case of whiteout, aufs removes
1077 +- link(2) and rename(2) systemcalls are exceptions in every policy.
1078 + They try selecting the branch where the source exists as possible
1079 + since copyup a large file will take long time. If it can't be,
1080 + ie. the branch where the source exists is readonly, then they will
1081 + follow the copyup policy.
1082 +- There is an exception for rename(2) when the target exists.
1083 + If the rename target exists, aufs compares the index of the branches
1084 + where the source and the target exists and selects the higher
1085 + one. If the selected branch is readonly, then aufs follows the
1087 diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/06mmap.txt linux/Documentation/filesystems/aufs/design/06mmap.txt
1088 --- /usr/share/empty/Documentation/filesystems/aufs/design/06mmap.txt 1970-01-01 01:00:00.000000000 +0100
1089 +++ linux/Documentation/filesystems/aufs/design/06mmap.txt 2012-02-13 21:54:56.966438287 +0100
1092 +# Copyright (C) 2005-2011 Junjiro R. Okajima
1094 +# This program is free software; you can redistribute it and/or modify
1095 +# it under the terms of the GNU General Public License as published by
1096 +# the Free Software Foundation; either version 2 of the License, or
1097 +# (at your option) any later version.
1099 +# This program is distributed in the hope that it will be useful,
1100 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
1101 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1102 +# GNU General Public License for more details.
1104 +# You should have received a copy of the GNU General Public License
1105 +# along with this program; if not, write to the Free Software
1106 +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
1108 +mmap(2) -- File Memory Mapping
1109 +----------------------------------------------------------------------
1110 +In aufs, the file-mapped pages are handled by a branch fs directly, no
1111 +interaction with aufs. It means aufs_mmap() calls the branch fs's
1113 +This approach is simple and good, but there is one problem.
1114 +Under /proc, several entries show the mmap-ped files by its path (with
1115 +device and inode number), and the printed path will be the path on the
1116 +branch fs's instead of virtual aufs's.
1117 +This is not a problem in most cases, but some utilities lsof(1) (and its
1118 +user) may expect the path on aufs.
1120 +To address this issue, aufs adds a new member called vm_prfile in struct
1121 +vm_area_struct (and struct vm_region). The original vm_file points to
1122 +the file on the branch fs in order to handle everything correctly as
1123 +usual. The new vm_prfile points to a virtual file in aufs, and the
1124 +show-functions in procfs refers to vm_prfile if it is set.
1125 +Also we need to maintain several other places where touching vm_file
1127 +- fork()/clone() copies vma and the reference count of vm_file is
1129 +- merging vma maintains the ref count too.
1131 +This is not a good approach. It just faking the printed path. But it
1132 +leaves all behaviour around f_mapping unchanged. This is surely an
1134 +Actually aufs had adopted another complicated approach which calls
1135 +generic_file_mmap() and handles struct vm_operations_struct. In this
1136 +approach, aufs met a hard problem and I could not solve it without
1137 +switching the approach.
1138 diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/07export.txt linux/Documentation/filesystems/aufs/design/07export.txt
1139 --- /usr/share/empty/Documentation/filesystems/aufs/design/07export.txt 1970-01-01 01:00:00.000000000 +0100
1140 +++ linux/Documentation/filesystems/aufs/design/07export.txt 2012-02-13 21:54:56.966438287 +0100
1143 +# Copyright (C) 2005-2011 Junjiro R. Okajima
1145 +# This program is free software; you can redistribute it and/or modify
1146 +# it under the terms of the GNU General Public License as published by
1147 +# the Free Software Foundation; either version 2 of the License, or
1148 +# (at your option) any later version.
1150 +# This program is distributed in the hope that it will be useful,
1151 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
1152 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1153 +# GNU General Public License for more details.
1155 +# You should have received a copy of the GNU General Public License
1156 +# along with this program; if not, write to the Free Software
1157 +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
1159 +Export Aufs via NFS
1160 +----------------------------------------------------------------------
1161 +Here is an approach.
1162 +- like xino/xib, add a new file 'xigen' which stores aufs inode
1164 +- iget_locked(): initialize aufs inode generation for a new inode, and
1165 + store it in xigen file.
1166 +- destroy_inode(): increment aufs inode generation and store it in xigen
1167 + file. it is necessary even if it is not unlinked, because any data of
1168 + inode may be changed by UDBA.
1169 +- encode_fh(): for a root dir, simply return FILEID_ROOT. otherwise
1170 + build file handle by
1171 + + branch id (4 bytes)
1172 + + superblock generation (4 bytes)
1173 + + inode number (4 or 8 bytes)
1174 + + parent dir inode number (4 or 8 bytes)
1175 + + inode generation (4 bytes))
1176 + + return value of exportfs_encode_fh() for the parent on a branch (4
1178 + + file handle for a branch (by exportfs_encode_fh())
1180 + + find the index of a branch from its id in handle, and check it is
1181 + still exist in aufs.
1182 + + 1st level: get the inode number from handle and search it in cache.
1183 + + 2nd level: if not found, get the parent inode number from handle and
1184 + search it in cache. and then open the parent dir, find the matching
1185 + inode number by vfs_readdir() and get its name, and call
1186 + lookup_one_len() for the target dentry.
1187 + + 3rd level: if the parent dir is not cached, call
1188 + exportfs_decode_fh() for a branch and get the parent on a branch,
1189 + build a pathname of it, convert it a pathname in aufs, call
1190 + path_lookup(). now aufs gets a parent dir dentry, then handle it as
1192 + + to open the dir, aufs needs struct vfsmount. aufs keeps vfsmount
1193 + for every branch, but not itself. to get this, (currently) aufs
1194 + searches in current->nsproxy->mnt_ns list. it may not be a good
1195 + idea, but I didn't get other approach.
1196 + + test the generation of the gotten inode.
1197 +- every inode operation: they may get EBUSY due to UDBA. in this case,
1198 + convert it into ESTALE for NFSD.
1199 +- readdir(): call lockdep_on/off() because filldir in NFSD calls
1200 + lookup_one_len(), vfs_getattr(), encode_fh() and others.
1201 diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/08shwh.txt linux/Documentation/filesystems/aufs/design/08shwh.txt
1202 --- /usr/share/empty/Documentation/filesystems/aufs/design/08shwh.txt 1970-01-01 01:00:00.000000000 +0100
1203 +++ linux/Documentation/filesystems/aufs/design/08shwh.txt 2012-02-13 21:54:56.966438287 +0100
1206 +# Copyright (C) 2005-2011 Junjiro R. Okajima
1208 +# This program is free software; you can redistribute it and/or modify
1209 +# it under the terms of the GNU General Public License as published by
1210 +# the Free Software Foundation; either version 2 of the License, or
1211 +# (at your option) any later version.
1213 +# This program is distributed in the hope that it will be useful,
1214 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
1215 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1216 +# GNU General Public License for more details.
1218 +# You should have received a copy of the GNU General Public License
1219 +# along with this program; if not, write to the Free Software
1220 +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
1222 +Show Whiteout Mode (shwh)
1223 +----------------------------------------------------------------------
1224 +Generally aufs hides the name of whiteouts. But in some cases, to show
1225 +them is very useful for users. For instance, creating a new middle layer
1226 +(branch) by merging existing layers.
1228 +(borrowing aufs1 HOW-TO from a user, Michael Towers)
1229 +When you have three branches,
1230 +- Bottom: 'system', squashfs (underlying base system), read-only
1231 +- Middle: 'mods', squashfs, read-only
1232 +- Top: 'overlay', ram (tmpfs), read-write
1234 +The top layer is loaded at boot time and saved at shutdown, to preserve
1235 +the changes made to the system during the session.
1236 +When larger changes have been made, or smaller changes have accumulated,
1237 +the size of the saved top layer data grows. At this point, it would be
1238 +nice to be able to merge the two overlay branches ('mods' and 'overlay')
1239 +and rewrite the 'mods' squashfs, clearing the top layer and thus
1240 +restoring save and load speed.
1242 +This merging is simplified by the use of another aufs mount, of just the
1243 +two overlay branches using the 'shwh' option.
1244 +# mount -t aufs -o ro,shwh,br:/livesys/overlay=ro+wh:/livesys/mods=rr+wh \
1245 + aufs /livesys/merge_union
1247 +A merged view of these two branches is then available at
1248 +/livesys/merge_union, and the new feature is that the whiteouts are
1250 +Note that in 'shwh' mode the aufs mount must be 'ro', which will disable
1251 +writing to all branches. Also the default mode for all branches is 'ro'.
1252 +It is now possible to save the combined contents of the two overlay
1253 +branches to a new squashfs, e.g.:
1254 +# mksquashfs /livesys/merge_union /path/to/newmods.squash
1256 +This new squashfs archive can be stored on the boot device and the
1257 +initramfs will use it to replace the old one at the next boot.
1258 diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/10dynop.txt linux/Documentation/filesystems/aufs/design/10dynop.txt
1259 --- /usr/share/empty/Documentation/filesystems/aufs/design/10dynop.txt 1970-01-01 01:00:00.000000000 +0100
1260 +++ linux/Documentation/filesystems/aufs/design/10dynop.txt 2012-02-13 21:54:56.966438287 +0100
1263 +# Copyright (C) 2010-2011 Junjiro R. Okajima
1265 +# This program is free software; you can redistribute it and/or modify
1266 +# it under the terms of the GNU General Public License as published by
1267 +# the Free Software Foundation; either version 2 of the License, or
1268 +# (at your option) any later version.
1270 +# This program is distributed in the hope that it will be useful,
1271 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
1272 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1273 +# GNU General Public License for more details.
1275 +# You should have received a copy of the GNU General Public License
1276 +# along with this program; if not, write to the Free Software
1277 +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
1279 +Dynamically customizable FS operations
1280 +----------------------------------------------------------------------
1281 +Generally FS operations (struct inode_operations, struct
1282 +address_space_operations, struct file_operations, etc.) are defined as
1283 +"static const", but it never means that FS have only one set of
1284 +operation. Some FS have multiple sets of them. For instance, ext2 has
1285 +three sets, one for XIP, for NOBH, and for normal.
1286 +Since aufs overrides and redirects these operations, sometimes aufs has
1287 +to change its behaviour according to the branch FS type. More imporantly
1288 +VFS acts differently if a function (member in the struct) is set or
1289 +not. It means aufs should have several sets of operations and select one
1290 +among them according to the branch FS definition.
1292 +In order to solve this problem and not to affect the behavour of VFS,
1293 +aufs defines these operations dynamically. For instance, aufs defines
1294 +aio_read function for struct file_operations, but it may not be set to
1295 +the file_operations. When the branch FS doesn't have it, aufs doesn't
1296 +set it to its file_operations while the function definition itself is
1297 +still alive. So the behaviour of io_submit(2) will not change, and it
1298 +will return an error when aio_read is not defined.
1300 +The lifetime of these dynamically generated operation object is
1301 +maintained by aufs branch object. When the branch is removed from aufs,
1302 +the reference counter of the object is decremented. When it reaches
1303 +zero, the dynamically generated operation object will be freed.
1305 +This approach is designed to support AIO (io_submit), Direcit I/O and
1307 +Currently this approach is applied to file_operations and
1308 +vm_operations_struct for regular files only.
1309 diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/99plan.txt linux/Documentation/filesystems/aufs/design/99plan.txt
1310 --- /usr/share/empty/Documentation/filesystems/aufs/design/99plan.txt 1970-01-01 01:00:00.000000000 +0100
1311 +++ linux/Documentation/filesystems/aufs/design/99plan.txt 2012-02-13 21:54:56.966438287 +0100
1314 +# Copyright (C) 2005-2011 Junjiro R. Okajima
1316 +# This program is free software; you can redistribute it and/or modify
1317 +# it under the terms of the GNU General Public License as published by
1318 +# the Free Software Foundation; either version 2 of the License, or
1319 +# (at your option) any later version.
1321 +# This program is distributed in the hope that it will be useful,
1322 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
1323 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1324 +# GNU General Public License for more details.
1326 +# You should have received a copy of the GNU General Public License
1327 +# along with this program; if not, write to the Free Software
1328 +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
1332 +Restoring some features which was implemented in aufs1.
1333 +They were dropped in aufs2 in order to make source files simpler and
1334 +easier to be reviewed.
1337 +Test Only the Highest One for the Directory Permission (dirperm1 option)
1338 +----------------------------------------------------------------------
1339 +Let's try case study.
1340 +- aufs has two branches, upper readwrite and lower readonly.
1342 +- "dirA" exists under /ro, but /rw. and its mode is 0700.
1343 +- user invoked "chmod a+rx /au/dirA"
1344 +- then "dirA" becomes world readable?
1346 +In this case, /ro/dirA is still 0700 since it exists in readonly branch,
1347 +or it may be a natively readonly filesystem. If aufs respects the lower
1348 +branch, it should not respond readdir request from other users. But user
1349 +allowed it by chmod. Should really aufs rejects showing the entries
1352 +To be honest, I don't have a best solution for this case. So I
1353 +implemented 'dirperm1' and 'nodirperm1' option in aufs1, and leave it to
1355 +When dirperm1 is specified, aufs checks only the highest one for the
1356 +directory permission, and shows the entries. Otherwise, as usual, checks
1357 +every dir existing on all branches and rejects the request.
1359 +As a side effect, dirperm1 option improves the performance of aufs
1360 +because the number of permission check is reduced.
1363 +Being Another Aufs's Readonly Branch (robr)
1364 +----------------------------------------------------------------------
1365 +Aufs1 allows aufs to be another aufs's readonly branch.
1366 +This feature was developed by a user's request. But it may not be used
1370 +Copy-up on Open (coo=)
1371 +----------------------------------------------------------------------
1372 +By default the internal copy-up is executed when it is really necessary.
1373 +It is not done when a file is opened for writing, but when write(2) is
1374 +done. Users who have many (over 100) branches want to know and analyse
1375 +when and what file is copied-up. To insert a new upper branch which
1376 +contains such files only may improve the performance of aufs.
1378 +Aufs1 implemented "coo=none | leaf | all" option.
1381 +Refresh the Opened File (refrof)
1382 +----------------------------------------------------------------------
1383 +This option is implemented in aufs1 but incomplete.
1385 +When user reads from a file, he expects to get its latest filedata
1386 +generally. If the file is removed and a new same named file is created,
1387 +the content he gets is unchanged, ie. the unlinked filedata.
1389 +Let's try case study again.
1390 +- aufs has two branches.
1392 +- "fileA" exists under /ro, but /rw.
1393 +- user opened "/au/fileA".
1394 +- he or someone else inserts a branch (/new) between /rw and /ro.
1395 + /au = /rw + /new + /ro
1396 +- the new branch has "fileA".
1397 +- user reads from the opened "fileA"
1398 +- which filedata should aufs return, from /ro or /new?
1400 +Some people says it has to be "from /ro" and it is a semantics of Unix.
1401 +The others say it should be "from /new" because the file is not removed
1402 +and it is equivalent to the case of someone else modifies the file.
1404 +Here again I don't have a best and final answer. I got an idea to
1405 +implement 'refrof' and 'norefrof' option. When 'refrof' (REFResh the
1406 +Opened File) is specified (by default), aufs returns the filedata from
1408 +Otherwise from /new.
1409 diff -urN /usr/share/empty/Documentation/filesystems/aufs/README linux/Documentation/filesystems/aufs/README
1410 --- /usr/share/empty/Documentation/filesystems/aufs/README 1970-01-01 01:00:00.000000000 +0100
1411 +++ linux/Documentation/filesystems/aufs/README 2012-02-13 21:54:56.963104881 +0100
1414 +Aufs3 -- advanced multi layered unification filesystem version 3.x
1420 +----------------------------------------
1421 +In the early days, aufs was entirely re-designed and re-implemented
1422 +Unionfs Version 1.x series. After many original ideas, approaches,
1423 +improvements and implementations, it becomes totally different from
1424 +Unionfs while keeping the basic features.
1425 +Recently, Unionfs Version 2.x series begin taking some of the same
1426 +approaches to aufs1's.
1427 +Unionfs is being developed by Professor Erez Zadok at Stony Brook
1428 +University and his team.
1430 +Aufs3 supports linux-3.0 and later.
1431 +If you want older kernel version support, try aufs2-2.6.git or
1432 +aufs2-standalone.git repository, aufs1 from CVS on SourceForge.
1434 +Note: it becomes clear that "Aufs was rejected. Let's give it up."
1435 +According to Christoph Hellwig, linux rejects all union-type filesystems
1437 +<http://marc.info/?l=linux-kernel&m=123938533724484&w=2>
1441 +----------------------------------------
1442 +- unite several directories into a single virtual filesystem. The member
1443 + directory is called as a branch.
1444 +- you can specify the permission flags to the branch, which are 'readonly',
1445 + 'readwrite' and 'whiteout-able.'
1446 +- by upper writable branch, internal copyup and whiteout, files/dirs on
1447 + readonly branch are modifiable logically.
1448 +- dynamic branch manipulation, add, del.
1451 +Also there are many enhancements in aufs1, such as:
1452 +- readdir(3) in userspace.
1453 +- keep inode number by external inode number table
1454 +- keep the timestamps of file/dir in internal copyup operation
1455 +- seekable directory, supporting NFS readdir.
1456 +- whiteout is hardlinked in order to reduce the consumption of inodes
1458 +- do not copyup, nor create a whiteout when it is unnecessary
1459 +- revert a single systemcall when an error occurs in aufs
1460 +- remount interface instead of ioctl
1461 +- maintain /etc/mtab by an external command, /sbin/mount.aufs.
1462 +- loopback mounted filesystem as a branch
1463 +- kernel thread for removing the dir who has a plenty of whiteouts
1464 +- support copyup sparse file (a file which has a 'hole' in it)
1465 +- default permission flags for branches
1466 +- selectable permission flags for ro branch, whether whiteout can
1469 +- support <sysfs>/fs/aufs and <debugfs>/aufs.
1470 +- support multiple writable branches, some policies to select one
1471 + among multiple writable branches.
1472 +- a new semantics for link(2) and rename(2) to support multiple
1473 + writable branches.
1474 +- no glibc changes are required.
1475 +- pseudo hardlink (hardlink over branches)
1476 +- allow a direct access manually to a file on branch, e.g. bypassing aufs.
1477 + including NFS or remote filesystem branch.
1478 +- userspace wrapper for pathconf(3)/fpathconf(3) with _PC_LINK_MAX.
1481 +Currently these features are dropped temporary from aufs3.
1482 +See design/08plan.txt in detail.
1483 +- test only the highest one for the directory permission (dirperm1)
1484 +- copyup on open (coo=)
1485 +- nested mount, i.e. aufs as readonly no-whiteout branch of another aufs
1487 +- statistics of aufs thread (/sys/fs/aufs/stat)
1488 +- delegation mode (dlgt)
1489 + a delegation of the internal branch access to support task I/O
1490 + accounting, which also supports Linux Security Modules (LSM) mainly
1491 + for Suse AppArmor.
1492 +- intent.open/create (file open in a single lookup)
1494 +Features or just an idea in the future (see also design/*.txt),
1495 +- reorder the branch index without del/re-add.
1496 +- permanent xino files for NFSD
1497 +- an option for refreshing the opened files after add/del branches
1498 +- 'move' policy for copy-up between two writable branches, after
1499 + checking free space.
1500 +- light version, without branch manipulation. (unnecessary?)
1501 +- copyup in userspace
1502 +- inotify in userspace
1508 +----------------------------------------
1509 +There were three GIT trees for aufs3, aufs3-linux.git,
1510 +aufs3-standalone.git, and aufs-util.git. Note that there is no "3" in
1512 +While the aufs-util is always necessary, you need either of aufs3-linux
1513 +or aufs3-standalone.
1515 +The aufs3-linux tree includes the whole linux mainline GIT tree,
1516 +git://git.kernel.org/.../torvalds/linux.git.
1517 +And you cannot select CONFIG_AUFS_FS=m for this version, eg. you cannot
1518 +build aufs3 as an externel kernel module.
1520 +On the other hand, the aufs3-standalone tree has only aufs source files
1521 +and necessary patches, and you can select CONFIG_AUFS_FS=m.
1523 +You will find GIT branches whose name is in form of "aufs3.x" where "x"
1524 +represents the linux kernel version, "linux-3.x". For instance,
1525 +"aufs3.0" is for linux-3.0. For latest "linux-3.x-rcN", use
1526 +"aufs3.x-rcN" branch.
1529 +$ git clone --reference /your/linux/git/tree \
1530 + git://aufs.git.sourceforge.net/gitroot/aufs/aufs3-linux.git \
1532 +- if you don't have linux GIT tree, then remove "--reference ..."
1533 +$ cd aufs3-linux.git
1534 +$ git checkout origin/aufs3.0
1536 +o aufs3-standalone tree
1537 +$ git clone git://aufs.git.sourceforge.net/gitroot/aufs/aufs3-standalone.git \
1538 + aufs3-standalone.git
1539 +$ cd aufs3-standalone.git
1540 +$ git checkout origin/aufs3.0
1543 +$ git clone git://aufs.git.sourceforge.net/gitroot/aufs/aufs-util.git \
1546 +$ git checkout origin/aufs3.0
1548 +Note: The 3.x-rcN branch is to be used with `rc' kernel versions ONLY.
1549 +The minor version number, 'x' in '3.x', of aufs may not always
1550 +follow the minor version number of the kernel.
1551 +Because changes in the kernel that cause the use of a new
1552 +minor version number do not always require changes to aufs-util.
1554 +Since aufs-util has its own minor version number, you may not be
1555 +able to find a GIT branch in aufs-util for your kernel's
1556 +exact minor version number.
1557 +In this case, you should git-checkout the branch for the
1558 +nearest lower number.
1560 +For (an unreleased) example:
1561 +If you are using "linux-3.10" and the "aufs3.10" branch
1562 +does not exit in aufs-util repository, then "aufs3.9", "aufs3.8"
1563 +or something numerically smaller is the branch for your kernel.
1565 +Also you can view all branches by
1569 +3. Configuration and Compilation
1570 +----------------------------------------
1571 +Make sure you have git-checkout'ed the correct branch.
1573 +For aufs3-linux tree,
1574 +- enable CONFIG_EXPERIMENTAL and CONFIG_AUFS_FS.
1575 +- set other aufs configurations if necessary.
1577 +For aufs3-standalone tree,
1578 +There are several ways to build.
1581 +- apply ./aufs3-kbuild.patch to your kernel source files.
1582 +- apply ./aufs3-base.patch too.
1583 +- apply ./aufs3-proc_map.patch too, if you want to make /proc/PID/maps (and
1584 + others including lsof(1)) show the file path on aufs instead of the
1585 + path on the branch fs.
1586 +- apply ./aufs3-standalone.patch too, if you have a plan to set
1587 + CONFIG_AUFS_FS=m. otherwise you don't need ./aufs3-standalone.patch.
1588 +- copy ./{Documentation,fs,include/linux/aufs_type.h} files to your
1589 + kernel source tree. Never copy ./include/linux/Kbuild.
1590 +- enable CONFIG_EXPERIMENTAL and CONFIG_AUFS_FS, you can select either
1592 +- and build your kernel as usual.
1593 +- install the built kernel.
1594 +- install the header files too by "make headers_install".
1595 +- and reboot your system.
1598 +- module only (CONFIG_AUFS_FS=m).
1599 +- apply ./aufs3-base.patch to your kernel source files.
1600 +- apply ./aufs3-proc_map.patch too to your kernel source files,
1601 + if you want to make /proc/PID/maps (and others including lsof(1)) show
1602 + the file path on aufs instead of the path on the branch fs.
1603 +- apply ./aufs3-standalone.patch too.
1604 +- build your kernel, don't forget "make headers_install", and reboot.
1605 +- edit ./config.mk and set other aufs configurations if necessary.
1606 + Note: You should read ./fs/aufs/Kconfig carefully which describes
1607 + every aufs configurations.
1608 +- build the module by simple "make".
1609 +- you can specify ${KDIR} make variable which points to your kernel
1611 +- install the files
1612 + + run "make install" to install the aufs module, or copy the built
1613 + ./aufs.ko to /lib/modules/... and run depmod -a (or reboot simply).
1614 + + run "make headers_install" to install the aufs header file (you can
1615 + specify DESTDIR), or copty ./usr/include/linux/aufs_type.h to
1616 + /usr/include/linux or wherever you like.
1617 +- no need to apply aufs3-kbuild.patch, nor copying source files to your
1618 + kernel source tree.
1620 +Note: The haeder file aufs_type.h is necessary to build aufs-util
1621 + as well as "make headers_install" in the kernel source tree.
1622 + headers_install is subject to be forgotten, but it is essentially
1623 + necessary, not only for building aufs-util.
1624 + You may not meet problems without headers_install in some older
1628 +- read README in aufs-util, build and install it
1629 +- note that your distribution may contain an obsoleted version of
1630 + aufs_type.h in /usr/include/linux or something. When you build aufs
1631 + utilities, make sure that your compiler refers the correct aufs header
1632 + file which is built by "make headers_install."
1633 +- if you want to use readdir(3) in userspace or pathconf(3) wrapper,
1634 + then run "make install_ulib" too. And refer to the aufs manual in
1639 +----------------------------------------
1640 +At first, make sure aufs-util are installed, and please read the aufs
1641 +manual, aufs.5 in aufs-util.git tree.
1645 +$ mkdir /tmp/rw /tmp/aufs
1646 +# mount -t aufs -o br=/tmp/rw:${HOME} none /tmp/aufs
1648 +Here is another example. The result is equivalent.
1649 +# mount -t aufs -o br=/tmp/rw=rw:${HOME}=ro none /tmp/aufs
1651 +# mount -t aufs -o br:/tmp/rw none /tmp/aufs
1652 +# mount -o remount,append:${HOME} /tmp/aufs
1654 +Then, you can see whole tree of your home dir through /tmp/aufs. If
1655 +you modify a file under /tmp/aufs, the one on your home directory is
1656 +not affected, instead the same named file will be newly created under
1657 +/tmp/rw. And all of your modification to a file will be applied to
1658 +the one under /tmp/rw. This is called the file based Copy on Write
1660 +Aufs mount options are described in aufs.5.
1661 +If you run chroot or something and make your aufs as a root directory,
1662 +then you need to customize the shutdown script. See the aufs manual in
1665 +Additionally, there are some sample usages of aufs which are a
1666 +diskless system with network booting, and LiveCD over NFS.
1667 +See sample dir in CVS tree on SourceForge.
1671 +----------------------------------------
1672 +When you have any problems or strange behaviour in aufs, please let me
1674 +- /proc/mounts (instead of the output of mount(8))
1675 +- /sys/module/aufs/*
1676 +- /sys/fs/aufs/* (if you have them)
1677 +- /debug/aufs/* (if you have them)
1678 +- linux kernel version
1679 + if your kernel is not plain, for example modified by distributor,
1680 + the url where i can download its source is necessary too.
1681 +- aufs version which was printed at loading the module or booting the
1682 + system, instead of the date you downloaded.
1683 +- configuration (define/undefine CONFIG_AUFS_xxx)
1684 +- kernel configuration or /proc/config.gz (if you have it)
1685 +- behaviour which you think to be incorrect
1686 +- actual operation, reproducible one is better
1687 +- mailto: aufs-users at lists.sourceforge.net
1689 +Usually, I don't watch the Public Areas(Bugs, Support Requests, Patches,
1690 +and Feature Requests) on SourceForge. Please join and write to
1694 +6. Acknowledgements
1695 +----------------------------------------
1696 +Thanks to everyone who have tried and are using aufs, whoever
1697 +have reported a bug or any feedback.
1699 +Especially donators:
1700 +Tomas Matejicek(slax.org) made a donation (much more than once).
1701 + Since Apr 2010, Tomas M (the author of Slax and Linux Live
1702 + scripts) is making "doubling" donations.
1703 + Unfortunately I cannot list all of the donators, but I really
1705 + It ends Aug 2010, but the ordinary donation URL is still available.
1706 + <http://sourceforge.net/donate/index.php?group_id=167503>
1707 +Dai Itasaka made a donation (2007/8).
1708 +Chuck Smith made a donation (2008/4, 10 and 12).
1709 +Henk Schoneveld made a donation (2008/9).
1710 +Chih-Wei Huang, ASUS, CTC donated Eee PC 4G (2008/10).
1711 +Francois Dupoux made a donation (2008/11).
1712 +Bruno Cesar Ribas and Luis Carlos Erpen de Bona, C3SL serves public
1713 + aufs2 GIT tree (2009/2).
1714 +William Grant made a donation (2009/3).
1715 +Patrick Lane made a donation (2009/4).
1716 +The Mail Archive (mail-archive.com) made donations (2009/5).
1717 +Nippy Networks (Ed Wildgoose) made a donation (2009/7).
1718 +New Dream Network, LLC (www.dreamhost.com) made a donation (2009/11).
1719 +Pavel Pronskiy made a donation (2011/2).
1720 +Iridium and Inmarsat satellite phone retailer (www.mailasail.com), Nippy
1721 + Networks (Ed Wildgoose) made a donation for hardware (2011/3).
1722 +Max Lekomcev (DOM-TV project) made a donation (2011/7 and 12).
1723 +Sam Liddicott made a donation (2011/9).
1725 +Thank you very much.
1726 +Donations are always, including future donations, very important and
1727 +helpful for me to keep on developing aufs.
1731 +----------------------------------------
1732 +If you are an experienced user, no explanation is needed. Aufs is
1733 +just a linux filesystem.
1738 +# Local variables: ;
1741 diff -urN /usr/share/empty/fs/aufs/aufs.h linux/fs/aufs/aufs.h
1742 --- /usr/share/empty/fs/aufs/aufs.h 1970-01-01 01:00:00.000000000 +0100
1743 +++ linux/fs/aufs/aufs.h 2012-02-13 21:54:56.966438287 +0100
1746 + * Copyright (C) 2005-2012 Junjiro R. Okajima
1748 + * This program, aufs is free software; you can redistribute it and/or modify
1749 + * it under the terms of the GNU General Public License as published by
1750 + * the Free Software Foundation; either version 2 of the License, or
1751 + * (at your option) any later version.
1753 + * This program is distributed in the hope that it will be useful,
1754 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
1755 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1756 + * GNU General Public License for more details.
1758 + * You should have received a copy of the GNU General Public License
1759 + * along with this program; if not, write to the Free Software
1760 + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
1764 + * all header files
1772 +#define AuStub(type, name, body, ...) \
1773 + static inline type name(__VA_ARGS__) { body; }
1775 +#define AuStubVoid(name, ...) \
1776 + AuStub(void, name, , __VA_ARGS__)
1777 +#define AuStubInt0(name, ...) \
1778 + AuStub(int, name, return 0, __VA_ARGS__)
1782 +#include "branch.h"
1785 +#include "dbgaufs.h"
1786 +#include "dentry.h"
1790 +#include "fstype.h"
1793 +#include "module.h"
1798 +#include "sysaufs.h"
1803 +#endif /* __KERNEL__ */
1804 +#endif /* __AUFS_H__ */
1805 diff -urN /usr/share/empty/fs/aufs/branch.c linux/fs/aufs/branch.c
1806 --- /usr/share/empty/fs/aufs/branch.c 1970-01-01 01:00:00.000000000 +0100
1807 +++ linux/fs/aufs/branch.c 2012-02-13 21:54:56.966438287 +0100
1810 + * Copyright (C) 2005-2012 Junjiro R. Okajima
1812 + * This program, aufs is free software; you can redistribute it and/or modify
1813 + * it under the terms of the GNU General Public License as published by
1814 + * the Free Software Foundation; either version 2 of the License, or
1815 + * (at your option) any later version.
1817 + * This program is distributed in the hope that it will be useful,
1818 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
1819 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1820 + * GNU General Public License for more details.
1822 + * You should have received a copy of the GNU General Public License
1823 + * along with this program; if not, write to the Free Software
1824 + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
1828 + * branch management
1831 +#include <linux/compat.h>
1832 +#include <linux/statfs.h>
1836 + * free a single branch
1838 +static void au_br_do_free(struct au_branch *br)
1841 + struct au_wbr *wbr;
1842 + struct au_dykey **key;
1844 + au_hnotify_fin_br(br);
1846 + if (br->br_xino.xi_file)
1847 + fput(br->br_xino.xi_file);
1848 + mutex_destroy(&br->br_xino.xi_nondir_mtx);
1850 + AuDebugOn(atomic_read(&br->br_count));
1854 + for (i = 0; i < AuBrWh_Last; i++)
1855 + dput(wbr->wbr_wh[i]);
1856 + AuDebugOn(atomic_read(&wbr->wbr_wh_running));
1857 + AuRwDestroy(&wbr->wbr_wh_rwsem);
1860 + key = br->br_dykey;
1861 + for (i = 0; i < AuBrDynOp; i++, key++)
1867 + mntput(br->br_mnt);
1873 + * frees all branches
1875 +void au_br_free(struct au_sbinfo *sbinfo)
1877 + aufs_bindex_t bmax;
1878 + struct au_branch **br;
1880 + AuRwMustWriteLock(&sbinfo->si_rwsem);
1882 + bmax = sbinfo->si_bend + 1;
1883 + br = sbinfo->si_branch;
1885 + au_br_do_free(*br++);
1889 + * find the index of a branch which is specified by @br_id.
1891 +int au_br_index(struct super_block *sb, aufs_bindex_t br_id)
1893 + aufs_bindex_t bindex, bend;
1895 + bend = au_sbend(sb);
1896 + for (bindex = 0; bindex <= bend; bindex++)
1897 + if (au_sbr_id(sb, bindex) == br_id)
1902 +/* ---------------------------------------------------------------------- */
1908 +static int test_overlap(struct super_block *sb, struct dentry *h_adding,
1909 + struct dentry *h_root)
1911 + if (unlikely(h_adding == h_root
1912 + || au_test_loopback_overlap(sb, h_adding)))
1914 + if (h_adding->d_sb != h_root->d_sb)
1916 + return au_test_subdir(h_adding, h_root)
1917 + || au_test_subdir(h_root, h_adding);
1921 + * returns a newly allocated branch. @new_nbranch is a number of branches
1922 + * after adding a branch.
1924 +static struct au_branch *au_br_alloc(struct super_block *sb, int new_nbranch,
1927 + struct au_branch *add_branch;
1928 + struct dentry *root;
1932 + root = sb->s_root;
1933 + add_branch = kmalloc(sizeof(*add_branch), GFP_NOFS);
1934 + if (unlikely(!add_branch))
1937 + err = au_hnotify_init_br(add_branch, perm);
1938 + if (unlikely(err))
1941 + add_branch->br_wbr = NULL;
1942 + if (au_br_writable(perm)) {
1943 + /* may be freed separately at changing the branch permission */
1944 + add_branch->br_wbr = kmalloc(sizeof(*add_branch->br_wbr),
1946 + if (unlikely(!add_branch->br_wbr))
1950 + err = au_sbr_realloc(au_sbi(sb), new_nbranch);
1952 + err = au_di_realloc(au_di(root), new_nbranch);
1954 + err = au_ii_realloc(au_ii(root->d_inode), new_nbranch);
1956 + return add_branch; /* success */
1958 + kfree(add_branch->br_wbr);
1961 + au_hnotify_fin_br(add_branch);
1963 + kfree(add_branch);
1965 + return ERR_PTR(err);
1969 + * test if the branch permission is legal or not.
1971 +static int test_br(struct inode *inode, int brperm, char *path)
1975 + err = (au_br_writable(brperm) && IS_RDONLY(inode));
1980 + pr_err("write permission for readonly mount or inode, %s\n", path);
1988 + * 0: success, the caller will add it
1989 + * plus: success, it is already unified, the caller should ignore it
1992 +static int test_add(struct super_block *sb, struct au_opt_add *add, int remount)
1995 + aufs_bindex_t bend, bindex;
1996 + struct dentry *root;
1997 + struct inode *inode, *h_inode;
1999 + root = sb->s_root;
2000 + bend = au_sbend(sb);
2001 + if (unlikely(bend >= 0
2002 + && au_find_dbindex(root, add->path.dentry) >= 0)) {
2006 + pr_err("%s duplicated\n", add->pathname);
2011 + err = -ENOSPC; /* -E2BIG; */
2012 + if (unlikely(AUFS_BRANCH_MAX <= add->bindex
2013 + || AUFS_BRANCH_MAX - 1 <= bend)) {
2014 + pr_err("number of branches exceeded %s\n", add->pathname);
2019 + if (unlikely(add->bindex < 0 || bend + 1 < add->bindex)) {
2020 + pr_err("bad index %d\n", add->bindex);
2024 + inode = add->path.dentry->d_inode;
2026 + if (unlikely(!inode->i_nlink)) {
2027 + pr_err("no existence %s\n", add->pathname);
2032 + if (unlikely(inode->i_sb == sb)) {
2033 + pr_err("%s must be outside\n", add->pathname);
2037 + if (unlikely(au_test_fs_unsuppoted(inode->i_sb))) {
2038 + pr_err("unsupported filesystem, %s (%s)\n",
2039 + add->pathname, au_sbtype(inode->i_sb));
2043 + err = test_br(add->path.dentry->d_inode, add->perm, add->pathname);
2044 + if (unlikely(err))
2048 + return 0; /* success */
2051 + for (bindex = 0; bindex <= bend; bindex++)
2052 + if (unlikely(test_overlap(sb, add->path.dentry,
2053 + au_h_dptr(root, bindex)))) {
2054 + pr_err("%s is overlapped\n", add->pathname);
2059 + if (au_opt_test(au_mntflags(sb), WARN_PERM)) {
2060 + h_inode = au_h_dptr(root, 0)->d_inode;
2061 + if ((h_inode->i_mode & S_IALLUGO) != (inode->i_mode & S_IALLUGO)
2062 + || h_inode->i_uid != inode->i_uid
2063 + || h_inode->i_gid != inode->i_gid)
2064 + pr_warning("uid/gid/perm %s %u/%u/0%o, %u/%u/0%o\n",
2066 + inode->i_uid, inode->i_gid,
2067 + (inode->i_mode & S_IALLUGO),
2068 + h_inode->i_uid, h_inode->i_gid,
2069 + (h_inode->i_mode & S_IALLUGO));
2077 + * initialize or clean the whiteouts for an adding branch
2079 +static int au_br_init_wh(struct super_block *sb, struct au_branch *br,
2080 + int new_perm, struct dentry *h_root)
2082 + int err, old_perm;
2083 + aufs_bindex_t bindex;
2084 + struct mutex *h_mtx;
2085 + struct au_wbr *wbr;
2086 + struct au_hinode *hdir;
2089 + old_perm = br->br_perm;
2090 + br->br_perm = new_perm;
2093 + bindex = au_br_index(sb, br->br_id);
2094 + if (0 <= bindex) {
2095 + hdir = au_hi(sb->s_root->d_inode, bindex);
2096 + au_hn_imtx_lock_nested(hdir, AuLsc_I_PARENT);
2098 + h_mtx = &h_root->d_inode->i_mutex;
2099 + mutex_lock_nested(h_mtx, AuLsc_I_PARENT);
2102 + err = au_wh_init(h_root, br, sb);
2104 + wbr_wh_write_lock(wbr);
2105 + err = au_wh_init(h_root, br, sb);
2106 + wbr_wh_write_unlock(wbr);
2109 + au_hn_imtx_unlock(hdir);
2111 + mutex_unlock(h_mtx);
2112 + br->br_perm = old_perm;
2114 + if (!err && wbr && !au_br_writable(new_perm)) {
2116 + br->br_wbr = NULL;
2122 +static int au_wbr_init(struct au_branch *br, struct super_block *sb,
2123 + int perm, struct path *path)
2126 + struct kstatfs kst;
2127 + struct au_wbr *wbr;
2128 + struct dentry *h_dentry;
2131 + au_rw_init(&wbr->wbr_wh_rwsem);
2132 + memset(wbr->wbr_wh, 0, sizeof(wbr->wbr_wh));
2133 + atomic_set(&wbr->wbr_wh_running, 0);
2134 + wbr->wbr_bytes = 0;
2137 + * a limit for rmdir/rename a dir
2138 + * cf. AUFS_MAX_NAMELEN in include/linux/aufs_type.h
2140 + err = vfs_statfs(path, &kst);
2141 + if (unlikely(err))
2144 + h_dentry = path->dentry;
2145 + if (kst.f_namelen >= NAME_MAX)
2146 + err = au_br_init_wh(sb, br, perm, h_dentry);
2148 + pr_err("%.*s(%s), unsupported namelen %ld\n",
2149 + AuDLNPair(h_dentry), au_sbtype(h_dentry->d_sb),
2156 +/* intialize a new branch */
2157 +static int au_br_init(struct au_branch *br, struct super_block *sb,
2158 + struct au_opt_add *add)
2163 + memset(&br->br_xino, 0, sizeof(br->br_xino));
2164 + mutex_init(&br->br_xino.xi_nondir_mtx);
2165 + br->br_perm = add->perm;
2166 + br->br_mnt = add->path.mnt; /* set first, mntget() later */
2167 + spin_lock_init(&br->br_dykey_lock);
2168 + memset(br->br_dykey, 0, sizeof(br->br_dykey));
2169 + atomic_set(&br->br_count, 0);
2170 + br->br_xino_upper = AUFS_XINO_TRUNC_INIT;
2171 + atomic_set(&br->br_xino_running, 0);
2172 + br->br_id = au_new_br_id(sb);
2173 + AuDebugOn(br->br_id < 0);
2175 + if (au_br_writable(add->perm)) {
2176 + err = au_wbr_init(br, sb, add->perm, &add->path);
2177 + if (unlikely(err))
2181 + if (au_opt_test(au_mntflags(sb), XINO)) {
2182 + err = au_xino_br(sb, br, add->path.dentry->d_inode->i_ino,
2183 + au_sbr(sb, 0)->br_xino.xi_file, /*do_test*/1);
2184 + if (unlikely(err)) {
2185 + AuDebugOn(br->br_xino.xi_file);
2190 + sysaufs_br_init(br);
2191 + mntget(add->path.mnt);
2192 + goto out; /* success */
2195 + br->br_mnt = NULL;
2200 +static void au_br_do_add_brp(struct au_sbinfo *sbinfo, aufs_bindex_t bindex,
2201 + struct au_branch *br, aufs_bindex_t bend,
2202 + aufs_bindex_t amount)
2204 + struct au_branch **brp;
2206 + AuRwMustWriteLock(&sbinfo->si_rwsem);
2208 + brp = sbinfo->si_branch + bindex;
2209 + memmove(brp + 1, brp, sizeof(*brp) * amount);
2211 + sbinfo->si_bend++;
2212 + if (unlikely(bend < 0))
2213 + sbinfo->si_bend = 0;
2216 +static void au_br_do_add_hdp(struct au_dinfo *dinfo, aufs_bindex_t bindex,
2217 + aufs_bindex_t bend, aufs_bindex_t amount)
2219 + struct au_hdentry *hdp;
2221 + AuRwMustWriteLock(&dinfo->di_rwsem);
2223 + hdp = dinfo->di_hdentry + bindex;
2224 + memmove(hdp + 1, hdp, sizeof(*hdp) * amount);
2225 + au_h_dentry_init(hdp);
2227 + if (unlikely(bend < 0))
2228 + dinfo->di_bstart = 0;
2231 +static void au_br_do_add_hip(struct au_iinfo *iinfo, aufs_bindex_t bindex,
2232 + aufs_bindex_t bend, aufs_bindex_t amount)
2234 + struct au_hinode *hip;
2236 + AuRwMustWriteLock(&iinfo->ii_rwsem);
2238 + hip = iinfo->ii_hinode + bindex;
2239 + memmove(hip + 1, hip, sizeof(*hip) * amount);
2240 + hip->hi_inode = NULL;
2243 + if (unlikely(bend < 0))
2244 + iinfo->ii_bstart = 0;
2247 +static void au_br_do_add(struct super_block *sb, struct dentry *h_dentry,
2248 + struct au_branch *br, aufs_bindex_t bindex)
2250 + struct dentry *root;
2251 + struct inode *root_inode;
2252 + aufs_bindex_t bend, amount;
2254 + root = sb->s_root;
2255 + root_inode = root->d_inode;
2256 + bend = au_sbend(sb);
2257 + amount = bend + 1 - bindex;
2258 + au_sbilist_lock();
2259 + au_br_do_add_brp(au_sbi(sb), bindex, br, bend, amount);
2260 + au_br_do_add_hdp(au_di(root), bindex, bend, amount);
2261 + au_br_do_add_hip(au_ii(root_inode), bindex, bend, amount);
2262 + au_set_h_dptr(root, bindex, dget(h_dentry));
2263 + au_set_h_iptr(root_inode, bindex, au_igrab(h_dentry->d_inode),
2265 + au_sbilist_unlock();
2268 +int au_br_add(struct super_block *sb, struct au_opt_add *add, int remount)
2271 + aufs_bindex_t bend, add_bindex;
2272 + struct dentry *root, *h_dentry;
2273 + struct inode *root_inode;
2274 + struct au_branch *add_branch;
2276 + root = sb->s_root;
2277 + root_inode = root->d_inode;
2278 + IMustLock(root_inode);
2279 + err = test_add(sb, add, remount);
2280 + if (unlikely(err < 0))
2284 + goto out; /* success */
2287 + bend = au_sbend(sb);
2288 + add_branch = au_br_alloc(sb, bend + 2, add->perm);
2289 + err = PTR_ERR(add_branch);
2290 + if (IS_ERR(add_branch))
2293 + err = au_br_init(add_branch, sb, add);
2294 + if (unlikely(err)) {
2295 + au_br_do_free(add_branch);
2299 + add_bindex = add->bindex;
2300 + h_dentry = add->path.dentry;
2302 + au_br_do_add(sb, h_dentry, add_branch, add_bindex);
2304 + sysaufs_brs_del(sb, add_bindex);
2305 + au_br_do_add(sb, h_dentry, add_branch, add_bindex);
2306 + sysaufs_brs_add(sb, add_bindex);
2309 + if (!add_bindex) {
2310 + au_cpup_attr_all(root_inode, /*force*/1);
2311 + sb->s_maxbytes = h_dentry->d_sb->s_maxbytes;
2313 + au_add_nlink(root_inode, h_dentry->d_inode);
2316 + * this test/set prevents aufs from handling unnecesary notify events
2317 + * of xino files, in case of re-adding a writable branch which was
2318 + * once detached from aufs.
2320 + if (au_xino_brid(sb) < 0
2321 + && au_br_writable(add_branch->br_perm)
2322 + && !au_test_fs_bad_xino(h_dentry->d_sb)
2323 + && add_branch->br_xino.xi_file
2324 + && add_branch->br_xino.xi_file->f_dentry->d_parent == h_dentry)
2325 + au_xino_brid_set(sb, add_branch->br_id);
2331 +/* ---------------------------------------------------------------------- */
2337 +/* to show the line number, do not make it inlined function */
2338 +#define AuVerbose(do_info, fmt, ...) do { \
2340 + pr_info(fmt, ##__VA_ARGS__); \
2343 +static int au_test_ibusy(struct inode *inode, aufs_bindex_t bstart,
2344 + aufs_bindex_t bend)
2346 + return (inode && !S_ISDIR(inode->i_mode)) || bstart == bend;
2349 +static int au_test_dbusy(struct dentry *dentry, aufs_bindex_t bstart,
2350 + aufs_bindex_t bend)
2352 + return au_test_ibusy(dentry->d_inode, bstart, bend);
2356 + * test if the branch is deletable or not.
2358 +static int test_dentry_busy(struct dentry *root, aufs_bindex_t bindex,
2359 + unsigned int sigen, const unsigned int verbose)
2361 + int err, i, j, ndentry;
2362 + aufs_bindex_t bstart, bend;
2363 + struct au_dcsub_pages dpages;
2364 + struct au_dpage *dpage;
2367 + err = au_dpages_init(&dpages, GFP_NOFS);
2368 + if (unlikely(err))
2370 + err = au_dcsub_pages(&dpages, root, NULL, NULL);
2371 + if (unlikely(err))
2374 + for (i = 0; !err && i < dpages.ndpage; i++) {
2375 + dpage = dpages.dpages + i;
2376 + ndentry = dpage->ndentry;
2377 + for (j = 0; !err && j < ndentry; j++) {
2378 + d = dpage->dentries[j];
2379 + AuDebugOn(!d->d_count);
2380 + if (!au_digen_test(d, sigen)) {
2381 + di_read_lock_child(d, AuLock_IR);
2382 + if (unlikely(au_dbrange_test(d))) {
2383 + di_read_unlock(d, AuLock_IR);
2387 + di_write_lock_child(d);
2388 + if (unlikely(au_dbrange_test(d))) {
2389 + di_write_unlock(d);
2392 + err = au_reval_dpath(d, sigen);
2394 + di_downgrade_lock(d, AuLock_IR);
2396 + di_write_unlock(d);
2401 + /* AuDbgDentry(d); */
2402 + bstart = au_dbstart(d);
2403 + bend = au_dbend(d);
2404 + if (bstart <= bindex
2406 + && au_h_dptr(d, bindex)
2407 + && au_test_dbusy(d, bstart, bend)) {
2409 + AuVerbose(verbose, "busy %.*s\n", AuDLNPair(d));
2412 + di_read_unlock(d, AuLock_IR);
2417 + au_dpages_free(&dpages);
2422 +static int test_inode_busy(struct super_block *sb, aufs_bindex_t bindex,
2423 + unsigned int sigen, const unsigned int verbose)
2426 + unsigned long long max, ull;
2427 + struct inode *i, **array;
2428 + aufs_bindex_t bstart, bend;
2430 + array = au_iarray_alloc(sb, &max);
2431 + err = PTR_ERR(array);
2432 + if (IS_ERR(array))
2436 + AuDbg("b%d\n", bindex);
2437 + for (ull = 0; !err && ull < max; ull++) {
2439 + if (i->i_ino == AUFS_ROOT_INO)
2442 + /* AuDbgInode(i); */
2443 + if (au_iigen(i) == sigen)
2444 + ii_read_lock_child(i);
2446 + ii_write_lock_child(i);
2447 + err = au_refresh_hinode_self(i);
2450 + ii_downgrade_lock(i);
2452 + ii_write_unlock(i);
2457 + bstart = au_ibstart(i);
2458 + bend = au_ibend(i);
2459 + if (bstart <= bindex
2461 + && au_h_iptr(i, bindex)
2462 + && au_test_ibusy(i, bstart, bend)) {
2464 + AuVerbose(verbose, "busy i%lu\n", i->i_ino);
2467 + ii_read_unlock(i);
2469 + au_iarray_free(array, max);
2475 +static int test_children_busy(struct dentry *root, aufs_bindex_t bindex,
2476 + const unsigned int verbose)
2479 + unsigned int sigen;
2481 + sigen = au_sigen(root->d_sb);
2482 + DiMustNoWaiters(root);
2483 + IiMustNoWaiters(root->d_inode);
2484 + di_write_unlock(root);
2485 + err = test_dentry_busy(root, bindex, sigen, verbose);
2487 + err = test_inode_busy(root->d_sb, bindex, sigen, verbose);
2488 + di_write_lock_child(root); /* aufs_write_lock() calls ..._child() */
2493 +static void au_br_do_del_brp(struct au_sbinfo *sbinfo,
2494 + const aufs_bindex_t bindex,
2495 + const aufs_bindex_t bend)
2497 + struct au_branch **brp, **p;
2499 + AuRwMustWriteLock(&sbinfo->si_rwsem);
2501 + brp = sbinfo->si_branch + bindex;
2502 + if (bindex < bend)
2503 + memmove(brp, brp + 1, sizeof(*brp) * (bend - bindex));
2504 + sbinfo->si_branch[0 + bend] = NULL;
2505 + sbinfo->si_bend--;
2507 + p = krealloc(sbinfo->si_branch, sizeof(*p) * bend, AuGFP_SBILIST);
2509 + sbinfo->si_branch = p;
2510 + /* harmless error */
2513 +static void au_br_do_del_hdp(struct au_dinfo *dinfo, const aufs_bindex_t bindex,
2514 + const aufs_bindex_t bend)
2516 + struct au_hdentry *hdp, *p;
2518 + AuRwMustWriteLock(&dinfo->di_rwsem);
2520 + hdp = dinfo->di_hdentry;
2521 + if (bindex < bend)
2522 + memmove(hdp + bindex, hdp + bindex + 1,
2523 + sizeof(*hdp) * (bend - bindex));
2524 + hdp[0 + bend].hd_dentry = NULL;
2527 + p = krealloc(hdp, sizeof(*p) * bend, AuGFP_SBILIST);
2529 + dinfo->di_hdentry = p;
2530 + /* harmless error */
2533 +static void au_br_do_del_hip(struct au_iinfo *iinfo, const aufs_bindex_t bindex,
2534 + const aufs_bindex_t bend)
2536 + struct au_hinode *hip, *p;
2538 + AuRwMustWriteLock(&iinfo->ii_rwsem);
2540 + hip = iinfo->ii_hinode + bindex;
2541 + if (bindex < bend)
2542 + memmove(hip, hip + 1, sizeof(*hip) * (bend - bindex));
2543 + iinfo->ii_hinode[0 + bend].hi_inode = NULL;
2544 + au_hn_init(iinfo->ii_hinode + bend);
2547 + p = krealloc(iinfo->ii_hinode, sizeof(*p) * bend, AuGFP_SBILIST);
2549 + iinfo->ii_hinode = p;
2550 + /* harmless error */
2553 +static void au_br_do_del(struct super_block *sb, aufs_bindex_t bindex,
2554 + struct au_branch *br)
2556 + aufs_bindex_t bend;
2557 + struct au_sbinfo *sbinfo;
2558 + struct dentry *root, *h_root;
2559 + struct inode *inode, *h_inode;
2560 + struct au_hinode *hinode;
2562 + SiMustWriteLock(sb);
2564 + root = sb->s_root;
2565 + inode = root->d_inode;
2566 + sbinfo = au_sbi(sb);
2567 + bend = sbinfo->si_bend;
2569 + h_root = au_h_dptr(root, bindex);
2570 + hinode = au_hi(inode, bindex);
2571 + h_inode = au_igrab(hinode->hi_inode);
2574 + au_sbilist_lock();
2575 + au_br_do_del_brp(sbinfo, bindex, bend);
2576 + au_br_do_del_hdp(au_di(root), bindex, bend);
2577 + au_br_do_del_hip(au_ii(inode), bindex, bend);
2578 + au_sbilist_unlock();
2582 + au_br_do_free(br);
2585 +int au_br_del(struct super_block *sb, struct au_opt_del *del, int remount)
2588 + unsigned int mnt_flags;
2589 + aufs_bindex_t bindex, bend, br_id;
2590 + unsigned char do_wh, verbose;
2591 + struct au_branch *br;
2592 + struct au_wbr *wbr;
2595 + bindex = au_find_dbindex(sb->s_root, del->h_path.dentry);
2598 + goto out; /* success */
2600 + pr_err("%s no such branch\n", del->pathname);
2603 + AuDbg("bindex b%d\n", bindex);
2606 + mnt_flags = au_mntflags(sb);
2607 + verbose = !!au_opt_test(mnt_flags, VERBOSE);
2608 + bend = au_sbend(sb);
2609 + if (unlikely(!bend)) {
2610 + AuVerbose(verbose, "no more branches left\n");
2613 + br = au_sbr(sb, bindex);
2614 + i = atomic_read(&br->br_count);
2615 + if (unlikely(i)) {
2616 + AuVerbose(verbose, "%d file(s) opened\n", i);
2621 + do_wh = wbr && (wbr->wbr_whbase || wbr->wbr_plink || wbr->wbr_orph);
2623 + /* instead of WbrWhMustWriteLock(wbr) */
2624 + SiMustWriteLock(sb);
2625 + for (i = 0; i < AuBrWh_Last; i++) {
2626 + dput(wbr->wbr_wh[i]);
2627 + wbr->wbr_wh[i] = NULL;
2631 + err = test_children_busy(sb->s_root, bindex, verbose);
2632 + if (unlikely(err)) {
2639 + br_id = br->br_id;
2641 + au_br_do_del(sb, bindex, br);
2643 + sysaufs_brs_del(sb, bindex);
2644 + au_br_do_del(sb, bindex, br);
2645 + sysaufs_brs_add(sb, bindex);
2649 + au_cpup_attr_all(sb->s_root->d_inode, /*force*/1);
2650 + sb->s_maxbytes = au_sbr_sb(sb, 0)->s_maxbytes;
2652 + au_sub_nlink(sb->s_root->d_inode, del->h_path.dentry->d_inode);
2653 + if (au_opt_test(mnt_flags, PLINK))
2654 + au_plink_half_refresh(sb, br_id);
2656 + if (au_xino_brid(sb) == br_id)
2657 + au_xino_brid_set(sb, -1);
2658 + goto out; /* success */
2662 + rerr = au_br_init_wh(sb, br, br->br_perm, del->h_path.dentry);
2664 + pr_warning("failed re-creating base whiteout, %s. (%d)\n",
2665 + del->pathname, rerr);
2670 +/* ---------------------------------------------------------------------- */
2672 +static int au_ibusy(struct super_block *sb, struct aufs_ibusy __user *arg)
2675 + aufs_bindex_t bstart, bend;
2676 + struct aufs_ibusy ibusy;
2677 + struct inode *inode, *h_inode;
2680 + if (unlikely(!capable(CAP_SYS_ADMIN)))
2683 + err = copy_from_user(&ibusy, arg, sizeof(ibusy));
2685 + err = !access_ok(VERIFY_WRITE, &arg->h_ino, sizeof(arg->h_ino));
2686 + if (unlikely(err)) {
2693 + si_read_lock(sb, AuLock_FLUSH);
2694 + if (unlikely(ibusy.bindex < 0 || ibusy.bindex > au_sbend(sb)))
2698 + ibusy.h_ino = 0; /* invalid */
2699 + inode = ilookup(sb, ibusy.ino);
2701 + || inode->i_ino == AUFS_ROOT_INO
2702 + || is_bad_inode(inode))
2705 + ii_read_lock_child(inode);
2706 + bstart = au_ibstart(inode);
2707 + bend = au_ibend(inode);
2708 + if (bstart <= ibusy.bindex && ibusy.bindex <= bend) {
2709 + h_inode = au_h_iptr(inode, ibusy.bindex);
2710 + if (h_inode && au_test_ibusy(inode, bstart, bend))
2711 + ibusy.h_ino = h_inode->i_ino;
2713 + ii_read_unlock(inode);
2717 + si_read_unlock(sb);
2719 + err = __put_user(ibusy.h_ino, &arg->h_ino);
2720 + if (unlikely(err)) {
2729 +long au_ibusy_ioctl(struct file *file, unsigned long arg)
2731 + return au_ibusy(file->f_dentry->d_sb, (void __user *)arg);
2734 +#ifdef CONFIG_COMPAT
2735 +long au_ibusy_compat_ioctl(struct file *file, unsigned long arg)
2737 + return au_ibusy(file->f_dentry->d_sb, compat_ptr(arg));
2741 +/* ---------------------------------------------------------------------- */
2744 + * change a branch permission
2747 +static void au_warn_ima(void)
2750 + /* since it doesn't support mark_files_ro() */
2751 + AuWarn1("RW -> RO makes IMA to produce wrong message\n");
2755 +static int do_need_sigen_inc(int a, int b)
2757 + return au_br_whable(a) && !au_br_whable(b);
2760 +static int need_sigen_inc(int old, int new)
2762 + return do_need_sigen_inc(old, new)
2763 + || do_need_sigen_inc(new, old);
2766 +static unsigned long long au_farray_cb(void *a,
2767 + unsigned long long max __maybe_unused,
2770 + unsigned long long n;
2771 + struct file **p, *f;
2772 + struct super_block *sb = arg;
2776 + lg_global_lock(files_lglock);
2777 + do_file_list_for_each_entry(sb, f) {
2780 + && !special_file(f->f_dentry->d_inode->i_mode)) {
2784 + AuDebugOn(n > max);
2786 + } while_file_list_for_each_entry;
2787 + lg_global_unlock(files_lglock);
2792 +static struct file **au_farray_alloc(struct super_block *sb,
2793 + unsigned long long *max)
2795 + *max = atomic_long_read(&au_sbi(sb)->si_nfiles);
2796 + return au_array_alloc(max, au_farray_cb, sb);
2799 +static void au_farray_free(struct file **a, unsigned long long max)
2801 + unsigned long long ull;
2803 + for (ull = 0; ull < max; ull++)
2809 +static int au_br_mod_files_ro(struct super_block *sb, aufs_bindex_t bindex)
2812 + unsigned int mnt_flags;
2813 + unsigned long long ull, max;
2814 + aufs_bindex_t br_id;
2815 + unsigned char verbose;
2816 + struct file *file, *hf, **array;
2817 + struct inode *inode;
2818 + struct au_hfile *hfile;
2820 + mnt_flags = au_mntflags(sb);
2821 + verbose = !!au_opt_test(mnt_flags, VERBOSE);
2823 + array = au_farray_alloc(sb, &max);
2824 + err = PTR_ERR(array);
2825 + if (IS_ERR(array))
2829 + br_id = au_sbr_id(sb, bindex);
2830 + for (ull = 0; ull < max; ull++) {
2831 + file = array[ull];
2833 + /* AuDbg("%.*s\n", AuDLNPair(file->f_dentry)); */
2834 + fi_read_lock(file);
2835 + if (unlikely(au_test_mmapped(file))) {
2837 + AuVerbose(verbose, "mmapped %.*s\n",
2838 + AuDLNPair(file->f_dentry));
2840 + FiMustNoWaiters(file);
2841 + fi_read_unlock(file);
2845 + inode = file->f_dentry->d_inode;
2846 + hfile = &au_fi(file)->fi_htop;
2847 + hf = hfile->hf_file;
2848 + if (!S_ISREG(inode->i_mode)
2849 + || !(file->f_mode & FMODE_WRITE)
2850 + || hfile->hf_br->br_id != br_id
2851 + || !(hf->f_mode & FMODE_WRITE))
2852 + array[ull] = NULL;
2858 + FiMustNoWaiters(file);
2859 + fi_read_unlock(file);
2867 + for (ull = 0; ull < max; ull++) {
2868 + file = array[ull];
2872 + /* todo: already flushed? */
2873 + /* cf. fs/super.c:mark_files_ro() */
2874 + /* fi_read_lock(file); */
2875 + hfile = &au_fi(file)->fi_htop;
2876 + hf = hfile->hf_file;
2877 + /* fi_read_unlock(file); */
2878 + spin_lock(&hf->f_lock);
2879 + hf->f_mode &= ~FMODE_WRITE;
2880 + spin_unlock(&hf->f_lock);
2881 + if (!file_check_writeable(hf)) {
2882 + file_release_write(hf);
2883 + mnt_drop_write(hf->f_vfsmnt);
2888 + au_farray_free(array, max);
2894 +int au_br_mod(struct super_block *sb, struct au_opt_mod *mod, int remount,
2898 + aufs_bindex_t bindex;
2900 + struct dentry *root;
2901 + struct au_branch *br;
2903 + root = sb->s_root;
2904 + bindex = au_find_dbindex(root, mod->h_root);
2907 + return 0; /* success */
2909 + pr_err("%s no such branch\n", mod->path);
2912 + AuDbg("bindex b%d\n", bindex);
2914 + err = test_br(mod->h_root->d_inode, mod->perm, mod->path);
2915 + if (unlikely(err))
2918 + br = au_sbr(sb, bindex);
2919 + if (br->br_perm == mod->perm)
2920 + return 0; /* success */
2922 + if (au_br_writable(br->br_perm)) {
2923 + /* remove whiteout base */
2924 + err = au_br_init_wh(sb, br, mod->perm, mod->h_root);
2925 + if (unlikely(err))
2928 + if (!au_br_writable(mod->perm)) {
2929 + /* rw --> ro, file might be mmapped */
2930 + DiMustNoWaiters(root);
2931 + IiMustNoWaiters(root->d_inode);
2932 + di_write_unlock(root);
2933 + err = au_br_mod_files_ro(sb, bindex);
2934 + /* aufs_write_lock() calls ..._child() */
2935 + di_write_lock_child(root);
2937 + if (unlikely(err)) {
2939 + br->br_wbr = kmalloc(sizeof(*br->br_wbr),
2942 + path.mnt = br->br_mnt;
2943 + path.dentry = mod->h_root;
2944 + rerr = au_wbr_init(br, sb, br->br_perm,
2947 + if (unlikely(rerr)) {
2948 + AuIOErr("nested error %d (%d)\n",
2950 + br->br_perm = mod->perm;
2954 + } else if (au_br_writable(mod->perm)) {
2957 + br->br_wbr = kmalloc(sizeof(*br->br_wbr), GFP_NOFS);
2959 + path.mnt = br->br_mnt;
2960 + path.dentry = mod->h_root;
2961 + err = au_wbr_init(br, sb, mod->perm, &path);
2962 + if (unlikely(err)) {
2963 + kfree(br->br_wbr);
2964 + br->br_wbr = NULL;
2970 + *do_refresh |= need_sigen_inc(br->br_perm, mod->perm);
2971 + br->br_perm = mod->perm;
2978 diff -urN /usr/share/empty/fs/aufs/branch.h linux/fs/aufs/branch.h
2979 --- /usr/share/empty/fs/aufs/branch.h 1970-01-01 01:00:00.000000000 +0100
2980 +++ linux/fs/aufs/branch.h 2012-02-13 21:54:56.966438287 +0100
2983 + * Copyright (C) 2005-2012 Junjiro R. Okajima
2985 + * This program, aufs is free software; you can redistribute it and/or modify
2986 + * it under the terms of the GNU General Public License as published by
2987 + * the Free Software Foundation; either version 2 of the License, or
2988 + * (at your option) any later version.
2990 + * This program is distributed in the hope that it will be useful,
2991 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
2992 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
2993 + * GNU General Public License for more details.
2995 + * You should have received a copy of the GNU General Public License
2996 + * along with this program; if not, write to the Free Software
2997 + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
3001 + * branch filesystems and xino for them
3004 +#ifndef __AUFS_BRANCH_H__
3005 +#define __AUFS_BRANCH_H__
3009 +#include <linux/mount.h>
3014 +/* ---------------------------------------------------------------------- */
3017 +struct au_xino_file {
3018 + struct file *xi_file;
3019 + struct mutex xi_nondir_mtx;
3021 + /* todo: make xino files an array to support huge inode number */
3023 +#ifdef CONFIG_DEBUG_FS
3024 + struct dentry *xi_dbgaufs;
3028 +/* members for writable branch only */
3029 +enum {AuBrWh_BASE, AuBrWh_PLINK, AuBrWh_ORPH, AuBrWh_Last};
3031 + struct au_rwsem wbr_wh_rwsem;
3032 + struct dentry *wbr_wh[AuBrWh_Last];
3033 + atomic_t wbr_wh_running;
3034 +#define wbr_whbase wbr_wh[AuBrWh_BASE] /* whiteout base */
3035 +#define wbr_plink wbr_wh[AuBrWh_PLINK] /* pseudo-link dir */
3036 +#define wbr_orph wbr_wh[AuBrWh_ORPH] /* dir for orphans */
3039 + unsigned long long wbr_bytes;
3042 +/* ext2 has 3 types of operations at least, ext3 has 4 */
3043 +#define AuBrDynOp (AuDyLast * 4)
3045 +/* protected by superblock rwsem */
3047 + struct au_xino_file br_xino;
3049 + aufs_bindex_t br_id;
3052 + struct vfsmount *br_mnt;
3053 + spinlock_t br_dykey_lock;
3054 + struct au_dykey *br_dykey[AuBrDynOp];
3055 + atomic_t br_count;
3057 + struct au_wbr *br_wbr;
3059 + /* xino truncation */
3060 + blkcnt_t br_xino_upper; /* watermark in blocks */
3061 + atomic_t br_xino_running;
3063 +#ifdef CONFIG_AUFS_HFSNOTIFY
3064 + struct fsnotify_group *br_hfsn_group;
3065 + struct fsnotify_ops br_hfsn_ops;
3068 +#ifdef CONFIG_SYSFS
3069 + /* an entry under sysfs per mount-point */
3071 + struct attribute br_attr;
3075 +/* ---------------------------------------------------------------------- */
3077 +/* branch permissions and attributes */
3078 +#define AuBrPerm_RW 1 /* writable, hardlinkable wh */
3079 +#define AuBrPerm_RO (1 << 1) /* readonly */
3080 +#define AuBrPerm_RR (1 << 2) /* natively readonly */
3081 +#define AuBrPerm_Mask (AuBrPerm_RW | AuBrPerm_RO | AuBrPerm_RR)
3083 +#define AuBrRAttr_WH (1 << 3) /* whiteout-able */
3085 +#define AuBrWAttr_NoLinkWH (1 << 4) /* un-hardlinkable whiteouts */
3087 +static inline int au_br_writable(int brperm)
3089 + return brperm & AuBrPerm_RW;
3092 +static inline int au_br_whable(int brperm)
3094 + return brperm & (AuBrPerm_RW | AuBrRAttr_WH);
3097 +static inline int au_br_wh_linkable(int brperm)
3099 + return !(brperm & AuBrWAttr_NoLinkWH);
3102 +static inline int au_br_rdonly(struct au_branch *br)
3104 + return ((br->br_mnt->mnt_sb->s_flags & MS_RDONLY)
3105 + || !au_br_writable(br->br_perm))
3109 +static inline int au_br_hnotifyable(int brperm __maybe_unused)
3111 +#ifdef CONFIG_AUFS_HNOTIFY
3112 + return !(brperm & AuBrPerm_RR);
3118 +/* ---------------------------------------------------------------------- */
3122 +void au_br_free(struct au_sbinfo *sinfo);
3123 +int au_br_index(struct super_block *sb, aufs_bindex_t br_id);
3125 +int au_br_add(struct super_block *sb, struct au_opt_add *add, int remount);
3127 +int au_br_del(struct super_block *sb, struct au_opt_del *del, int remount);
3128 +long au_ibusy_ioctl(struct file *file, unsigned long arg);
3129 +#ifdef CONFIG_COMPAT
3130 +long au_ibusy_compat_ioctl(struct file *file, unsigned long arg);
3133 +int au_br_mod(struct super_block *sb, struct au_opt_mod *mod, int remount,
3137 +static const loff_t au_loff_max = LLONG_MAX;
3139 +int au_xib_trunc(struct super_block *sb);
3140 +ssize_t xino_fread(au_readf_t func, struct file *file, void *buf, size_t size,
3142 +ssize_t xino_fwrite(au_writef_t func, struct file *file, void *buf, size_t size,
3144 +struct file *au_xino_create2(struct file *base_file, struct file *copy_src);
3145 +struct file *au_xino_create(struct super_block *sb, char *fname, int silent);
3146 +ino_t au_xino_new_ino(struct super_block *sb);
3147 +void au_xino_delete_inode(struct inode *inode, const int unlinked);
3148 +int au_xino_write(struct super_block *sb, aufs_bindex_t bindex, ino_t h_ino,
3150 +int au_xino_read(struct super_block *sb, aufs_bindex_t bindex, ino_t h_ino,
3152 +int au_xino_br(struct super_block *sb, struct au_branch *br, ino_t hino,
3153 + struct file *base_file, int do_test);
3154 +int au_xino_trunc(struct super_block *sb, aufs_bindex_t bindex);
3156 +struct au_opt_xino;
3157 +int au_xino_set(struct super_block *sb, struct au_opt_xino *xino, int remount);
3158 +void au_xino_clr(struct super_block *sb);
3159 +struct file *au_xino_def(struct super_block *sb);
3160 +int au_xino_path(struct seq_file *seq, struct file *file);
3162 +/* ---------------------------------------------------------------------- */
3164 +/* Superblock to branch */
3166 +aufs_bindex_t au_sbr_id(struct super_block *sb, aufs_bindex_t bindex)
3168 + return au_sbr(sb, bindex)->br_id;
3172 +struct vfsmount *au_sbr_mnt(struct super_block *sb, aufs_bindex_t bindex)
3174 + return au_sbr(sb, bindex)->br_mnt;
3178 +struct super_block *au_sbr_sb(struct super_block *sb, aufs_bindex_t bindex)
3180 + return au_sbr_mnt(sb, bindex)->mnt_sb;
3183 +static inline void au_sbr_put(struct super_block *sb, aufs_bindex_t bindex)
3185 + atomic_dec(&au_sbr(sb, bindex)->br_count);
3188 +static inline int au_sbr_perm(struct super_block *sb, aufs_bindex_t bindex)
3190 + return au_sbr(sb, bindex)->br_perm;
3193 +static inline int au_sbr_whable(struct super_block *sb, aufs_bindex_t bindex)
3195 + return au_br_whable(au_sbr_perm(sb, bindex));
3198 +/* ---------------------------------------------------------------------- */
3201 + * wbr_wh_read_lock, wbr_wh_write_lock
3202 + * wbr_wh_read_unlock, wbr_wh_write_unlock, wbr_wh_downgrade_lock
3204 +AuSimpleRwsemFuncs(wbr_wh, struct au_wbr *wbr, &wbr->wbr_wh_rwsem);
3206 +#define WbrWhMustNoWaiters(wbr) AuRwMustNoWaiters(&wbr->wbr_wh_rwsem)
3207 +#define WbrWhMustAnyLock(wbr) AuRwMustAnyLock(&wbr->wbr_wh_rwsem)
3208 +#define WbrWhMustWriteLock(wbr) AuRwMustWriteLock(&wbr->wbr_wh_rwsem)
3210 +#endif /* __KERNEL__ */
3211 +#endif /* __AUFS_BRANCH_H__ */
3212 diff -urN /usr/share/empty/fs/aufs/conf.mk linux/fs/aufs/conf.mk
3213 --- /usr/share/empty/fs/aufs/conf.mk 1970-01-01 01:00:00.000000000 +0100
3214 +++ linux/fs/aufs/conf.mk 2012-02-13 21:54:56.966438287 +0100
3217 +AuConfStr = CONFIG_AUFS_FS=${CONFIG_AUFS_FS}
3221 +AuConfStr += ${1}=${${1}}
3225 +AuConfAll = BRANCH_MAX_127 BRANCH_MAX_511 BRANCH_MAX_1023 BRANCH_MAX_32767 \
3227 + HNOTIFY HFSNOTIFY \
3238 +$(foreach i, ${AuConfAll}, \
3239 + $(eval $(call AuConf,CONFIG_AUFS_${i})))
3241 +AuConfName = ${obj}/conf.str
3242 +${AuConfName}.tmp: FORCE
3243 + @echo ${AuConfStr} | tr ' ' '\n' | sed -e 's/^/"/' -e 's/$$/\\n"/' > $@
3244 +${AuConfName}: ${AuConfName}.tmp
3245 + @diff -q $< $@ > /dev/null 2>&1 || { \
3246 + echo ' GEN ' $@; \
3250 +clean-files += ${AuConfName} ${AuConfName}.tmp
3251 +${obj}/sysfs.o: ${AuConfName}
3253 +-include ${srctree}/${src}/conf_priv.mk
3254 diff -urN /usr/share/empty/fs/aufs/cpup.c linux/fs/aufs/cpup.c
3255 --- /usr/share/empty/fs/aufs/cpup.c 1970-01-01 01:00:00.000000000 +0100
3256 +++ linux/fs/aufs/cpup.c 2012-02-13 21:54:56.966438287 +0100
3259 + * Copyright (C) 2005-2012 Junjiro R. Okajima
3261 + * This program, aufs is free software; you can redistribute it and/or modify
3262 + * it under the terms of the GNU General Public License as published by
3263 + * the Free Software Foundation; either version 2 of the License, or
3264 + * (at your option) any later version.
3266 + * This program is distributed in the hope that it will be useful,
3267 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
3268 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3269 + * GNU General Public License for more details.
3271 + * You should have received a copy of the GNU General Public License
3272 + * along with this program; if not, write to the Free Software
3273 + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
3277 + * copy-up functions, see wbr_policy.c for copy-down
3280 +#include <linux/fs_stack.h>
3281 +#include <linux/mm.h>
3284 +void au_cpup_attr_flags(struct inode *dst, struct inode *src)
3286 + const unsigned int mask = S_DEAD | S_SWAPFILE | S_PRIVATE
3287 + | S_NOATIME | S_NOCMTIME;
3289 + dst->i_flags |= src->i_flags & ~mask;
3290 + if (au_test_fs_notime(dst->i_sb))
3291 + dst->i_flags |= S_NOATIME | S_NOCMTIME;
3294 +void au_cpup_attr_timesizes(struct inode *inode)
3296 + struct inode *h_inode;
3298 + h_inode = au_h_iptr(inode, au_ibstart(inode));
3299 + fsstack_copy_attr_times(inode, h_inode);
3300 + fsstack_copy_inode_size(inode, h_inode);
3303 +void au_cpup_attr_nlink(struct inode *inode, int force)
3305 + struct inode *h_inode;
3306 + struct super_block *sb;
3307 + aufs_bindex_t bindex, bend;
3310 + bindex = au_ibstart(inode);
3311 + h_inode = au_h_iptr(inode, bindex);
3313 + && !S_ISDIR(h_inode->i_mode)
3314 + && au_opt_test(au_mntflags(sb), PLINK)
3315 + && au_plink_test(inode))
3318 + set_nlink(inode, h_inode->i_nlink);
3321 + * fewer nlink makes find(1) noisy, but larger nlink doesn't.
3322 + * it may includes whplink directory.
3324 + if (S_ISDIR(h_inode->i_mode)) {
3325 + bend = au_ibend(inode);
3326 + for (bindex++; bindex <= bend; bindex++) {
3327 + h_inode = au_h_iptr(inode, bindex);
3329 + au_add_nlink(inode, h_inode);
3334 +void au_cpup_attr_changeable(struct inode *inode)
3336 + struct inode *h_inode;
3338 + h_inode = au_h_iptr(inode, au_ibstart(inode));
3339 + inode->i_mode = h_inode->i_mode;
3340 + inode->i_uid = h_inode->i_uid;
3341 + inode->i_gid = h_inode->i_gid;
3342 + au_cpup_attr_timesizes(inode);
3343 + au_cpup_attr_flags(inode, h_inode);
3346 +void au_cpup_igen(struct inode *inode, struct inode *h_inode)
3348 + struct au_iinfo *iinfo = au_ii(inode);
3350 + IiMustWriteLock(inode);
3352 + iinfo->ii_higen = h_inode->i_generation;
3353 + iinfo->ii_hsb1 = h_inode->i_sb;
3356 +void au_cpup_attr_all(struct inode *inode, int force)
3358 + struct inode *h_inode;
3360 + h_inode = au_h_iptr(inode, au_ibstart(inode));
3361 + au_cpup_attr_changeable(inode);
3362 + if (inode->i_nlink > 0)
3363 + au_cpup_attr_nlink(inode, force);
3364 + inode->i_rdev = h_inode->i_rdev;
3365 + inode->i_blkbits = h_inode->i_blkbits;
3366 + au_cpup_igen(inode, h_inode);
3369 +/* ---------------------------------------------------------------------- */
3371 +/* Note: dt_dentry and dt_h_dentry are not dget/dput-ed */
3373 +/* keep the timestamps of the parent dir when cpup */
3374 +void au_dtime_store(struct au_dtime *dt, struct dentry *dentry,
3375 + struct path *h_path)
3377 + struct inode *h_inode;
3379 + dt->dt_dentry = dentry;
3380 + dt->dt_h_path = *h_path;
3381 + h_inode = h_path->dentry->d_inode;
3382 + dt->dt_atime = h_inode->i_atime;
3383 + dt->dt_mtime = h_inode->i_mtime;
3387 +void au_dtime_revert(struct au_dtime *dt)
3389 + struct iattr attr;
3392 + attr.ia_atime = dt->dt_atime;
3393 + attr.ia_mtime = dt->dt_mtime;
3394 + attr.ia_valid = ATTR_FORCE | ATTR_MTIME | ATTR_MTIME_SET
3395 + | ATTR_ATIME | ATTR_ATIME_SET;
3397 + err = vfsub_notify_change(&dt->dt_h_path, &attr);
3398 + if (unlikely(err))
3399 + pr_warning("restoring timestamps failed(%d). ignored\n", err);
3402 +/* ---------------------------------------------------------------------- */
3404 +static noinline_for_stack
3405 +int cpup_iattr(struct dentry *dst, aufs_bindex_t bindex, struct dentry *h_src)
3409 + struct path h_path;
3410 + struct inode *h_isrc, *h_idst;
3412 + h_path.dentry = au_h_dptr(dst, bindex);
3413 + h_idst = h_path.dentry->d_inode;
3414 + h_path.mnt = au_sbr_mnt(dst->d_sb, bindex);
3415 + h_isrc = h_src->d_inode;
3416 + ia.ia_valid = ATTR_FORCE | ATTR_UID | ATTR_GID
3417 + | ATTR_ATIME | ATTR_MTIME
3418 + | ATTR_ATIME_SET | ATTR_MTIME_SET;
3419 + ia.ia_uid = h_isrc->i_uid;
3420 + ia.ia_gid = h_isrc->i_gid;
3421 + ia.ia_atime = h_isrc->i_atime;
3422 + ia.ia_mtime = h_isrc->i_mtime;
3423 + if (h_idst->i_mode != h_isrc->i_mode
3424 + && !S_ISLNK(h_idst->i_mode)) {
3425 + ia.ia_valid |= ATTR_MODE;
3426 + ia.ia_mode = h_isrc->i_mode;
3428 + sbits = !!(h_isrc->i_mode & (S_ISUID | S_ISGID));
3429 + au_cpup_attr_flags(h_idst, h_isrc);
3430 + err = vfsub_notify_change(&h_path, &ia);
3432 + /* is this nfs only? */
3433 + if (!err && sbits && au_test_nfs(h_path.dentry->d_sb)) {
3434 + ia.ia_valid = ATTR_FORCE | ATTR_MODE;
3435 + ia.ia_mode = h_isrc->i_mode;
3436 + err = vfsub_notify_change(&h_path, &ia);
3442 +/* ---------------------------------------------------------------------- */
3444 +static int au_do_copy_file(struct file *dst, struct file *src, loff_t len,
3445 + char *buf, unsigned long blksize)
3448 + size_t sz, rbytes, wbytes;
3449 + unsigned char all_zero;
3451 + struct mutex *h_mtx;
3452 + /* reduce stack usage */
3455 + zp = page_address(ZERO_PAGE(0));
3456 + if (unlikely(!zp))
3457 + return -ENOMEM; /* possible? */
3462 + AuDbg("len %lld\n", len);
3464 + if (len < blksize)
3468 + /* todo: signal_pending? */
3469 + while (!rbytes || err == -EAGAIN || err == -EINTR) {
3470 + rbytes = vfsub_read_k(src, buf, sz, &src->f_pos);
3473 + if (unlikely(err < 0))
3477 + if (len >= rbytes && rbytes == blksize)
3478 + all_zero = !memcmp(buf, zp, rbytes);
3485 + b = vfsub_write_k(dst, p, wbytes, &dst->f_pos);
3487 + /* todo: signal_pending? */
3488 + if (unlikely(err == -EAGAIN || err == -EINTR))
3490 + if (unlikely(err < 0))
3499 + res = vfsub_llseek(dst, rbytes, SEEK_CUR);
3501 + if (unlikely(res < 0))
3508 + /* the last block may be a hole */
3509 + if (!err && all_zero) {
3510 + AuLabel(last hole);
3513 + if (au_test_nfs(dst->f_dentry->d_sb)) {
3514 + /* nfs requires this step to make last hole */
3515 + /* is this only nfs? */
3517 + /* todo: signal_pending? */
3518 + err = vfsub_write_k(dst, "\0", 1, &dst->f_pos);
3519 + } while (err == -EAGAIN || err == -EINTR);
3526 + ia->ia_size = dst->f_pos;
3527 + ia->ia_valid = ATTR_SIZE | ATTR_FILE;
3528 + ia->ia_file = dst;
3529 + h_mtx = &dst->f_dentry->d_inode->i_mutex;
3530 + mutex_lock_nested(h_mtx, AuLsc_I_CHILD2);
3531 + err = vfsub_notify_change(&dst->f_path, ia);
3532 + mutex_unlock(h_mtx);
3539 +int au_copy_file(struct file *dst, struct file *src, loff_t len)
3542 + unsigned long blksize;
3543 + unsigned char do_kfree;
3547 + blksize = dst->f_dentry->d_sb->s_blocksize;
3548 + if (!blksize || PAGE_SIZE < blksize)
3549 + blksize = PAGE_SIZE;
3550 + AuDbg("blksize %lu\n", blksize);
3551 + do_kfree = (blksize != PAGE_SIZE && blksize >= sizeof(struct iattr *));
3553 + buf = kmalloc(blksize, GFP_NOFS);
3555 + buf = (void *)__get_free_page(GFP_NOFS);
3556 + if (unlikely(!buf))
3559 + if (len > (1 << 22))
3560 + AuDbg("copying a large file %lld\n", (long long)len);
3564 + err = au_do_copy_file(dst, src, len, buf, blksize);
3568 + free_page((unsigned long)buf);
3575 + * to support a sparse file which is opened with O_APPEND,
3576 + * we need to close the file.
3578 +static int au_cp_regular(struct dentry *dentry, aufs_bindex_t bdst,
3579 + aufs_bindex_t bsrc, loff_t len)
3582 + enum { SRC, DST };
3584 + aufs_bindex_t bindex;
3585 + unsigned int flags;
3586 + struct dentry *dentry;
3587 + struct file *file;
3588 + void *label, *label_file;
3592 + .flags = O_RDONLY | O_NOATIME | O_LARGEFILE,
3595 + .label_file = &&out_src
3599 + .flags = O_WRONLY | O_NOATIME | O_LARGEFILE,
3601 + .label = &&out_src,
3602 + .label_file = &&out_dst
3605 + struct super_block *sb;
3607 + /* bsrc branch can be ro/rw. */
3608 + sb = dentry->d_sb;
3610 + for (i = 0; i < 2; i++, f++) {
3611 + f->dentry = au_h_dptr(dentry, f->bindex);
3612 + f->file = au_h_open(dentry, f->bindex, f->flags, /*file*/NULL);
3613 + err = PTR_ERR(f->file);
3614 + if (IS_ERR(f->file))
3617 + if (unlikely(!f->file->f_op))
3618 + goto *f->label_file;
3621 + /* try stopping to update while we copyup */
3622 + IMustLock(file[SRC].dentry->d_inode);
3623 + err = au_copy_file(file[DST].file, file[SRC].file, len);
3626 + fput(file[DST].file);
3627 + au_sbr_put(sb, file[DST].bindex);
3629 + fput(file[SRC].file);
3630 + au_sbr_put(sb, file[SRC].bindex);
3635 +static int au_do_cpup_regular(struct dentry *dentry, aufs_bindex_t bdst,
3636 + aufs_bindex_t bsrc, loff_t len,
3637 + struct inode *h_dir, struct path *h_path)
3643 + l = i_size_read(au_h_iptr(dentry->d_inode, bsrc));
3644 + if (len == -1 || l < len)
3647 + err = au_cp_regular(dentry, bdst, bsrc, len);
3649 + goto out; /* success */
3651 + rerr = vfsub_unlink(h_dir, h_path, /*force*/0);
3653 + AuIOErr("failed unlinking cpup-ed %.*s(%d, %d)\n",
3654 + AuDLNPair(h_path->dentry), err, rerr);
3662 +static int au_do_cpup_symlink(struct path *h_path, struct dentry *h_src,
3663 + struct inode *h_dir)
3666 + mm_segment_t old_fs;
3673 + if (unlikely(!h_src->d_inode->i_op->readlink))
3677 + sym.k = __getname_gfp(GFP_NOFS);
3678 + if (unlikely(!sym.k))
3681 + /* unnecessary to support mmap_sem since symlink is not mmap-able */
3682 + old_fs = get_fs();
3683 + set_fs(KERNEL_DS);
3684 + symlen = h_src->d_inode->i_op->readlink(h_src, sym.u, PATH_MAX);
3689 + sym.k[symlen] = 0;
3690 + err = vfsub_symlink(h_dir, h_path, sym.k);
3698 +/* return with the lower dst inode is locked */
3699 +static noinline_for_stack
3700 +int cpup_entry(struct dentry *dentry, aufs_bindex_t bdst,
3701 + aufs_bindex_t bsrc, loff_t len, unsigned int flags,
3702 + struct dentry *dst_parent)
3706 + unsigned int mnt_flags;
3707 + unsigned char isdir;
3708 + const unsigned char do_dt = !!au_ftest_cpup(flags, DTIME);
3709 + struct au_dtime dt;
3710 + struct path h_path;
3711 + struct dentry *h_src, *h_dst, *h_parent;
3712 + struct inode *h_inode, *h_dir;
3713 + struct super_block *sb;
3715 + /* bsrc branch can be ro/rw. */
3716 + h_src = au_h_dptr(dentry, bsrc);
3717 + h_inode = h_src->d_inode;
3718 + AuDebugOn(h_inode != au_h_iptr(dentry->d_inode, bsrc));
3720 + /* try stopping to be referenced while we are creating */
3721 + h_dst = au_h_dptr(dentry, bdst);
3722 + h_parent = h_dst->d_parent; /* dir inode is locked */
3723 + h_dir = h_parent->d_inode;
3725 + AuDebugOn(h_parent != h_dst->d_parent);
3727 + sb = dentry->d_sb;
3728 + h_path.mnt = au_sbr_mnt(sb, bdst);
3730 + h_path.dentry = h_parent;
3731 + au_dtime_store(&dt, dst_parent, &h_path);
3733 + h_path.dentry = h_dst;
3736 + mode = h_inode->i_mode;
3737 + switch (mode & S_IFMT) {
3739 + /* try stopping to update while we are referencing */
3740 + IMustLock(h_inode);
3741 + err = vfsub_create(h_dir, &h_path, mode | S_IWUSR);
3743 + err = au_do_cpup_regular
3744 + (dentry, bdst, bsrc, len,
3745 + au_h_iptr(dst_parent->d_inode, bdst), &h_path);
3749 + err = vfsub_mkdir(h_dir, &h_path, mode);
3752 + * strange behaviour from the users view,
3753 + * particularry setattr case
3755 + if (au_ibstart(dst_parent->d_inode) == bdst)
3756 + au_cpup_attr_nlink(dst_parent->d_inode,
3758 + au_cpup_attr_nlink(dentry->d_inode, /*force*/1);
3762 + err = au_do_cpup_symlink(&h_path, h_src, h_dir);
3766 + AuDebugOn(!capable(CAP_MKNOD));
3770 + err = vfsub_mknod(h_dir, &h_path, mode, h_inode->i_rdev);
3773 + AuIOErr("Unknown inode type 0%o\n", mode);
3777 + mnt_flags = au_mntflags(sb);
3778 + if (!au_opt_test(mnt_flags, UDBA_NONE)
3780 + && au_opt_test(mnt_flags, XINO)
3781 + && h_inode->i_nlink == 1
3782 + /* todo: unnecessary? */
3783 + /* && dentry->d_inode->i_nlink == 1 */
3785 + && !au_ftest_cpup(flags, KEEPLINO))
3786 + au_xino_write(sb, bsrc, h_inode->i_ino, /*ino*/0);
3787 + /* ignore this error */
3790 + au_dtime_revert(&dt);
3795 + * copyup the @dentry from @bsrc to @bdst.
3796 + * the caller must set the both of lower dentries.
3797 + * @len is for truncating when it is -1 copyup the entire file.
3798 + * in link/rename cases, @dst_parent may be different from the real one.
3800 +static int au_cpup_single(struct dentry *dentry, aufs_bindex_t bdst,
3801 + aufs_bindex_t bsrc, loff_t len, unsigned int flags,
3802 + struct dentry *dst_parent)
3805 + aufs_bindex_t old_ibstart;
3806 + unsigned char isdir, plink;
3807 + struct au_dtime dt;
3808 + struct path h_path;
3809 + struct dentry *h_src, *h_dst, *h_parent;
3810 + struct inode *dst_inode, *h_dir, *inode;
3811 + struct super_block *sb;
3813 + AuDebugOn(bsrc <= bdst);
3815 + sb = dentry->d_sb;
3816 + h_path.mnt = au_sbr_mnt(sb, bdst);
3817 + h_dst = au_h_dptr(dentry, bdst);
3818 + h_parent = h_dst->d_parent; /* dir inode is locked */
3819 + h_dir = h_parent->d_inode;
3822 + h_src = au_h_dptr(dentry, bsrc);
3823 + inode = dentry->d_inode;
3826 + dst_parent = dget_parent(dentry);
3830 + plink = !!au_opt_test(au_mntflags(sb), PLINK);
3831 + dst_inode = au_h_iptr(inode, bdst);
3833 + if (unlikely(!plink)) {
3835 + AuIOErr("hi%lu(i%lu) exists on b%d "
3836 + "but plink is disabled\n",
3837 + dst_inode->i_ino, inode->i_ino, bdst);
3841 + if (dst_inode->i_nlink) {
3842 + const int do_dt = au_ftest_cpup(flags, DTIME);
3844 + h_src = au_plink_lkup(inode, bdst);
3845 + err = PTR_ERR(h_src);
3846 + if (IS_ERR(h_src))
3848 + if (unlikely(!h_src->d_inode)) {
3850 + AuIOErr("i%lu exists on a upper branch "
3851 + "but not pseudo-linked\n",
3858 + h_path.dentry = h_parent;
3859 + au_dtime_store(&dt, dst_parent, &h_path);
3861 + h_path.dentry = h_dst;
3862 + err = vfsub_link(h_src, h_dir, &h_path);
3864 + au_dtime_revert(&dt);
3868 + /* todo: cpup_wh_file? */
3870 + au_update_ibrange(inode, /*do_put_zero*/1);
3873 + old_ibstart = au_ibstart(inode);
3874 + err = cpup_entry(dentry, bdst, bsrc, len, flags, dst_parent);
3875 + if (unlikely(err))
3877 + dst_inode = h_dst->d_inode;
3878 + mutex_lock_nested(&dst_inode->i_mutex, AuLsc_I_CHILD2);
3880 + err = cpup_iattr(dentry, bdst, h_src);
3881 + isdir = S_ISDIR(dst_inode->i_mode);
3883 + if (bdst < old_ibstart) {
3884 + if (S_ISREG(inode->i_mode)) {
3885 + err = au_dy_iaop(inode, bdst, dst_inode);
3886 + if (unlikely(err))
3889 + au_set_ibstart(inode, bdst);
3891 + au_set_h_iptr(inode, bdst, au_igrab(dst_inode),
3892 + au_hi_flags(inode, isdir));
3893 + mutex_unlock(&dst_inode->i_mutex);
3895 + && h_src->d_inode->i_nlink > 1
3897 + au_plink_append(inode, bdst, h_dst);
3898 + goto out; /* success */
3903 + h_path.dentry = h_parent;
3904 + mutex_unlock(&dst_inode->i_mutex);
3905 + au_dtime_store(&dt, dst_parent, &h_path);
3906 + h_path.dentry = h_dst;
3908 + rerr = vfsub_unlink(h_dir, &h_path, /*force*/0);
3910 + rerr = vfsub_rmdir(h_dir, &h_path);
3911 + au_dtime_revert(&dt);
3913 + AuIOErr("failed removing broken entry(%d, %d)\n", err, rerr);
3922 +struct au_cpup_single_args {
3924 + struct dentry *dentry;
3925 + aufs_bindex_t bdst, bsrc;
3927 + unsigned int flags;
3928 + struct dentry *dst_parent;
3931 +static void au_call_cpup_single(void *args)
3933 + struct au_cpup_single_args *a = args;
3934 + *a->errp = au_cpup_single(a->dentry, a->bdst, a->bsrc, a->len,
3935 + a->flags, a->dst_parent);
3939 + * prevent SIGXFSZ in copy-up.
3940 + * testing CAP_MKNOD is for generic fs,
3941 + * but CAP_FSETID is for xfs only, currently.
3943 +static int au_cpup_sio_test(struct super_block *sb, umode_t mode)
3948 + if (!au_wkq_test()
3949 + && (!au_sbi(sb)->si_plink_maint_pid
3950 + || au_plink_maint(sb, AuLock_NOPLM))) {
3951 + switch (mode & S_IFMT) {
3953 + /* no condition about RLIMIT_FSIZE and the file size */
3958 + do_sio = !capable(CAP_MKNOD);
3962 + do_sio = ((mode & (S_ISUID | S_ISGID))
3963 + && !capable(CAP_FSETID));
3969 +int au_sio_cpup_single(struct dentry *dentry, aufs_bindex_t bdst,
3970 + aufs_bindex_t bsrc, loff_t len, unsigned int flags,
3971 + struct dentry *dst_parent)
3974 + struct dentry *h_dentry;
3976 + h_dentry = au_h_dptr(dentry, bsrc);
3977 + if (!au_cpup_sio_test(dentry->d_sb, h_dentry->d_inode->i_mode))
3978 + err = au_cpup_single(dentry, bdst, bsrc, len, flags,
3981 + struct au_cpup_single_args args = {
3988 + .dst_parent = dst_parent
3990 + wkq_err = au_wkq_wait(au_call_cpup_single, &args);
3991 + if (unlikely(wkq_err))
3999 + * copyup the @dentry from the first active lower branch to @bdst,
4000 + * using au_cpup_single().
4002 +static int au_cpup_simple(struct dentry *dentry, aufs_bindex_t bdst, loff_t len,
4003 + unsigned int flags)
4006 + aufs_bindex_t bsrc, bend;
4008 + bend = au_dbend(dentry);
4009 + for (bsrc = bdst + 1; bsrc <= bend; bsrc++)
4010 + if (au_h_dptr(dentry, bsrc))
4013 + err = au_lkup_neg(dentry, bdst);
4015 + err = au_cpup_single(dentry, bdst, bsrc, len, flags, NULL);
4017 + return 0; /* success */
4020 + au_set_h_dptr(dentry, bdst, NULL);
4021 + au_set_dbstart(dentry, bsrc);
4027 +struct au_cpup_simple_args {
4029 + struct dentry *dentry;
4030 + aufs_bindex_t bdst;
4032 + unsigned int flags;
4035 +static void au_call_cpup_simple(void *args)
4037 + struct au_cpup_simple_args *a = args;
4038 + *a->errp = au_cpup_simple(a->dentry, a->bdst, a->len, a->flags);
4041 +int au_sio_cpup_simple(struct dentry *dentry, aufs_bindex_t bdst, loff_t len,
4042 + unsigned int flags)
4045 + struct dentry *parent;
4046 + struct inode *h_dir;
4048 + parent = dget_parent(dentry);
4049 + h_dir = au_h_iptr(parent->d_inode, bdst);
4050 + if (!au_test_h_perm_sio(h_dir, MAY_EXEC | MAY_WRITE)
4051 + && !au_cpup_sio_test(dentry->d_sb, dentry->d_inode->i_mode))
4052 + err = au_cpup_simple(dentry, bdst, len, flags);
4054 + struct au_cpup_simple_args args = {
4061 + wkq_err = au_wkq_wait(au_call_cpup_simple, &args);
4062 + if (unlikely(wkq_err))
4070 +/* ---------------------------------------------------------------------- */
4073 + * copyup the deleted file for writing.
4075 +static int au_do_cpup_wh(struct dentry *dentry, aufs_bindex_t bdst,
4076 + struct dentry *wh_dentry, struct file *file,
4080 + aufs_bindex_t bstart;
4081 + struct au_dinfo *dinfo;
4082 + struct dentry *h_d_dst, *h_d_start;
4083 + struct au_hdentry *hdp;
4085 + dinfo = au_di(dentry);
4086 + AuRwMustWriteLock(&dinfo->di_rwsem);
4088 + bstart = dinfo->di_bstart;
4089 + hdp = dinfo->di_hdentry;
4090 + h_d_dst = hdp[0 + bdst].hd_dentry;
4091 + dinfo->di_bstart = bdst;
4092 + hdp[0 + bdst].hd_dentry = wh_dentry;
4094 + h_d_start = hdp[0 + bstart].hd_dentry;
4095 + hdp[0 + bstart].hd_dentry = au_hf_top(file)->f_dentry;
4097 + err = au_cpup_single(dentry, bdst, bstart, len, !AuCpup_DTIME,
4098 + /*h_parent*/NULL);
4101 + err = au_reopen_nondir(file);
4102 + hdp[0 + bstart].hd_dentry = h_d_start;
4104 + hdp[0 + bdst].hd_dentry = h_d_dst;
4105 + dinfo->di_bstart = bstart;
4110 +static int au_cpup_wh(struct dentry *dentry, aufs_bindex_t bdst, loff_t len,
4111 + struct file *file)
4114 + struct au_dtime dt;
4115 + struct dentry *parent, *h_parent, *wh_dentry;
4116 + struct au_branch *br;
4117 + struct path h_path;
4119 + br = au_sbr(dentry->d_sb, bdst);
4120 + parent = dget_parent(dentry);
4121 + h_parent = au_h_dptr(parent, bdst);
4122 + wh_dentry = au_whtmp_lkup(h_parent, br, &dentry->d_name);
4123 + err = PTR_ERR(wh_dentry);
4124 + if (IS_ERR(wh_dentry))
4127 + h_path.dentry = h_parent;
4128 + h_path.mnt = br->br_mnt;
4129 + au_dtime_store(&dt, parent, &h_path);
4130 + err = au_do_cpup_wh(dentry, bdst, wh_dentry, file, len);
4131 + if (unlikely(err))
4135 + h_path.dentry = wh_dentry;
4136 + if (!S_ISDIR(wh_dentry->d_inode->i_mode))
4137 + err = vfsub_unlink(h_parent->d_inode, &h_path, /*force*/0);
4139 + err = vfsub_rmdir(h_parent->d_inode, &h_path);
4140 + if (unlikely(err)) {
4141 + AuIOErr("failed remove copied-up tmp file %.*s(%d)\n",
4142 + AuDLNPair(wh_dentry), err);
4145 + au_dtime_revert(&dt);
4146 + au_set_hi_wh(dentry->d_inode, bdst, wh_dentry);
4155 +struct au_cpup_wh_args {
4157 + struct dentry *dentry;
4158 + aufs_bindex_t bdst;
4160 + struct file *file;
4163 +static void au_call_cpup_wh(void *args)
4165 + struct au_cpup_wh_args *a = args;
4166 + *a->errp = au_cpup_wh(a->dentry, a->bdst, a->len, a->file);
4169 +int au_sio_cpup_wh(struct dentry *dentry, aufs_bindex_t bdst, loff_t len,
4170 + struct file *file)
4173 + struct dentry *parent, *h_orph, *h_parent, *h_dentry;
4174 + struct inode *dir, *h_dir, *h_tmpdir, *h_inode;
4175 + struct au_wbr *wbr;
4177 + parent = dget_parent(dentry);
4178 + dir = parent->d_inode;
4181 + h_dir = au_igrab(au_h_iptr(dir, bdst));
4183 + if (!h_dir->i_nlink) {
4184 + wbr = au_sbr(dentry->d_sb, bdst)->br_wbr;
4185 + h_orph = wbr->wbr_orph;
4187 + h_parent = dget(au_h_dptr(parent, bdst));
4188 + au_set_h_dptr(parent, bdst, dget(h_orph));
4189 + h_tmpdir = h_orph->d_inode;
4190 + au_set_h_iptr(dir, bdst, au_igrab(h_tmpdir), /*flags*/0);
4192 + /* this temporary unlock is safe */
4194 + h_dentry = au_hf_top(file)->f_dentry;
4196 + h_dentry = au_h_dptr(dentry, au_dbstart(dentry));
4197 + h_inode = h_dentry->d_inode;
4198 + IMustLock(h_inode);
4199 + mutex_unlock(&h_inode->i_mutex);
4200 + mutex_lock_nested(&h_tmpdir->i_mutex, AuLsc_I_PARENT3);
4201 + mutex_lock_nested(&h_inode->i_mutex, AuLsc_I_CHILD);
4202 + /* todo: au_h_open_pre()? */
4205 + if (!au_test_h_perm_sio(h_tmpdir, MAY_EXEC | MAY_WRITE)
4206 + && !au_cpup_sio_test(dentry->d_sb, dentry->d_inode->i_mode))
4207 + err = au_cpup_wh(dentry, bdst, len, file);
4209 + struct au_cpup_wh_args args = {
4216 + wkq_err = au_wkq_wait(au_call_cpup_wh, &args);
4217 + if (unlikely(wkq_err))
4222 + mutex_unlock(&h_tmpdir->i_mutex);
4223 + /* todo: au_h_open_post()? */
4224 + au_set_h_iptr(dir, bdst, au_igrab(h_dir), /*flags*/0);
4225 + au_set_h_dptr(parent, bdst, h_parent);
4233 +/* ---------------------------------------------------------------------- */
4236 + * generic routine for both of copy-up and copy-down.
4238 +/* cf. revalidate function in file.c */
4239 +int au_cp_dirs(struct dentry *dentry, aufs_bindex_t bdst,
4240 + int (*cp)(struct dentry *dentry, aufs_bindex_t bdst,
4241 + struct dentry *h_parent, void *arg),
4245 + struct au_pin pin;
4246 + struct dentry *d, *parent, *h_parent, *real_parent;
4249 + parent = dget_parent(dentry);
4250 + if (IS_ROOT(parent))
4253 + au_pin_init(&pin, dentry, bdst, AuLsc_DI_PARENT2, AuLsc_I_PARENT2,
4254 + au_opt_udba(dentry->d_sb), AuPin_MNT_WRITE);
4256 + /* do not use au_dpage */
4257 + real_parent = parent;
4260 + parent = dget_parent(dentry);
4261 + h_parent = au_h_dptr(parent, bdst);
4263 + goto out; /* success */
4265 + /* find top dir which is necessary to cpup */
4269 + parent = dget_parent(d);
4270 + di_read_lock_parent3(parent, !AuLock_IR);
4271 + h_parent = au_h_dptr(parent, bdst);
4272 + di_read_unlock(parent, !AuLock_IR);
4273 + } while (!h_parent);
4275 + if (d != real_parent)
4276 + di_write_lock_child3(d);
4278 + /* somebody else might create while we were sleeping */
4279 + if (!au_h_dptr(d, bdst) || !au_h_dptr(d, bdst)->d_inode) {
4280 + if (au_h_dptr(d, bdst))
4281 + au_update_dbstart(d);
4283 + au_pin_set_dentry(&pin, d);
4284 + err = au_do_pin(&pin);
4286 + err = cp(d, bdst, h_parent, arg);
4291 + if (d != real_parent)
4292 + di_write_unlock(d);
4293 + if (unlikely(err))
4302 +static int au_cpup_dir(struct dentry *dentry, aufs_bindex_t bdst,
4303 + struct dentry *h_parent __maybe_unused ,
4304 + void *arg __maybe_unused)
4306 + return au_sio_cpup_simple(dentry, bdst, -1, AuCpup_DTIME);
4309 +int au_cpup_dirs(struct dentry *dentry, aufs_bindex_t bdst)
4311 + return au_cp_dirs(dentry, bdst, au_cpup_dir, NULL);
4314 +int au_test_and_cpup_dirs(struct dentry *dentry, aufs_bindex_t bdst)
4317 + struct dentry *parent;
4318 + struct inode *dir;
4320 + parent = dget_parent(dentry);
4321 + dir = parent->d_inode;
4323 + if (au_h_iptr(dir, bdst))
4326 + di_read_unlock(parent, AuLock_IR);
4327 + di_write_lock_parent(parent);
4328 + /* someone else might change our inode while we were sleeping */
4329 + if (!au_h_iptr(dir, bdst))
4330 + err = au_cpup_dirs(dentry, bdst);
4331 + di_downgrade_lock(parent, AuLock_IR);
4337 diff -urN /usr/share/empty/fs/aufs/cpup.h linux/fs/aufs/cpup.h
4338 --- /usr/share/empty/fs/aufs/cpup.h 1970-01-01 01:00:00.000000000 +0100
4339 +++ linux/fs/aufs/cpup.h 2012-02-13 21:54:56.966438287 +0100
4342 + * Copyright (C) 2005-2012 Junjiro R. Okajima
4344 + * This program, aufs is free software; you can redistribute it and/or modify
4345 + * it under the terms of the GNU General Public License as published by
4346 + * the Free Software Foundation; either version 2 of the License, or
4347 + * (at your option) any later version.
4349 + * This program is distributed in the hope that it will be useful,
4350 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
4351 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
4352 + * GNU General Public License for more details.
4354 + * You should have received a copy of the GNU General Public License
4355 + * along with this program; if not, write to the Free Software
4356 + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
4360 + * copy-up/down functions
4363 +#ifndef __AUFS_CPUP_H__
4364 +#define __AUFS_CPUP_H__
4368 +#include <linux/path.h>
4373 +void au_cpup_attr_flags(struct inode *dst, struct inode *src);
4374 +void au_cpup_attr_timesizes(struct inode *inode);
4375 +void au_cpup_attr_nlink(struct inode *inode, int force);
4376 +void au_cpup_attr_changeable(struct inode *inode);
4377 +void au_cpup_igen(struct inode *inode, struct inode *h_inode);
4378 +void au_cpup_attr_all(struct inode *inode, int force);
4380 +/* ---------------------------------------------------------------------- */
4383 +#define AuCpup_DTIME 1 /* do dtime_store/revert */
4384 +#define AuCpup_KEEPLINO (1 << 1) /* do not clear the lower xino,
4386 +#define au_ftest_cpup(flags, name) ((flags) & AuCpup_##name)
4387 +#define au_fset_cpup(flags, name) \
4388 + do { (flags) |= AuCpup_##name; } while (0)
4389 +#define au_fclr_cpup(flags, name) \
4390 + do { (flags) &= ~AuCpup_##name; } while (0)
4392 +int au_copy_file(struct file *dst, struct file *src, loff_t len);
4393 +int au_sio_cpup_single(struct dentry *dentry, aufs_bindex_t bdst,
4394 + aufs_bindex_t bsrc, loff_t len, unsigned int flags,
4395 + struct dentry *dst_parent);
4396 +int au_sio_cpup_simple(struct dentry *dentry, aufs_bindex_t bdst, loff_t len,
4397 + unsigned int flags);
4398 +int au_sio_cpup_wh(struct dentry *dentry, aufs_bindex_t bdst, loff_t len,
4399 + struct file *file);
4401 +int au_cp_dirs(struct dentry *dentry, aufs_bindex_t bdst,
4402 + int (*cp)(struct dentry *dentry, aufs_bindex_t bdst,
4403 + struct dentry *h_parent, void *arg),
4405 +int au_cpup_dirs(struct dentry *dentry, aufs_bindex_t bdst);
4406 +int au_test_and_cpup_dirs(struct dentry *dentry, aufs_bindex_t bdst);
4408 +/* ---------------------------------------------------------------------- */
4410 +/* keep timestamps when copyup */
4412 + struct dentry *dt_dentry;
4413 + struct path dt_h_path;
4414 + struct timespec dt_atime, dt_mtime;
4416 +void au_dtime_store(struct au_dtime *dt, struct dentry *dentry,
4417 + struct path *h_path);
4418 +void au_dtime_revert(struct au_dtime *dt);
4420 +#endif /* __KERNEL__ */
4421 +#endif /* __AUFS_CPUP_H__ */
4422 diff -urN /usr/share/empty/fs/aufs/dbgaufs.c linux/fs/aufs/dbgaufs.c
4423 --- /usr/share/empty/fs/aufs/dbgaufs.c 1970-01-01 01:00:00.000000000 +0100
4424 +++ linux/fs/aufs/dbgaufs.c 2012-02-13 21:54:56.966438287 +0100
4427 + * Copyright (C) 2005-2012 Junjiro R. Okajima
4429 + * This program, aufs is free software; you can redistribute it and/or modify
4430 + * it under the terms of the GNU General Public License as published by
4431 + * the Free Software Foundation; either version 2 of the License, or
4432 + * (at your option) any later version.
4434 + * This program is distributed in the hope that it will be useful,
4435 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
4436 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
4437 + * GNU General Public License for more details.
4439 + * You should have received a copy of the GNU General Public License
4440 + * along with this program; if not, write to the Free Software
4441 + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
4445 + * debugfs interface
4448 +#include <linux/debugfs.h>
4451 +#ifndef CONFIG_SYSFS
4452 +#error DEBUG_FS depends upon SYSFS
4455 +static struct dentry *dbgaufs;
4456 +static const mode_t dbgaufs_mode = S_IRUSR | S_IRGRP | S_IROTH;
4458 +/* 20 is max digits length of ulong 64 */
4459 +struct dbgaufs_arg {
4465 + * common function for all XINO files
4467 +static int dbgaufs_xi_release(struct inode *inode __maybe_unused,
4468 + struct file *file)
4470 + kfree(file->private_data);
4474 +static int dbgaufs_xi_open(struct file *xf, struct file *file, int do_fcnt)
4478 + struct dbgaufs_arg *p;
4481 + p = kmalloc(sizeof(*p), GFP_NOFS);
4487 + file->private_data = p;
4491 + err = vfs_getattr(xf->f_vfsmnt, xf->f_dentry, &st);
4495 + (p->a, sizeof(p->a), "%ld, %llux%lu %lld\n",
4496 + (long)file_count(xf), st.blocks, st.blksize,
4497 + (long long)st.size);
4499 + p->n = snprintf(p->a, sizeof(p->a), "%llux%lu %lld\n",
4500 + st.blocks, st.blksize,
4501 + (long long)st.size);
4502 + AuDebugOn(p->n >= sizeof(p->a));
4504 + p->n = snprintf(p->a, sizeof(p->a), "err %d\n", err);
4513 +static ssize_t dbgaufs_xi_read(struct file *file, char __user *buf,
4514 + size_t count, loff_t *ppos)
4516 + struct dbgaufs_arg *p;
4518 + p = file->private_data;
4519 + return simple_read_from_buffer(buf, count, ppos, p->a, p->n);
4522 +/* ---------------------------------------------------------------------- */
4524 +static int dbgaufs_xib_open(struct inode *inode, struct file *file)
4527 + struct au_sbinfo *sbinfo;
4528 + struct super_block *sb;
4530 + sbinfo = inode->i_private;
4531 + sb = sbinfo->si_sb;
4532 + si_noflush_read_lock(sb);
4533 + err = dbgaufs_xi_open(sbinfo->si_xib, file, /*do_fcnt*/0);
4534 + si_read_unlock(sb);
4538 +static const struct file_operations dbgaufs_xib_fop = {
4539 + .owner = THIS_MODULE,
4540 + .open = dbgaufs_xib_open,
4541 + .release = dbgaufs_xi_release,
4542 + .read = dbgaufs_xi_read
4545 +/* ---------------------------------------------------------------------- */
4547 +#define DbgaufsXi_PREFIX "xi"
4549 +static int dbgaufs_xino_open(struct inode *inode, struct file *file)
4553 + struct au_sbinfo *sbinfo;
4554 + struct super_block *sb;
4556 + struct qstr *name;
4560 + name = &file->f_dentry->d_name;
4561 + if (unlikely(name->len < sizeof(DbgaufsXi_PREFIX)
4562 + || memcmp(name->name, DbgaufsXi_PREFIX,
4563 + sizeof(DbgaufsXi_PREFIX) - 1)))
4565 + err = kstrtol(name->name + sizeof(DbgaufsXi_PREFIX) - 1, 10, &l);
4566 + if (unlikely(err))
4569 + sbinfo = inode->i_private;
4570 + sb = sbinfo->si_sb;
4571 + si_noflush_read_lock(sb);
4572 + if (l <= au_sbend(sb)) {
4573 + xf = au_sbr(sb, (aufs_bindex_t)l)->br_xino.xi_file;
4574 + err = dbgaufs_xi_open(xf, file, /*do_fcnt*/1);
4577 + si_read_unlock(sb);
4583 +static const struct file_operations dbgaufs_xino_fop = {
4584 + .owner = THIS_MODULE,
4585 + .open = dbgaufs_xino_open,
4586 + .release = dbgaufs_xi_release,
4587 + .read = dbgaufs_xi_read
4590 +void dbgaufs_brs_del(struct super_block *sb, aufs_bindex_t bindex)
4592 + aufs_bindex_t bend;
4593 + struct au_branch *br;
4594 + struct au_xino_file *xi;
4596 + if (!au_sbi(sb)->si_dbgaufs)
4599 + bend = au_sbend(sb);
4600 + for (; bindex <= bend; bindex++) {
4601 + br = au_sbr(sb, bindex);
4602 + xi = &br->br_xino;
4603 + if (xi->xi_dbgaufs) {
4604 + debugfs_remove(xi->xi_dbgaufs);
4605 + xi->xi_dbgaufs = NULL;
4610 +void dbgaufs_brs_add(struct super_block *sb, aufs_bindex_t bindex)
4612 + struct au_sbinfo *sbinfo;
4613 + struct dentry *parent;
4614 + struct au_branch *br;
4615 + struct au_xino_file *xi;
4616 + aufs_bindex_t bend;
4617 + char name[sizeof(DbgaufsXi_PREFIX) + 5]; /* "xi" bindex NULL */
4619 + sbinfo = au_sbi(sb);
4620 + parent = sbinfo->si_dbgaufs;
4624 + bend = au_sbend(sb);
4625 + for (; bindex <= bend; bindex++) {
4626 + snprintf(name, sizeof(name), DbgaufsXi_PREFIX "%d", bindex);
4627 + br = au_sbr(sb, bindex);
4628 + xi = &br->br_xino;
4629 + AuDebugOn(xi->xi_dbgaufs);
4630 + xi->xi_dbgaufs = debugfs_create_file(name, dbgaufs_mode, parent,
4631 + sbinfo, &dbgaufs_xino_fop);
4632 + /* ignore an error */
4633 + if (unlikely(!xi->xi_dbgaufs))
4634 + AuWarn1("failed %s under debugfs\n", name);
4638 +/* ---------------------------------------------------------------------- */
4640 +#ifdef CONFIG_AUFS_EXPORT
4641 +static int dbgaufs_xigen_open(struct inode *inode, struct file *file)
4644 + struct au_sbinfo *sbinfo;
4645 + struct super_block *sb;
4647 + sbinfo = inode->i_private;
4648 + sb = sbinfo->si_sb;
4649 + si_noflush_read_lock(sb);
4650 + err = dbgaufs_xi_open(sbinfo->si_xigen, file, /*do_fcnt*/0);
4651 + si_read_unlock(sb);
4655 +static const struct file_operations dbgaufs_xigen_fop = {
4656 + .owner = THIS_MODULE,
4657 + .open = dbgaufs_xigen_open,
4658 + .release = dbgaufs_xi_release,
4659 + .read = dbgaufs_xi_read
4662 +static int dbgaufs_xigen_init(struct au_sbinfo *sbinfo)
4667 + * This function is a dynamic '__init' fucntion actually,
4668 + * so the tiny check for si_rwsem is unnecessary.
4670 + /* AuRwMustWriteLock(&sbinfo->si_rwsem); */
4673 + sbinfo->si_dbgaufs_xigen = debugfs_create_file
4674 + ("xigen", dbgaufs_mode, sbinfo->si_dbgaufs, sbinfo,
4675 + &dbgaufs_xigen_fop);
4676 + if (sbinfo->si_dbgaufs_xigen)
4682 +static int dbgaufs_xigen_init(struct au_sbinfo *sbinfo)
4686 +#endif /* CONFIG_AUFS_EXPORT */
4688 +/* ---------------------------------------------------------------------- */
4690 +void dbgaufs_si_fin(struct au_sbinfo *sbinfo)
4693 + * This function is a dynamic '__init' fucntion actually,
4694 + * so the tiny check for si_rwsem is unnecessary.
4696 + /* AuRwMustWriteLock(&sbinfo->si_rwsem); */
4698 + debugfs_remove_recursive(sbinfo->si_dbgaufs);
4699 + sbinfo->si_dbgaufs = NULL;
4700 + kobject_put(&sbinfo->si_kobj);
4703 +int dbgaufs_si_init(struct au_sbinfo *sbinfo)
4706 + char name[SysaufsSiNameLen];
4709 + * This function is a dynamic '__init' fucntion actually,
4710 + * so the tiny check for si_rwsem is unnecessary.
4712 + /* AuRwMustWriteLock(&sbinfo->si_rwsem); */
4716 + AuErr1("/debug/aufs is uninitialized\n");
4721 + sysaufs_name(sbinfo, name);
4722 + sbinfo->si_dbgaufs = debugfs_create_dir(name, dbgaufs);
4723 + if (unlikely(!sbinfo->si_dbgaufs))
4725 + kobject_get(&sbinfo->si_kobj);
4727 + sbinfo->si_dbgaufs_xib = debugfs_create_file
4728 + ("xib", dbgaufs_mode, sbinfo->si_dbgaufs, sbinfo,
4729 + &dbgaufs_xib_fop);
4730 + if (unlikely(!sbinfo->si_dbgaufs_xib))
4733 + err = dbgaufs_xigen_init(sbinfo);
4735 + goto out; /* success */
4738 + dbgaufs_si_fin(sbinfo);
4743 +/* ---------------------------------------------------------------------- */
4745 +void dbgaufs_fin(void)
4747 + debugfs_remove(dbgaufs);
4750 +int __init dbgaufs_init(void)
4755 + dbgaufs = debugfs_create_dir(AUFS_NAME, NULL);
4760 diff -urN /usr/share/empty/fs/aufs/dbgaufs.h linux/fs/aufs/dbgaufs.h
4761 --- /usr/share/empty/fs/aufs/dbgaufs.h 1970-01-01 01:00:00.000000000 +0100
4762 +++ linux/fs/aufs/dbgaufs.h 2012-02-13 21:54:56.966438287 +0100
4765 + * Copyright (C) 2005-2012 Junjiro R. Okajima
4767 + * This program, aufs is free software; you can redistribute it and/or modify
4768 + * it under the terms of the GNU General Public License as published by
4769 + * the Free Software Foundation; either version 2 of the License, or
4770 + * (at your option) any later version.
4772 + * This program is distributed in the hope that it will be useful,
4773 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
4774 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
4775 + * GNU General Public License for more details.
4777 + * You should have received a copy of the GNU General Public License
4778 + * along with this program; if not, write to the Free Software
4779 + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
4783 + * debugfs interface
4786 +#ifndef __DBGAUFS_H__
4787 +#define __DBGAUFS_H__
4791 +struct super_block;
4794 +#ifdef CONFIG_DEBUG_FS
4796 +void dbgaufs_brs_del(struct super_block *sb, aufs_bindex_t bindex);
4797 +void dbgaufs_brs_add(struct super_block *sb, aufs_bindex_t bindex);
4798 +void dbgaufs_si_fin(struct au_sbinfo *sbinfo);
4799 +int dbgaufs_si_init(struct au_sbinfo *sbinfo);
4800 +void dbgaufs_fin(void);
4801 +int __init dbgaufs_init(void);
4803 +AuStubVoid(dbgaufs_brs_del, struct super_block *sb, aufs_bindex_t bindex)
4804 +AuStubVoid(dbgaufs_brs_add, struct super_block *sb, aufs_bindex_t bindex)
4805 +AuStubVoid(dbgaufs_si_fin, struct au_sbinfo *sbinfo)
4806 +AuStubInt0(dbgaufs_si_init, struct au_sbinfo *sbinfo)
4807 +AuStubVoid(dbgaufs_fin, void)
4808 +AuStubInt0(__init dbgaufs_init, void)
4809 +#endif /* CONFIG_DEBUG_FS */
4811 +#endif /* __KERNEL__ */
4812 +#endif /* __DBGAUFS_H__ */
4813 diff -urN /usr/share/empty/fs/aufs/dcsub.c linux/fs/aufs/dcsub.c
4814 --- /usr/share/empty/fs/aufs/dcsub.c 1970-01-01 01:00:00.000000000 +0100
4815 +++ linux/fs/aufs/dcsub.c 2012-02-13 21:54:56.966438287 +0100
4818 + * Copyright (C) 2005-2012 Junjiro R. Okajima
4820 + * This program, aufs is free software; you can redistribute it and/or modify
4821 + * it under the terms of the GNU General Public License as published by
4822 + * the Free Software Foundation; either version 2 of the License, or
4823 + * (at your option) any later version.
4825 + * This program is distributed in the hope that it will be useful,
4826 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
4827 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
4828 + * GNU General Public License for more details.
4830 + * You should have received a copy of the GNU General Public License
4831 + * along with this program; if not, write to the Free Software
4832 + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
4836 + * sub-routines for dentry cache
4841 +static void au_dpage_free(struct au_dpage *dpage)
4844 + struct dentry **p;
4846 + p = dpage->dentries;
4847 + for (i = 0; i < dpage->ndentry; i++)
4849 + free_page((unsigned long)dpage->dentries);
4852 +int au_dpages_init(struct au_dcsub_pages *dpages, gfp_t gfp)
4858 + dpages->dpages = kmalloc(sizeof(*dpages->dpages), gfp);
4859 + if (unlikely(!dpages->dpages))
4862 + p = (void *)__get_free_page(gfp);
4866 + dpages->dpages[0].ndentry = 0;
4867 + dpages->dpages[0].dentries = p;
4868 + dpages->ndpage = 1;
4869 + return 0; /* success */
4872 + kfree(dpages->dpages);
4877 +void au_dpages_free(struct au_dcsub_pages *dpages)
4880 + struct au_dpage *p;
4882 + p = dpages->dpages;
4883 + for (i = 0; i < dpages->ndpage; i++)
4884 + au_dpage_free(p++);
4885 + kfree(dpages->dpages);
4888 +static int au_dpages_append(struct au_dcsub_pages *dpages,
4889 + struct dentry *dentry, gfp_t gfp)
4892 + struct au_dpage *dpage;
4895 + dpage = dpages->dpages + dpages->ndpage - 1;
4896 + sz = PAGE_SIZE / sizeof(dentry);
4897 + if (unlikely(dpage->ndentry >= sz)) {
4898 + AuLabel(new dpage);
4900 + sz = dpages->ndpage * sizeof(*dpages->dpages);
4901 + p = au_kzrealloc(dpages->dpages, sz,
4902 + sz + sizeof(*dpages->dpages), gfp);
4906 + dpages->dpages = p;
4907 + dpage = dpages->dpages + dpages->ndpage;
4908 + p = (void *)__get_free_page(gfp);
4912 + dpage->ndentry = 0;
4913 + dpage->dentries = p;
4917 + AuDebugOn(!dentry->d_count);
4918 + dpage->dentries[dpage->ndentry++] = dget_dlock(dentry);
4919 + return 0; /* success */
4925 +int au_dcsub_pages(struct au_dcsub_pages *dpages, struct dentry *root,
4926 + au_dpages_test test, void *arg)
4929 + struct dentry *this_parent;
4930 + struct list_head *next;
4931 + struct super_block *sb = root->d_sb;
4934 + write_seqlock(&rename_lock);
4935 + this_parent = root;
4936 + spin_lock(&this_parent->d_lock);
4938 + next = this_parent->d_subdirs.next;
4940 + if (this_parent->d_sb == sb
4941 + && !IS_ROOT(this_parent)
4942 + && au_di(this_parent)
4943 + && this_parent->d_count
4944 + && (!test || test(this_parent, arg))) {
4945 + err = au_dpages_append(dpages, this_parent, GFP_ATOMIC);
4946 + if (unlikely(err))
4950 + while (next != &this_parent->d_subdirs) {
4951 + struct list_head *tmp = next;
4952 + struct dentry *dentry = list_entry(tmp, struct dentry,
4956 + spin_lock_nested(&dentry->d_lock, DENTRY_D_LOCK_NESTED);
4957 + if (dentry->d_count) {
4958 + if (!list_empty(&dentry->d_subdirs)) {
4959 + spin_unlock(&this_parent->d_lock);
4960 + spin_release(&dentry->d_lock.dep_map, 1,
4962 + this_parent = dentry;
4963 + spin_acquire(&this_parent->d_lock.dep_map, 0, 1,
4967 + if (dentry->d_sb == sb
4969 + && (!test || test(dentry, arg)))
4970 + err = au_dpages_append(dpages, dentry,
4973 + spin_unlock(&dentry->d_lock);
4974 + if (unlikely(err))
4978 + if (this_parent != root) {
4979 + struct dentry *tmp;
4980 + struct dentry *child;
4982 + tmp = this_parent->d_parent;
4984 + spin_unlock(&this_parent->d_lock);
4985 + child = this_parent;
4986 + this_parent = tmp;
4987 + spin_lock(&this_parent->d_lock);
4988 + rcu_read_unlock();
4989 + next = child->d_u.d_child.next;
4994 + spin_unlock(&this_parent->d_lock);
4995 + write_sequnlock(&rename_lock);
4999 +int au_dcsub_pages_rev(struct au_dcsub_pages *dpages, struct dentry *dentry,
5000 + int do_include, au_dpages_test test, void *arg)
5005 + write_seqlock(&rename_lock);
5006 + spin_lock(&dentry->d_lock);
5008 + && dentry->d_count
5009 + && (!test || test(dentry, arg)))
5010 + err = au_dpages_append(dpages, dentry, GFP_ATOMIC);
5011 + spin_unlock(&dentry->d_lock);
5012 + if (unlikely(err))
5016 + * vfsmount_lock is unnecessary since this is a traverse in a single
5019 + while (!IS_ROOT(dentry)) {
5020 + dentry = dentry->d_parent; /* rename_lock is locked */
5021 + spin_lock(&dentry->d_lock);
5022 + if (dentry->d_count
5023 + && (!test || test(dentry, arg)))
5024 + err = au_dpages_append(dpages, dentry, GFP_ATOMIC);
5025 + spin_unlock(&dentry->d_lock);
5026 + if (unlikely(err))
5031 + write_sequnlock(&rename_lock);
5035 +static inline int au_dcsub_dpages_aufs(struct dentry *dentry, void *arg)
5037 + return au_di(dentry) && dentry->d_sb == arg;
5040 +int au_dcsub_pages_rev_aufs(struct au_dcsub_pages *dpages,
5041 + struct dentry *dentry, int do_include)
5043 + return au_dcsub_pages_rev(dpages, dentry, do_include,
5044 + au_dcsub_dpages_aufs, dentry->d_sb);
5047 +int au_test_subdir(struct dentry *d1, struct dentry *d2)
5049 + struct path path[2] = {
5058 + return path_is_under(path + 0, path + 1);
5060 diff -urN /usr/share/empty/fs/aufs/dcsub.h linux/fs/aufs/dcsub.h
5061 --- /usr/share/empty/fs/aufs/dcsub.h 1970-01-01 01:00:00.000000000 +0100
5062 +++ linux/fs/aufs/dcsub.h 2012-02-13 21:54:56.966438287 +0100
5065 + * Copyright (C) 2005-2012 Junjiro R. Okajima
5067 + * This program, aufs is free software; you can redistribute it and/or modify
5068 + * it under the terms of the GNU General Public License as published by
5069 + * the Free Software Foundation; either version 2 of the License, or
5070 + * (at your option) any later version.
5072 + * This program is distributed in the hope that it will be useful,
5073 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
5074 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
5075 + * GNU General Public License for more details.
5077 + * You should have received a copy of the GNU General Public License
5078 + * along with this program; if not, write to the Free Software
5079 + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
5083 + * sub-routines for dentry cache
5086 +#ifndef __AUFS_DCSUB_H__
5087 +#define __AUFS_DCSUB_H__
5091 +#include <linux/dcache.h>
5092 +#include <linux/fs.h>
5098 + struct dentry **dentries;
5101 +struct au_dcsub_pages {
5103 + struct au_dpage *dpages;
5106 +/* ---------------------------------------------------------------------- */
5109 +int au_dpages_init(struct au_dcsub_pages *dpages, gfp_t gfp);
5110 +void au_dpages_free(struct au_dcsub_pages *dpages);
5111 +typedef int (*au_dpages_test)(struct dentry *dentry, void *arg);
5112 +int au_dcsub_pages(struct au_dcsub_pages *dpages, struct dentry *root,
5113 + au_dpages_test test, void *arg);
5114 +int au_dcsub_pages_rev(struct au_dcsub_pages *dpages, struct dentry *dentry,
5115 + int do_include, au_dpages_test test, void *arg);
5116 +int au_dcsub_pages_rev_aufs(struct au_dcsub_pages *dpages,
5117 + struct dentry *dentry, int do_include);
5118 +int au_test_subdir(struct dentry *d1, struct dentry *d2);
5120 +/* ---------------------------------------------------------------------- */
5122 +static inline int au_d_hashed_positive(struct dentry *d)
5125 + struct inode *inode = d->d_inode;
5127 + if (unlikely(d_unhashed(d) || !inode || !inode->i_nlink))
5132 +static inline int au_d_alive(struct dentry *d)
5135 + struct inode *inode;
5138 + err = au_d_hashed_positive(d);
5140 + inode = d->d_inode;
5141 + if (unlikely(d_unlinked(d) || !inode || !inode->i_nlink))
5147 +static inline int au_alive_dir(struct dentry *d)
5150 + err = au_d_alive(d);
5151 + if (unlikely(err || IS_DEADDIR(d->d_inode)))
5156 +#endif /* __KERNEL__ */
5157 +#endif /* __AUFS_DCSUB_H__ */
5158 diff -urN /usr/share/empty/fs/aufs/debug.c linux/fs/aufs/debug.c
5159 --- /usr/share/empty/fs/aufs/debug.c 1970-01-01 01:00:00.000000000 +0100
5160 +++ linux/fs/aufs/debug.c 2012-02-13 21:54:56.966438287 +0100
5163 + * Copyright (C) 2005-2012 Junjiro R. Okajima
5165 + * This program, aufs is free software; you can redistribute it and/or modify
5166 + * it under the terms of the GNU General Public License as published by
5167 + * the Free Software Foundation; either version 2 of the License, or
5168 + * (at your option) any later version.
5170 + * This program is distributed in the hope that it will be useful,
5171 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
5172 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
5173 + * GNU General Public License for more details.
5175 + * You should have received a copy of the GNU General Public License
5176 + * along with this program; if not, write to the Free Software
5177 + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
5181 + * debug print functions
5184 +#include <linux/vt_kern.h>
5188 +MODULE_PARM_DESC(debug, "debug print");
5189 +module_param_named(debug, aufs_debug, int, S_IRUGO | S_IWUSR | S_IWGRP);
5191 +char *au_plevel = KERN_DEBUG;
5192 +#define dpri(fmt, ...) do { \
5194 + && strcmp(au_plevel, KERN_DEBUG)) \
5195 + || au_debug_test()) \
5196 + printk("%s" fmt, au_plevel, ##__VA_ARGS__); \
5199 +/* ---------------------------------------------------------------------- */
5201 +void au_dpri_whlist(struct au_nhash *whlist)
5203 + unsigned long ul, n;
5204 + struct hlist_head *head;
5205 + struct au_vdir_wh *tpos;
5206 + struct hlist_node *pos;
5208 + n = whlist->nh_num;
5209 + head = whlist->nh_head;
5210 + for (ul = 0; ul < n; ul++) {
5211 + hlist_for_each_entry(tpos, pos, head, wh_hash)
5212 + dpri("b%d, %.*s, %d\n",
5214 + tpos->wh_str.len, tpos->wh_str.name,
5215 + tpos->wh_str.len);
5220 +void au_dpri_vdir(struct au_vdir *vdir)
5223 + union au_vdir_deblk_p p;
5226 + if (!vdir || IS_ERR(vdir)) {
5227 + dpri("err %ld\n", PTR_ERR(vdir));
5231 + dpri("deblk %u, nblk %lu, deblk %p, last{%lu, %p}, ver %lu\n",
5232 + vdir->vd_deblk_sz, vdir->vd_nblk, vdir->vd_deblk,
5233 + vdir->vd_last.ul, vdir->vd_last.p.deblk, vdir->vd_version);
5234 + for (ul = 0; ul < vdir->vd_nblk; ul++) {
5235 + p.deblk = vdir->vd_deblk[ul];
5237 + dpri("[%lu]: %p\n", ul, o);
5241 +static int do_pri_inode(aufs_bindex_t bindex, struct inode *inode, int hn,
5242 + struct dentry *wh)
5247 + if (!inode || IS_ERR(inode)) {
5248 + dpri("i%d: err %ld\n", bindex, PTR_ERR(inode));
5252 + /* the type of i_blocks depends upon CONFIG_LSF */
5253 + BUILD_BUG_ON(sizeof(inode->i_blocks) != sizeof(unsigned long)
5254 + && sizeof(inode->i_blocks) != sizeof(u64));
5256 + n = (void *)wh->d_name.name;
5257 + l = wh->d_name.len;
5260 + dpri("i%d: %p, i%lu, %s, cnt %d, nl %u, 0%o, sz %llu, blk %llu,"
5261 + " hn %d, ct %lld, np %lu, st 0x%lx, f 0x%x, v %llu, g %x%s%.*s\n",
5263 + inode->i_ino, inode->i_sb ? au_sbtype(inode->i_sb) : "??",
5264 + atomic_read(&inode->i_count), inode->i_nlink, inode->i_mode,
5265 + i_size_read(inode), (unsigned long long)inode->i_blocks,
5266 + hn, (long long)timespec_to_ns(&inode->i_ctime) & 0x0ffff,
5267 + inode->i_mapping ? inode->i_mapping->nrpages : 0,
5268 + inode->i_state, inode->i_flags, inode->i_version,
5269 + inode->i_generation,
5270 + l ? ", wh " : "", l, n);
5274 +void au_dpri_inode(struct inode *inode)
5276 + struct au_iinfo *iinfo;
5277 + aufs_bindex_t bindex;
5280 + err = do_pri_inode(-1, inode, -1, NULL);
5281 + if (err || !au_test_aufs(inode->i_sb))
5284 + iinfo = au_ii(inode);
5287 + dpri("i-1: bstart %d, bend %d, gen %d\n",
5288 + iinfo->ii_bstart, iinfo->ii_bend, au_iigen(inode));
5289 + if (iinfo->ii_bstart < 0)
5292 + for (bindex = iinfo->ii_bstart; bindex <= iinfo->ii_bend; bindex++) {
5293 + hn = !!au_hn(iinfo->ii_hinode + bindex);
5294 + do_pri_inode(bindex, iinfo->ii_hinode[0 + bindex].hi_inode, hn,
5295 + iinfo->ii_hinode[0 + bindex].hi_whdentry);
5299 +void au_dpri_dalias(struct inode *inode)
5303 + spin_lock(&inode->i_lock);
5304 + list_for_each_entry(d, &inode->i_dentry, d_alias)
5305 + au_dpri_dentry(d);
5306 + spin_unlock(&inode->i_lock);
5309 +static int do_pri_dentry(aufs_bindex_t bindex, struct dentry *dentry)
5311 + struct dentry *wh = NULL;
5314 + if (!dentry || IS_ERR(dentry)) {
5315 + dpri("d%d: err %ld\n", bindex, PTR_ERR(dentry));
5318 + /* do not call dget_parent() here */
5319 + /* note: access d_xxx without d_lock */
5320 + dpri("d%d: %.*s?/%.*s, %s, cnt %d, flags 0x%x\n",
5322 + AuDLNPair(dentry->d_parent), AuDLNPair(dentry),
5323 + dentry->d_sb ? au_sbtype(dentry->d_sb) : "??",
5324 + dentry->d_count, dentry->d_flags);
5326 + if (bindex >= 0 && dentry->d_inode && au_test_aufs(dentry->d_sb)) {
5327 + struct au_iinfo *iinfo = au_ii(dentry->d_inode);
5329 + hn = !!au_hn(iinfo->ii_hinode + bindex);
5330 + wh = iinfo->ii_hinode[0 + bindex].hi_whdentry;
5333 + do_pri_inode(bindex, dentry->d_inode, hn, wh);
5337 +void au_dpri_dentry(struct dentry *dentry)
5339 + struct au_dinfo *dinfo;
5340 + aufs_bindex_t bindex;
5342 + struct au_hdentry *hdp;
5344 + err = do_pri_dentry(-1, dentry);
5345 + if (err || !au_test_aufs(dentry->d_sb))
5348 + dinfo = au_di(dentry);
5351 + dpri("d-1: bstart %d, bend %d, bwh %d, bdiropq %d, gen %d\n",
5352 + dinfo->di_bstart, dinfo->di_bend,
5353 + dinfo->di_bwh, dinfo->di_bdiropq, au_digen(dentry));
5354 + if (dinfo->di_bstart < 0)
5356 + hdp = dinfo->di_hdentry;
5357 + for (bindex = dinfo->di_bstart; bindex <= dinfo->di_bend; bindex++)
5358 + do_pri_dentry(bindex, hdp[0 + bindex].hd_dentry);
5361 +static int do_pri_file(aufs_bindex_t bindex, struct file *file)
5365 + if (!file || IS_ERR(file)) {
5366 + dpri("f%d: err %ld\n", bindex, PTR_ERR(file));
5372 + && au_test_aufs(file->f_dentry->d_sb)
5374 + snprintf(a, sizeof(a), ", gen %d, mmapped %d",
5375 + au_figen(file), atomic_read(&au_fi(file)->fi_mmapped));
5376 + dpri("f%d: mode 0x%x, flags 0%o, cnt %ld, v %llu, pos %llu%s\n",
5377 + bindex, file->f_mode, file->f_flags, (long)file_count(file),
5378 + file->f_version, file->f_pos, a);
5379 + if (file->f_dentry)
5380 + do_pri_dentry(bindex, file->f_dentry);
5384 +void au_dpri_file(struct file *file)
5386 + struct au_finfo *finfo;
5387 + struct au_fidir *fidir;
5388 + struct au_hfile *hfile;
5389 + aufs_bindex_t bindex;
5392 + err = do_pri_file(-1, file);
5393 + if (err || !file->f_dentry || !au_test_aufs(file->f_dentry->d_sb))
5396 + finfo = au_fi(file);
5399 + if (finfo->fi_btop < 0)
5401 + fidir = finfo->fi_hdir;
5403 + do_pri_file(finfo->fi_btop, finfo->fi_htop.hf_file);
5405 + for (bindex = finfo->fi_btop;
5406 + bindex >= 0 && bindex <= fidir->fd_bbot;
5408 + hfile = fidir->fd_hfile + bindex;
5409 + do_pri_file(bindex, hfile ? hfile->hf_file : NULL);
5413 +static int do_pri_br(aufs_bindex_t bindex, struct au_branch *br)
5415 + struct vfsmount *mnt;
5416 + struct super_block *sb;
5418 + if (!br || IS_ERR(br))
5421 + if (!mnt || IS_ERR(mnt))
5424 + if (!sb || IS_ERR(sb))
5427 + dpri("s%d: {perm 0x%x, id %d, cnt %d, wbr %p}, "
5428 + "%s, dev 0x%02x%02x, flags 0x%lx, cnt %d, active %d, "
5430 + bindex, br->br_perm, br->br_id, atomic_read(&br->br_count),
5431 + br->br_wbr, au_sbtype(sb), MAJOR(sb->s_dev), MINOR(sb->s_dev),
5432 + sb->s_flags, sb->s_count,
5433 + atomic_read(&sb->s_active), !!br->br_xino.xi_file);
5437 + dpri("s%d: err %ld\n", bindex, PTR_ERR(br));
5441 +void au_dpri_sb(struct super_block *sb)
5443 + struct au_sbinfo *sbinfo;
5444 + aufs_bindex_t bindex;
5446 + /* to reuduce stack size */
5448 + struct vfsmount mnt;
5449 + struct au_branch fake;
5452 + /* this function can be called from magic sysrq */
5453 + a = kzalloc(sizeof(*a), GFP_ATOMIC);
5454 + if (unlikely(!a)) {
5455 + dpri("no memory\n");
5459 + a->mnt.mnt_sb = sb;
5460 + a->fake.br_perm = 0;
5461 + a->fake.br_mnt = &a->mnt;
5462 + a->fake.br_xino.xi_file = NULL;
5463 + atomic_set(&a->fake.br_count, 0);
5464 + smp_mb(); /* atomic_set */
5465 + err = do_pri_br(-1, &a->fake);
5467 + dpri("dev 0x%x\n", sb->s_dev);
5468 + if (err || !au_test_aufs(sb))
5471 + sbinfo = au_sbi(sb);
5474 + dpri("nw %d, gen %u, kobj %d\n",
5475 + atomic_read(&sbinfo->si_nowait.nw_len), sbinfo->si_generation,
5476 + atomic_read(&sbinfo->si_kobj.kref.refcount));
5477 + for (bindex = 0; bindex <= sbinfo->si_bend; bindex++)
5478 + do_pri_br(bindex, sbinfo->si_branch[0 + bindex]);
5481 +/* ---------------------------------------------------------------------- */
5483 +void au_dbg_sleep_jiffy(int jiffy)
5486 + jiffy = schedule_timeout_uninterruptible(jiffy);
5489 +void au_dbg_iattr(struct iattr *ia)
5491 +#define AuBit(name) if (ia->ia_valid & ATTR_ ## name) \
5511 + dpri("ia_file %p\n", ia->ia_file);
5514 +/* ---------------------------------------------------------------------- */
5516 +void __au_dbg_verify_dinode(struct dentry *dentry, const char *func, int line)
5518 + struct inode *h_inode, *inode = dentry->d_inode;
5519 + struct dentry *h_dentry;
5520 + aufs_bindex_t bindex, bend, bi;
5522 + if (!inode /* || au_di(dentry)->di_lsc == AuLsc_DI_TMP */)
5525 + bend = au_dbend(dentry);
5526 + bi = au_ibend(inode);
5529 + bindex = au_dbstart(dentry);
5530 + bi = au_ibstart(inode);
5534 + for (; bindex <= bend; bindex++) {
5535 + h_dentry = au_h_dptr(dentry, bindex);
5538 + h_inode = au_h_iptr(inode, bindex);
5539 + if (unlikely(h_inode != h_dentry->d_inode)) {
5540 + int old = au_debug_test();
5543 + AuDbg("b%d, %s:%d\n", bindex, func, line);
5544 + AuDbgDentry(dentry);
5545 + AuDbgInode(inode);
5553 +void au_dbg_verify_dir_parent(struct dentry *dentry, unsigned int sigen)
5555 + struct dentry *parent;
5557 + parent = dget_parent(dentry);
5558 + AuDebugOn(!S_ISDIR(dentry->d_inode->i_mode));
5559 + AuDebugOn(IS_ROOT(dentry));
5560 + AuDebugOn(au_digen_test(parent, sigen));
5564 +void au_dbg_verify_nondir_parent(struct dentry *dentry, unsigned int sigen)
5566 + struct dentry *parent;
5567 + struct inode *inode;
5569 + parent = dget_parent(dentry);
5570 + inode = dentry->d_inode;
5571 + AuDebugOn(inode && S_ISDIR(dentry->d_inode->i_mode));
5572 + AuDebugOn(au_digen_test(parent, sigen));
5576 +void au_dbg_verify_gen(struct dentry *parent, unsigned int sigen)
5579 + struct au_dcsub_pages dpages;
5580 + struct au_dpage *dpage;
5581 + struct dentry **dentries;
5583 + err = au_dpages_init(&dpages, GFP_NOFS);
5585 + err = au_dcsub_pages_rev_aufs(&dpages, parent, /*do_include*/1);
5587 + for (i = dpages.ndpage - 1; !err && i >= 0; i--) {
5588 + dpage = dpages.dpages + i;
5589 + dentries = dpage->dentries;
5590 + for (j = dpage->ndentry - 1; !err && j >= 0; j--)
5591 + AuDebugOn(au_digen_test(dentries[j], sigen));
5593 + au_dpages_free(&dpages);
5596 +void au_dbg_verify_kthread(void)
5598 + if (au_wkq_test()) {
5601 + * It may be recursive, but udba=notify between two aufs mounts,
5602 + * where a single ro branch is shared, is not a problem.
5608 +/* ---------------------------------------------------------------------- */
5610 +void au_debug_sbinfo_init(struct au_sbinfo *sbinfo __maybe_unused)
5612 +#ifdef AuForceNoPlink
5613 + au_opt_clr(sbinfo->si_mntflags, PLINK);
5615 +#ifdef AuForceNoXino
5616 + au_opt_clr(sbinfo->si_mntflags, XINO);
5618 +#ifdef AuForceNoRefrof
5619 + au_opt_clr(sbinfo->si_mntflags, REFROF);
5621 +#ifdef AuForceHnotify
5622 + au_opt_set_udba(sbinfo->si_mntflags, UDBA_HNOTIFY);
5625 + sbinfo->si_rdblk = 0;
5626 + sbinfo->si_rdhash = 0;
5630 +int __init au_debug_init(void)
5632 + aufs_bindex_t bindex;
5633 + struct au_vdir_destr destr;
5636 + AuDebugOn(bindex >= 0);
5639 + AuDebugOn(destr.len < NAME_MAX);
5641 +#ifdef CONFIG_4KSTACKS
5642 + pr_warning("CONFIG_4KSTACKS is defined.\n");
5645 +#ifdef AuForceNoBrs
5651 diff -urN /usr/share/empty/fs/aufs/debug.h linux/fs/aufs/debug.h
5652 --- /usr/share/empty/fs/aufs/debug.h 1970-01-01 01:00:00.000000000 +0100
5653 +++ linux/fs/aufs/debug.h 2012-02-13 21:54:56.966438287 +0100
5656 + * Copyright (C) 2005-2012 Junjiro R. Okajima
5658 + * This program, aufs is free software; you can redistribute it and/or modify
5659 + * it under the terms of the GNU General Public License as published by
5660 + * the Free Software Foundation; either version 2 of the License, or
5661 + * (at your option) any later version.
5663 + * This program is distributed in the hope that it will be useful,
5664 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
5665 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
5666 + * GNU General Public License for more details.
5668 + * You should have received a copy of the GNU General Public License
5669 + * along with this program; if not, write to the Free Software
5670 + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
5674 + * debug print functions
5677 +#ifndef __AUFS_DEBUG_H__
5678 +#define __AUFS_DEBUG_H__
5682 +#include <asm/system.h>
5683 +#include <linux/module.h>
5684 +#include <linux/kallsyms.h>
5685 +#include <linux/sysrq.h>
5687 +#ifdef CONFIG_AUFS_DEBUG
5688 +#define AuDebugOn(a) BUG_ON(a)
5690 +/* module parameter */
5691 +extern int aufs_debug;
5692 +static inline void au_debug(int n)
5698 +static inline int au_debug_test(void)
5700 + return aufs_debug;
5703 +#define AuDebugOn(a) do {} while (0)
5704 +AuStubVoid(au_debug, int n)
5705 +AuStubInt0(au_debug_test, void)
5706 +#endif /* CONFIG_AUFS_DEBUG */
5708 +/* ---------------------------------------------------------------------- */
5712 +#define AuDbg(fmt, ...) do { \
5713 + if (au_debug_test()) \
5714 + pr_debug("DEBUG: " fmt, ##__VA_ARGS__); \
5716 +#define AuLabel(l) AuDbg(#l "\n")
5717 +#define AuIOErr(fmt, ...) pr_err("I/O Error, " fmt, ##__VA_ARGS__)
5718 +#define AuWarn1(fmt, ...) do { \
5719 + static unsigned char _c; \
5721 + pr_warning(fmt, ##__VA_ARGS__); \
5724 +#define AuErr1(fmt, ...) do { \
5725 + static unsigned char _c; \
5727 + pr_err(fmt, ##__VA_ARGS__); \
5730 +#define AuIOErr1(fmt, ...) do { \
5731 + static unsigned char _c; \
5733 + AuIOErr(fmt, ##__VA_ARGS__); \
5736 +#define AuUnsupportMsg "This operation is not supported." \
5737 + " Please report this application to aufs-users ML."
5738 +#define AuUnsupport(fmt, ...) do { \
5739 + pr_err(AuUnsupportMsg "\n" fmt, ##__VA_ARGS__); \
5743 +#define AuTraceErr(e) do { \
5744 + if (unlikely((e) < 0)) \
5745 + AuDbg("err %d\n", (int)(e)); \
5748 +#define AuTraceErrPtr(p) do { \
5750 + AuDbg("err %ld\n", PTR_ERR(p)); \
5753 +/* dirty macros for debug print, use with "%.*s" and caution */
5754 +#define AuLNPair(qstr) (qstr)->len, (qstr)->name
5755 +#define AuDLNPair(d) AuLNPair(&(d)->d_name)
5757 +/* ---------------------------------------------------------------------- */
5762 +#ifdef CONFIG_AUFS_DEBUG
5763 +extern char *au_plevel;
5765 +void au_dpri_whlist(struct au_nhash *whlist);
5767 +void au_dpri_vdir(struct au_vdir *vdir);
5769 +void au_dpri_inode(struct inode *inode);
5770 +void au_dpri_dalias(struct inode *inode);
5771 +void au_dpri_dentry(struct dentry *dentry);
5773 +void au_dpri_file(struct file *filp);
5774 +struct super_block;
5775 +void au_dpri_sb(struct super_block *sb);
5777 +void au_dbg_sleep_jiffy(int jiffy);
5779 +void au_dbg_iattr(struct iattr *ia);
5781 +#define au_dbg_verify_dinode(d) __au_dbg_verify_dinode(d, __func__, __LINE__)
5782 +void __au_dbg_verify_dinode(struct dentry *dentry, const char *func, int line);
5783 +void au_dbg_verify_dir_parent(struct dentry *dentry, unsigned int sigen);
5784 +void au_dbg_verify_nondir_parent(struct dentry *dentry, unsigned int sigen);
5785 +void au_dbg_verify_gen(struct dentry *parent, unsigned int sigen);
5786 +void au_dbg_verify_kthread(void);
5788 +int __init au_debug_init(void);
5789 +void au_debug_sbinfo_init(struct au_sbinfo *sbinfo);
5790 +#define AuDbgWhlist(w) do { \
5792 + au_dpri_whlist(w); \
5795 +#define AuDbgVdir(v) do { \
5797 + au_dpri_vdir(v); \
5800 +#define AuDbgInode(i) do { \
5802 + au_dpri_inode(i); \
5805 +#define AuDbgDAlias(i) do { \
5807 + au_dpri_dalias(i); \
5810 +#define AuDbgDentry(d) do { \
5812 + au_dpri_dentry(d); \
5815 +#define AuDbgFile(f) do { \
5817 + au_dpri_file(f); \
5820 +#define AuDbgSb(sb) do { \
5821 + AuDbg(#sb "\n"); \
5825 +#define AuDbgSleep(sec) do { \
5826 + AuDbg("sleep %d sec\n", sec); \
5830 +#define AuDbgSleepJiffy(jiffy) do { \
5831 + AuDbg("sleep %d jiffies\n", jiffy); \
5832 + au_dbg_sleep_jiffy(jiffy); \
5835 +#define AuDbgIAttr(ia) do { \
5836 + AuDbg("ia_valid 0x%x\n", (ia)->ia_valid); \
5837 + au_dbg_iattr(ia); \
5840 +#define AuDbgSym(addr) do { \
5841 + char sym[KSYM_SYMBOL_LEN]; \
5842 + sprint_symbol(sym, (unsigned long)addr); \
5843 + AuDbg("%s\n", sym); \
5846 +#define AuInfoSym(addr) do { \
5847 + char sym[KSYM_SYMBOL_LEN]; \
5848 + sprint_symbol(sym, (unsigned long)addr); \
5849 + AuInfo("%s\n", sym); \
5852 +AuStubVoid(au_dbg_verify_dinode, struct dentry *dentry)
5853 +AuStubVoid(au_dbg_verify_dir_parent, struct dentry *dentry, unsigned int sigen)
5854 +AuStubVoid(au_dbg_verify_nondir_parent, struct dentry *dentry,
5855 + unsigned int sigen)
5856 +AuStubVoid(au_dbg_verify_gen, struct dentry *parent, unsigned int sigen)
5857 +AuStubVoid(au_dbg_verify_kthread, void)
5858 +AuStubInt0(__init au_debug_init, void)
5859 +AuStubVoid(au_debug_sbinfo_init, struct au_sbinfo *sbinfo)
5861 +#define AuDbgWhlist(w) do {} while (0)
5862 +#define AuDbgVdir(v) do {} while (0)
5863 +#define AuDbgInode(i) do {} while (0)
5864 +#define AuDbgDAlias(i) do {} while (0)
5865 +#define AuDbgDentry(d) do {} while (0)
5866 +#define AuDbgFile(f) do {} while (0)
5867 +#define AuDbgSb(sb) do {} while (0)
5868 +#define AuDbgSleep(sec) do {} while (0)
5869 +#define AuDbgSleepJiffy(jiffy) do {} while (0)
5870 +#define AuDbgIAttr(ia) do {} while (0)
5871 +#define AuDbgSym(addr) do {} while (0)
5872 +#define AuInfoSym(addr) do {} while (0)
5873 +#endif /* CONFIG_AUFS_DEBUG */
5875 +/* ---------------------------------------------------------------------- */
5877 +#ifdef CONFIG_AUFS_MAGIC_SYSRQ
5878 +int __init au_sysrq_init(void);
5879 +void au_sysrq_fin(void);
5881 +#ifdef CONFIG_HW_CONSOLE
5882 +#define au_dbg_blocked() do { \
5884 + handle_sysrq('w'); \
5887 +AuStubVoid(au_dbg_blocked, void)
5891 +AuStubInt0(__init au_sysrq_init, void)
5892 +AuStubVoid(au_sysrq_fin, void)
5893 +AuStubVoid(au_dbg_blocked, void)
5894 +#endif /* CONFIG_AUFS_MAGIC_SYSRQ */
5896 +#endif /* __KERNEL__ */
5897 +#endif /* __AUFS_DEBUG_H__ */
5898 diff -urN /usr/share/empty/fs/aufs/dentry.c linux/fs/aufs/dentry.c
5899 --- /usr/share/empty/fs/aufs/dentry.c 1970-01-01 01:00:00.000000000 +0100
5900 +++ linux/fs/aufs/dentry.c 2012-02-13 21:54:56.969771692 +0100
5903 + * Copyright (C) 2005-2012 Junjiro R. Okajima
5905 + * This program, aufs is free software; you can redistribute it and/or modify
5906 + * it under the terms of the GNU General Public License as published by
5907 + * the Free Software Foundation; either version 2 of the License, or
5908 + * (at your option) any later version.
5910 + * This program is distributed in the hope that it will be useful,
5911 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
5912 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
5913 + * GNU General Public License for more details.
5915 + * You should have received a copy of the GNU General Public License
5916 + * along with this program; if not, write to the Free Software
5917 + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
5921 + * lookup and dentry operations
5924 +#include <linux/namei.h>
5927 +static void au_h_nd(struct nameidata *h_nd, struct nameidata *nd)
5933 + * gave up supporting LOOKUP_CREATE/OPEN for lower fs,
5934 + * due to whiteout and branch permission.
5936 + h_nd->flags &= ~(/*LOOKUP_PARENT |*/ LOOKUP_OPEN | LOOKUP_CREATE
5937 + | LOOKUP_FOLLOW | LOOKUP_EXCL);
5938 + /* unnecessary? */
5939 + h_nd->intent.open.file = NULL;
5941 + memset(h_nd, 0, sizeof(*h_nd));
5944 +struct au_lkup_one_args {
5945 + struct dentry **errp;
5946 + struct qstr *name;
5947 + struct dentry *h_parent;
5948 + struct au_branch *br;
5949 + struct nameidata *nd;
5952 +struct dentry *au_lkup_one(struct qstr *name, struct dentry *h_parent,
5953 + struct au_branch *br, struct nameidata *nd)
5955 + struct dentry *h_dentry;
5957 + struct nameidata h_nd;
5959 + if (au_test_fs_null_nd(h_parent->d_sb))
5960 + return vfsub_lookup_one_len(name->name, h_parent, name->len);
5962 + au_h_nd(&h_nd, nd);
5963 + h_nd.path.dentry = h_parent;
5964 + h_nd.path.mnt = br->br_mnt;
5966 + err = vfsub_name_hash(name->name, &h_nd.last, name->len);
5967 + h_dentry = ERR_PTR(err);
5969 + path_get(&h_nd.path);
5970 + h_dentry = vfsub_lookup_hash(&h_nd);
5971 + path_put(&h_nd.path);
5974 + AuTraceErrPtr(h_dentry);
5978 +static void au_call_lkup_one(void *args)
5980 + struct au_lkup_one_args *a = args;
5981 + *a->errp = au_lkup_one(a->name, a->h_parent, a->br, a->nd);
5984 +#define AuLkup_ALLOW_NEG 1
5985 +#define au_ftest_lkup(flags, name) ((flags) & AuLkup_##name)
5986 +#define au_fset_lkup(flags, name) \
5987 + do { (flags) |= AuLkup_##name; } while (0)
5988 +#define au_fclr_lkup(flags, name) \
5989 + do { (flags) &= ~AuLkup_##name; } while (0)
5991 +struct au_do_lookup_args {
5992 + unsigned int flags;
5994 + struct nameidata *nd;
5998 + * returns positive/negative dentry, NULL or an error.
5999 + * NULL means whiteout-ed or not-found.
6001 +static struct dentry*
6002 +au_do_lookup(struct dentry *h_parent, struct dentry *dentry,
6003 + aufs_bindex_t bindex, struct qstr *wh_name,
6004 + struct au_do_lookup_args *args)
6006 + struct dentry *h_dentry;
6007 + struct inode *h_inode, *inode;
6008 + struct au_branch *br;
6009 + int wh_found, opq;
6010 + unsigned char wh_able;
6011 + const unsigned char allow_neg = !!au_ftest_lkup(args->flags, ALLOW_NEG);
6014 + br = au_sbr(dentry->d_sb, bindex);
6015 + wh_able = !!au_br_whable(br->br_perm);
6017 + wh_found = au_wh_test(h_parent, wh_name, br, /*try_sio*/0);
6018 + h_dentry = ERR_PTR(wh_found);
6021 + if (unlikely(wh_found < 0))
6024 + /* We found a whiteout */
6025 + /* au_set_dbend(dentry, bindex); */
6026 + au_set_dbwh(dentry, bindex);
6028 + return NULL; /* success */
6031 + h_dentry = au_lkup_one(&dentry->d_name, h_parent, br, args->nd);
6032 + if (IS_ERR(h_dentry))
6035 + h_inode = h_dentry->d_inode;
6039 + } else if (wh_found
6040 + || (args->type && args->type != (h_inode->i_mode & S_IFMT)))
6043 + if (au_dbend(dentry) <= bindex)
6044 + au_set_dbend(dentry, bindex);
6045 + if (au_dbstart(dentry) < 0 || bindex < au_dbstart(dentry))
6046 + au_set_dbstart(dentry, bindex);
6047 + au_set_h_dptr(dentry, bindex, h_dentry);
6049 + inode = dentry->d_inode;
6050 + if (!h_inode || !S_ISDIR(h_inode->i_mode) || !wh_able
6051 + || (inode && !S_ISDIR(inode->i_mode)))
6052 + goto out; /* success */
6054 + mutex_lock_nested(&h_inode->i_mutex, AuLsc_I_CHILD);
6055 + opq = au_diropq_test(h_dentry, br);
6056 + mutex_unlock(&h_inode->i_mutex);
6058 + au_set_dbdiropq(dentry, bindex);
6059 + else if (unlikely(opq < 0)) {
6060 + au_set_h_dptr(dentry, bindex, NULL);
6061 + h_dentry = ERR_PTR(opq);
6072 +static int au_test_shwh(struct super_block *sb, const struct qstr *name)
6074 + if (unlikely(!au_opt_test(au_mntflags(sb), SHWH)
6075 + && !strncmp(name->name, AUFS_WH_PFX, AUFS_WH_PFX_LEN)))
6081 + * returns the number of lower positive dentries,
6082 + * otherwise an error.
6083 + * can be called at unlinking with @type is zero.
6085 +int au_lkup_dentry(struct dentry *dentry, aufs_bindex_t bstart, mode_t type,
6086 + struct nameidata *nd)
6088 + int npositive, err;
6089 + aufs_bindex_t bindex, btail, bdiropq;
6090 + unsigned char isdir;
6091 + struct qstr whname;
6092 + struct au_do_lookup_args args = {
6097 + const struct qstr *name = &dentry->d_name;
6098 + struct dentry *parent;
6099 + struct inode *inode;
6101 + err = au_test_shwh(dentry->d_sb, name);
6102 + if (unlikely(err))
6105 + err = au_wh_name_alloc(&whname, name);
6106 + if (unlikely(err))
6109 + inode = dentry->d_inode;
6110 + isdir = !!(inode && S_ISDIR(inode->i_mode));
6112 + au_fset_lkup(args.flags, ALLOW_NEG);
6115 + parent = dget_parent(dentry);
6116 + btail = au_dbtaildir(parent);
6117 + for (bindex = bstart; bindex <= btail; bindex++) {
6118 + struct dentry *h_parent, *h_dentry;
6119 + struct inode *h_inode, *h_dir;
6121 + h_dentry = au_h_dptr(dentry, bindex);
6123 + if (h_dentry->d_inode)
6125 + if (type != S_IFDIR)
6129 + h_parent = au_h_dptr(parent, bindex);
6132 + h_dir = h_parent->d_inode;
6133 + if (!h_dir || !S_ISDIR(h_dir->i_mode))
6136 + mutex_lock_nested(&h_dir->i_mutex, AuLsc_I_PARENT);
6137 + h_dentry = au_do_lookup(h_parent, dentry, bindex, &whname,
6139 + mutex_unlock(&h_dir->i_mutex);
6140 + err = PTR_ERR(h_dentry);
6141 + if (IS_ERR(h_dentry))
6143 + au_fclr_lkup(args.flags, ALLOW_NEG);
6145 + if (au_dbwh(dentry) >= 0)
6149 + h_inode = h_dentry->d_inode;
6154 + args.type = h_inode->i_mode & S_IFMT;
6155 + if (args.type != S_IFDIR)
6158 + /* the type of lower may be different */
6159 + bdiropq = au_dbdiropq(dentry);
6160 + if (bdiropq >= 0 && bdiropq <= bindex)
6166 + AuLabel(positive);
6167 + au_update_dbstart(dentry);
6170 + if (unlikely(!au_opt_test(au_mntflags(dentry->d_sb), UDBA_NONE)
6171 + && au_dbstart(dentry) < 0)) {
6173 + AuIOErr("both of real entry and whiteout found, %.*s, err %d\n",
6174 + AuDLNPair(dentry), err);
6179 + kfree(whname.name);
6184 +struct dentry *au_sio_lkup_one(struct qstr *name, struct dentry *parent,
6185 + struct au_branch *br)
6187 + struct dentry *dentry;
6190 + if (!au_test_h_perm_sio(parent->d_inode, MAY_EXEC))
6191 + dentry = au_lkup_one(name, parent, br, /*nd*/NULL);
6193 + struct au_lkup_one_args args = {
6196 + .h_parent = parent,
6201 + wkq_err = au_wkq_wait(au_call_lkup_one, &args);
6202 + if (unlikely(wkq_err))
6203 + dentry = ERR_PTR(wkq_err);
6210 + * lookup @dentry on @bindex which should be negative.
6212 +int au_lkup_neg(struct dentry *dentry, aufs_bindex_t bindex)
6215 + struct dentry *parent, *h_parent, *h_dentry;
6217 + parent = dget_parent(dentry);
6218 + h_parent = au_h_dptr(parent, bindex);
6219 + h_dentry = au_sio_lkup_one(&dentry->d_name, h_parent,
6220 + au_sbr(dentry->d_sb, bindex));
6221 + err = PTR_ERR(h_dentry);
6222 + if (IS_ERR(h_dentry))
6224 + if (unlikely(h_dentry->d_inode)) {
6226 + AuIOErr("%.*s should be negative on b%d.\n",
6227 + AuDLNPair(h_dentry), bindex);
6233 + if (bindex < au_dbstart(dentry))
6234 + au_set_dbstart(dentry, bindex);
6235 + if (au_dbend(dentry) < bindex)
6236 + au_set_dbend(dentry, bindex);
6237 + au_set_h_dptr(dentry, bindex, h_dentry);
6244 +/* ---------------------------------------------------------------------- */
6246 +/* subset of struct inode */
6248 + unsigned long i_ino;
6249 + /* unsigned int i_nlink; */
6255 + blkcnt_t i_blocks;
6260 +static void au_iattr_save(struct au_iattr *ia, struct inode *h_inode)
6262 + ia->i_ino = h_inode->i_ino;
6263 + /* ia->i_nlink = h_inode->i_nlink; */
6264 + ia->i_uid = h_inode->i_uid;
6265 + ia->i_gid = h_inode->i_gid;
6266 + ia->i_version = h_inode->i_version;
6268 + ia->i_size = h_inode->i_size;
6269 + ia->i_blocks = h_inode->i_blocks;
6271 + ia->i_mode = (h_inode->i_mode & S_IFMT);
6274 +static int au_iattr_test(struct au_iattr *ia, struct inode *h_inode)
6276 + return ia->i_ino != h_inode->i_ino
6277 + /* || ia->i_nlink != h_inode->i_nlink */
6278 + || ia->i_uid != h_inode->i_uid
6279 + || ia->i_gid != h_inode->i_gid
6280 + || ia->i_version != h_inode->i_version
6282 + || ia->i_size != h_inode->i_size
6283 + || ia->i_blocks != h_inode->i_blocks
6285 + || ia->i_mode != (h_inode->i_mode & S_IFMT);
6288 +static int au_h_verify_dentry(struct dentry *h_dentry, struct dentry *h_parent,
6289 + struct au_branch *br)
6292 + struct au_iattr ia;
6293 + struct inode *h_inode;
6294 + struct dentry *h_d;
6295 + struct super_block *h_sb;
6298 + memset(&ia, -1, sizeof(ia));
6299 + h_sb = h_dentry->d_sb;
6300 + h_inode = h_dentry->d_inode;
6302 + au_iattr_save(&ia, h_inode);
6303 + else if (au_test_nfs(h_sb) || au_test_fuse(h_sb))
6304 + /* nfs d_revalidate may return 0 for negative dentry */
6305 + /* fuse d_revalidate always return 0 for negative dentry */
6308 + /* main purpose is namei.c:cached_lookup() and d_revalidate */
6309 + h_d = au_lkup_one(&h_dentry->d_name, h_parent, br, /*nd*/NULL);
6310 + err = PTR_ERR(h_d);
6315 + if (unlikely(h_d != h_dentry
6316 + || h_d->d_inode != h_inode
6317 + || (h_inode && au_iattr_test(&ia, h_inode))))
6318 + err = au_busy_or_stale();
6326 +int au_h_verify(struct dentry *h_dentry, unsigned int udba, struct inode *h_dir,
6327 + struct dentry *h_parent, struct au_branch *br)
6332 + if (udba == AuOpt_UDBA_REVAL
6333 + && !au_test_fs_remote(h_dentry->d_sb)) {
6335 + err = (h_dentry->d_parent->d_inode != h_dir);
6336 + } else if (udba != AuOpt_UDBA_NONE)
6337 + err = au_h_verify_dentry(h_dentry, h_parent, br);
6342 +/* ---------------------------------------------------------------------- */
6344 +static int au_do_refresh_hdentry(struct dentry *dentry, struct dentry *parent)
6347 + aufs_bindex_t new_bindex, bindex, bend, bwh, bdiropq;
6348 + struct au_hdentry tmp, *p, *q;
6349 + struct au_dinfo *dinfo;
6350 + struct super_block *sb;
6352 + DiMustWriteLock(dentry);
6354 + sb = dentry->d_sb;
6355 + dinfo = au_di(dentry);
6356 + bend = dinfo->di_bend;
6357 + bwh = dinfo->di_bwh;
6358 + bdiropq = dinfo->di_bdiropq;
6359 + p = dinfo->di_hdentry + dinfo->di_bstart;
6360 + for (bindex = dinfo->di_bstart; bindex <= bend; bindex++, p++) {
6361 + if (!p->hd_dentry)
6364 + new_bindex = au_br_index(sb, p->hd_id);
6365 + if (new_bindex == bindex)
6368 + if (dinfo->di_bwh == bindex)
6370 + if (dinfo->di_bdiropq == bindex)
6371 + bdiropq = new_bindex;
6372 + if (new_bindex < 0) {
6374 + p->hd_dentry = NULL;
6378 + /* swap two lower dentries, and loop again */
6379 + q = dinfo->di_hdentry + new_bindex;
6383 + if (tmp.hd_dentry) {
6389 + dinfo->di_bwh = -1;
6390 + if (bwh >= 0 && bwh <= au_sbend(sb) && au_sbr_whable(sb, bwh))
6391 + dinfo->di_bwh = bwh;
6393 + dinfo->di_bdiropq = -1;
6395 + && bdiropq <= au_sbend(sb)
6396 + && au_sbr_whable(sb, bdiropq))
6397 + dinfo->di_bdiropq = bdiropq;
6400 + dinfo->di_bstart = -1;
6401 + dinfo->di_bend = -1;
6402 + bend = au_dbend(parent);
6403 + p = dinfo->di_hdentry;
6404 + for (bindex = 0; bindex <= bend; bindex++, p++)
6405 + if (p->hd_dentry) {
6406 + dinfo->di_bstart = bindex;
6410 + if (dinfo->di_bstart >= 0) {
6411 + p = dinfo->di_hdentry + bend;
6412 + for (bindex = bend; bindex >= 0; bindex--, p--)
6413 + if (p->hd_dentry) {
6414 + dinfo->di_bend = bindex;
6423 +static void au_do_hide(struct dentry *dentry)
6425 + struct inode *inode;
6427 + inode = dentry->d_inode;
6429 + if (!S_ISDIR(inode->i_mode)) {
6430 + if (inode->i_nlink && !d_unhashed(dentry))
6431 + drop_nlink(inode);
6433 + clear_nlink(inode);
6434 + /* stop next lookup */
6435 + inode->i_flags |= S_DEAD;
6437 + smp_mb(); /* necessary? */
6442 +static int au_hide_children(struct dentry *parent)
6444 + int err, i, j, ndentry;
6445 + struct au_dcsub_pages dpages;
6446 + struct au_dpage *dpage;
6447 + struct dentry *dentry;
6449 + err = au_dpages_init(&dpages, GFP_NOFS);
6450 + if (unlikely(err))
6452 + err = au_dcsub_pages(&dpages, parent, NULL, NULL);
6453 + if (unlikely(err))
6456 + /* in reverse order */
6457 + for (i = dpages.ndpage - 1; i >= 0; i--) {
6458 + dpage = dpages.dpages + i;
6459 + ndentry = dpage->ndentry;
6460 + for (j = ndentry - 1; j >= 0; j--) {
6461 + dentry = dpage->dentries[j];
6462 + if (dentry != parent)
6463 + au_do_hide(dentry);
6468 + au_dpages_free(&dpages);
6473 +static void au_hide(struct dentry *dentry)
6476 + struct inode *inode;
6478 + AuDbgDentry(dentry);
6479 + inode = dentry->d_inode;
6480 + if (inode && S_ISDIR(inode->i_mode)) {
6481 + /* shrink_dcache_parent(dentry); */
6482 + err = au_hide_children(dentry);
6483 + if (unlikely(err))
6484 + AuIOErr("%.*s, failed hiding children, ignored %d\n",
6485 + AuDLNPair(dentry), err);
6487 + au_do_hide(dentry);
6491 + * By adding a dirty branch, a cached dentry may be affected in various ways.
6493 + * a dirty branch is added
6494 + * - on the top of layers
6495 + * - in the middle of layers
6496 + * - to the bottom of layers
6498 + * on the added branch there exists
6501 + * - a same named entry
6503 + * * negative --> positive
6504 + * * positive --> positive
6505 + * - type is unchanged
6506 + * - type is changed
6508 + * * negative --> negative
6509 + * * positive --> negative (rejected by au_br_del() for non-dir case)
6512 +static int au_refresh_by_dinfo(struct dentry *dentry, struct au_dinfo *dinfo,
6513 + struct au_dinfo *tmp)
6516 + aufs_bindex_t bindex, bend;
6518 + struct dentry *dentry;
6519 + struct inode *inode;
6522 + struct au_hdentry *hd;
6523 + struct inode *inode, *h_inode;
6524 + struct dentry *h_dentry;
6527 + AuDebugOn(dinfo->di_bstart < 0);
6528 + orig_h.dentry = dinfo->di_hdentry[dinfo->di_bstart].hd_dentry;
6529 + orig_h.inode = orig_h.dentry->d_inode;
6532 + orig_h.mode = orig_h.inode->i_mode & S_IFMT;
6533 + memset(&tmp_h, 0, sizeof(tmp_h));
6534 + if (tmp->di_bstart >= 0) {
6535 + tmp_h.dentry = tmp->di_hdentry[tmp->di_bstart].hd_dentry;
6536 + tmp_h.inode = tmp_h.dentry->d_inode;
6538 + tmp_h.mode = tmp_h.inode->i_mode & S_IFMT;
6541 + inode = dentry->d_inode;
6542 + if (!orig_h.inode) {
6543 + AuDbg("nagative originally\n");
6549 + AuDebugOn(dinfo->di_bstart != dinfo->di_bend);
6550 + AuDebugOn(dinfo->di_bdiropq != -1);
6552 + if (!tmp_h.inode) {
6553 + AuDbg("negative --> negative\n");
6554 + /* should have only one negative lower */
6555 + if (tmp->di_bstart >= 0
6556 + && tmp->di_bstart < dinfo->di_bstart) {
6557 + AuDebugOn(tmp->di_bstart != tmp->di_bend);
6558 + AuDebugOn(dinfo->di_bstart != dinfo->di_bend);
6559 + au_set_h_dptr(dentry, dinfo->di_bstart, NULL);
6560 + au_di_cp(dinfo, tmp);
6561 + hd = tmp->di_hdentry + tmp->di_bstart;
6562 + au_set_h_dptr(dentry, tmp->di_bstart,
6563 + dget(hd->hd_dentry));
6565 + au_dbg_verify_dinode(dentry);
6567 + AuDbg("negative --> positive\n");
6569 + * similar to the behaviour of creating with bypassing
6571 + * unhash it in order to force an error in the
6572 + * succeeding create operation.
6573 + * we should not set S_DEAD here.
6576 + /* au_di_swap(tmp, dinfo); */
6577 + au_dbg_verify_dinode(dentry);
6580 + AuDbg("positive originally\n");
6581 + /* inode may be NULL */
6582 + AuDebugOn(inode && (inode->i_mode & S_IFMT) != orig_h.mode);
6583 + if (!tmp_h.inode) {
6584 + AuDbg("positive --> negative\n");
6585 + /* or bypassing aufs */
6587 + if (tmp->di_bwh >= 0 && tmp->di_bwh <= dinfo->di_bstart)
6588 + dinfo->di_bwh = tmp->di_bwh;
6590 + err = au_refresh_hinode_self(inode);
6591 + au_dbg_verify_dinode(dentry);
6592 + } else if (orig_h.mode == tmp_h.mode) {
6593 + AuDbg("positive --> positive, same type\n");
6594 + if (!S_ISDIR(orig_h.mode)
6595 + && dinfo->di_bstart > tmp->di_bstart) {
6597 + * similar to the behaviour of removing and
6602 + err = au_refresh_hinode_self(inode);
6603 + au_dbg_verify_dinode(dentry);
6605 + /* fill empty slots */
6606 + if (dinfo->di_bstart > tmp->di_bstart)
6607 + dinfo->di_bstart = tmp->di_bstart;
6608 + if (dinfo->di_bend < tmp->di_bend)
6609 + dinfo->di_bend = tmp->di_bend;
6610 + dinfo->di_bwh = tmp->di_bwh;
6611 + dinfo->di_bdiropq = tmp->di_bdiropq;
6612 + hd = tmp->di_hdentry;
6613 + bend = dinfo->di_bend;
6614 + for (bindex = tmp->di_bstart; bindex <= bend;
6616 + if (au_h_dptr(dentry, bindex))
6618 + h_dentry = hd[bindex].hd_dentry;
6621 + h_inode = h_dentry->d_inode;
6622 + AuDebugOn(!h_inode);
6623 + AuDebugOn(orig_h.mode
6624 + != (h_inode->i_mode
6626 + au_set_h_dptr(dentry, bindex,
6629 + err = au_refresh_hinode(inode, dentry);
6630 + au_dbg_verify_dinode(dentry);
6633 + AuDbg("positive --> positive, different type\n");
6634 + /* similar to the behaviour of removing and creating */
6637 + err = au_refresh_hinode_self(inode);
6638 + au_dbg_verify_dinode(dentry);
6646 +int au_refresh_dentry(struct dentry *dentry, struct dentry *parent)
6649 + unsigned int sigen;
6650 + struct au_dinfo *dinfo, *tmp;
6651 + struct super_block *sb;
6652 + struct inode *inode;
6654 + DiMustWriteLock(dentry);
6655 + AuDebugOn(IS_ROOT(dentry));
6656 + AuDebugOn(!parent->d_inode);
6658 + sb = dentry->d_sb;
6659 + inode = dentry->d_inode;
6660 + sigen = au_sigen(sb);
6661 + err = au_digen_test(parent, sigen);
6662 + if (unlikely(err))
6665 + dinfo = au_di(dentry);
6666 + err = au_di_realloc(dinfo, au_sbend(sb) + 1);
6667 + if (unlikely(err))
6669 + ebrange = au_dbrange_test(dentry);
6671 + ebrange = au_do_refresh_hdentry(dentry, parent);
6673 + if (d_unhashed(dentry) || ebrange) {
6674 + AuDebugOn(au_dbstart(dentry) < 0 && au_dbend(dentry) >= 0);
6676 + err = au_refresh_hinode_self(inode);
6677 + au_dbg_verify_dinode(dentry);
6679 + goto out_dgen; /* success */
6683 + /* temporary dinfo */
6684 + AuDbgDentry(dentry);
6686 + tmp = au_di_alloc(sb, AuLsc_DI_TMP);
6687 + if (unlikely(!tmp))
6689 + au_di_swap(tmp, dinfo);
6690 + /* returns the number of positive dentries */
6692 + * if current working dir is removed, it returns an error.
6693 + * but the dentry is legal.
6695 + err = au_lkup_dentry(dentry, /*bstart*/0, /*type*/0, /*nd*/NULL);
6696 + AuDbgDentry(dentry);
6697 + au_di_swap(tmp, dinfo);
6698 + if (err == -ENOENT)
6701 + /* compare/refresh by dinfo */
6702 + AuDbgDentry(dentry);
6703 + err = au_refresh_by_dinfo(dentry, dinfo, tmp);
6704 + au_dbg_verify_dinode(dentry);
6707 + au_rw_write_unlock(&tmp->di_rwsem);
6709 + if (unlikely(err))
6713 + au_update_digen(dentry);
6715 + if (unlikely(err && !(dentry->d_flags & DCACHE_NFSFS_RENAMED))) {
6716 + AuIOErr("failed refreshing %.*s, %d\n",
6717 + AuDLNPair(dentry), err);
6718 + AuDbgDentry(dentry);
6724 +static noinline_for_stack
6725 +int au_do_h_d_reval(struct dentry *h_dentry, struct nameidata *nd,
6726 + struct dentry *dentry, aufs_bindex_t bindex)
6729 + int (*reval)(struct dentry *, struct nameidata *);
6732 + if (!(h_dentry->d_flags & DCACHE_OP_REVALIDATE))
6734 + reval = h_dentry->d_op->d_revalidate;
6736 + AuDbg("b%d\n", bindex);
6737 + if (au_test_fs_null_nd(h_dentry->d_sb))
6738 + /* it may return tri-state */
6739 + valid = reval(h_dentry, NULL);
6741 + struct nameidata h_nd;
6743 + struct dentry *parent;
6745 + au_h_nd(&h_nd, nd);
6746 + parent = nd->path.dentry;
6747 + locked = (nd && nd->path.dentry != dentry);
6749 + di_read_lock_parent(parent, AuLock_IR);
6750 + BUG_ON(bindex > au_dbend(parent));
6751 + h_nd.path.dentry = au_h_dptr(parent, bindex);
6752 + BUG_ON(!h_nd.path.dentry);
6753 + h_nd.path.mnt = au_sbr(parent->d_sb, bindex)->br_mnt;
6754 + path_get(&h_nd.path);
6755 + valid = reval(h_dentry, &h_nd);
6756 + path_put(&h_nd.path);
6758 + di_read_unlock(parent, AuLock_IR);
6761 + if (unlikely(valid < 0))
6771 +/* todo: remove this */
6772 +static int h_d_revalidate(struct dentry *dentry, struct inode *inode,
6773 + struct nameidata *nd, int do_udba)
6776 + umode_t mode, h_mode;
6777 + aufs_bindex_t bindex, btail, bstart, ibs, ibe;
6778 + unsigned char plus, unhashed, is_root, h_plus;
6779 + struct inode *h_inode, *h_cached_inode;
6780 + struct dentry *h_dentry;
6781 + struct qstr *name, *h_name;
6788 + unhashed = !!d_unhashed(dentry);
6789 + is_root = !!IS_ROOT(dentry);
6790 + name = &dentry->d_name;
6793 + * Theoretically, REVAL test should be unnecessary in case of
6795 + * But {fs,i}notify doesn't fire some necessary events,
6796 + * IN_ATTRIB for atime/nlink/pageio
6797 + * IN_DELETE for NFS dentry
6798 + * Let's do REVAL test too.
6800 + if (do_udba && inode) {
6801 + mode = (inode->i_mode & S_IFMT);
6802 + plus = (inode->i_nlink > 0);
6803 + ibs = au_ibstart(inode);
6804 + ibe = au_ibend(inode);
6807 + bstart = au_dbstart(dentry);
6809 + if (inode && S_ISDIR(inode->i_mode))
6810 + btail = au_dbtaildir(dentry);
6811 + for (bindex = bstart; bindex <= btail; bindex++) {
6812 + h_dentry = au_h_dptr(dentry, bindex);
6816 + AuDbg("b%d, %.*s\n", bindex, AuDLNPair(h_dentry));
6817 + spin_lock(&h_dentry->d_lock);
6818 + h_name = &h_dentry->d_name;
6819 + if (unlikely(do_udba
6821 + && (unhashed != !!d_unhashed(h_dentry)
6822 + || name->len != h_name->len
6823 + || memcmp(name->name, h_name->name, name->len))
6825 + AuDbg("unhash 0x%x 0x%x, %.*s %.*s\n",
6826 + unhashed, d_unhashed(h_dentry),
6827 + AuDLNPair(dentry), AuDLNPair(h_dentry));
6828 + spin_unlock(&h_dentry->d_lock);
6831 + spin_unlock(&h_dentry->d_lock);
6833 + err = au_do_h_d_reval(h_dentry, nd, dentry, bindex);
6834 + if (unlikely(err))
6835 + /* do not goto err, to keep the errno */
6838 + /* todo: plink too? */
6843 + h_inode = h_dentry->d_inode;
6844 + if (unlikely(!!inode != !!h_inode))
6849 + h_cached_inode = h_inode;
6851 + h_mode = (h_inode->i_mode & S_IFMT);
6852 + h_plus = (h_inode->i_nlink > 0);
6854 + if (inode && ibs <= bindex && bindex <= ibe)
6855 + h_cached_inode = au_h_iptr(inode, bindex);
6857 + if (unlikely(plus != h_plus
6859 + || h_cached_inode != h_inode))
6871 +/* todo: consolidate with do_refresh() and au_reval_for_attr() */
6872 +static int simple_reval_dpath(struct dentry *dentry, unsigned int sigen)
6875 + struct dentry *parent;
6877 + if (!au_digen_test(dentry, sigen))
6880 + parent = dget_parent(dentry);
6881 + di_read_lock_parent(parent, AuLock_IR);
6882 + AuDebugOn(au_digen_test(parent, sigen));
6883 + au_dbg_verify_gen(parent, sigen);
6884 + err = au_refresh_dentry(dentry, parent);
6885 + di_read_unlock(parent, AuLock_IR);
6891 +int au_reval_dpath(struct dentry *dentry, unsigned int sigen)
6894 + struct dentry *d, *parent;
6895 + struct inode *inode;
6897 + if (!au_ftest_si(au_sbi(dentry->d_sb), FAILED_REFRESH_DIR))
6898 + return simple_reval_dpath(dentry, sigen);
6900 + /* slow loop, keep it simple and stupid */
6901 + /* cf: au_cpup_dirs() */
6904 + while (au_digen_test(dentry, sigen)) {
6908 + parent = dget_parent(d);
6909 + if (!au_digen_test(parent, sigen))
6914 + inode = d->d_inode;
6916 + di_write_lock_child2(d);
6918 + /* someone might update our dentry while we were sleeping */
6919 + if (au_digen_test(d, sigen)) {
6921 + * todo: consolidate with simple_reval_dpath(),
6922 + * do_refresh() and au_reval_for_attr().
6924 + di_read_lock_parent(parent, AuLock_IR);
6925 + err = au_refresh_dentry(d, parent);
6926 + di_read_unlock(parent, AuLock_IR);
6930 + di_write_unlock(d);
6932 + if (unlikely(err))
6940 + * if valid returns 1, otherwise 0.
6942 +static int aufs_d_revalidate(struct dentry *dentry, struct nameidata *nd)
6945 + unsigned int sigen;
6946 + unsigned char do_udba;
6947 + struct super_block *sb;
6948 + struct inode *inode;
6950 + /* todo: support rcu-walk? */
6951 + if (nd && (nd->flags & LOOKUP_RCU))
6955 + if (unlikely(!au_di(dentry)))
6958 + inode = dentry->d_inode;
6959 + if (inode && is_bad_inode(inode))
6963 + sb = dentry->d_sb;
6966 + * i_mutex of parent dir may be held,
6967 + * but we should not return 'invalid' due to busy.
6969 + err = aufs_read_lock(dentry, AuLock_FLUSH | AuLock_DW | AuLock_NOPLM);
6970 + if (unlikely(err)) {
6975 + if (unlikely(au_dbrange_test(dentry))) {
6981 + sigen = au_sigen(sb);
6982 + if (au_digen_test(dentry, sigen)) {
6983 + AuDebugOn(IS_ROOT(dentry));
6984 + err = au_reval_dpath(dentry, sigen);
6985 + if (unlikely(err)) {
6990 + di_downgrade_lock(dentry, AuLock_IR);
6993 + if (inode && (IS_DEADDIR(inode) || !inode->i_nlink))
6996 + do_udba = !au_opt_test(au_mntflags(sb), UDBA_NONE);
6997 + if (do_udba && inode) {
6998 + aufs_bindex_t bstart = au_ibstart(inode);
6999 + struct inode *h_inode;
7001 + if (bstart >= 0) {
7002 + h_inode = au_h_iptr(inode, bstart);
7003 + if (h_inode && au_test_higen(inode, h_inode))
7008 + err = h_d_revalidate(dentry, inode, nd, do_udba);
7009 + if (unlikely(!err && do_udba && au_dbstart(dentry) < 0)) {
7011 + AuDbg("both of real entry and whiteout found, %.*s, err %d\n",
7012 + AuDLNPair(dentry), err);
7017 + di_downgrade_lock(dentry, AuLock_IR);
7019 + aufs_read_unlock(dentry, AuLock_IR);
7024 + AuDbg("%.*s invalid, %d\n", AuDLNPair(dentry), valid);
7030 +static void aufs_d_release(struct dentry *dentry)
7032 + if (au_di(dentry)) {
7033 + au_di_fin(dentry);
7034 + au_hn_di_reinit(dentry);
7038 +const struct dentry_operations aufs_dop = {
7039 + .d_revalidate = aufs_d_revalidate,
7040 + .d_release = aufs_d_release
7042 diff -urN /usr/share/empty/fs/aufs/dentry.h linux/fs/aufs/dentry.h
7043 --- /usr/share/empty/fs/aufs/dentry.h 1970-01-01 01:00:00.000000000 +0100
7044 +++ linux/fs/aufs/dentry.h 2012-02-13 21:54:56.969771692 +0100
7047 + * Copyright (C) 2005-2012 Junjiro R. Okajima
7049 + * This program, aufs is free software; you can redistribute it and/or modify
7050 + * it under the terms of the GNU General Public License as published by
7051 + * the Free Software Foundation; either version 2 of the License, or
7052 + * (at your option) any later version.
7054 + * This program is distributed in the hope that it will be useful,
7055 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
7056 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
7057 + * GNU General Public License for more details.
7059 + * You should have received a copy of the GNU General Public License
7060 + * along with this program; if not, write to the Free Software
7061 + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
7065 + * lookup and dentry operations
7068 +#ifndef __AUFS_DENTRY_H__
7069 +#define __AUFS_DENTRY_H__
7073 +#include <linux/dcache.h>
7076 +struct au_hdentry {
7077 + struct dentry *hd_dentry;
7078 + aufs_bindex_t hd_id;
7082 + atomic_t di_generation;
7084 + struct au_rwsem di_rwsem;
7085 + aufs_bindex_t di_bstart, di_bend, di_bwh, di_bdiropq;
7086 + struct au_hdentry *di_hdentry;
7087 +} ____cacheline_aligned_in_smp;
7089 +/* ---------------------------------------------------------------------- */
7092 +extern const struct dentry_operations aufs_dop;
7094 +struct dentry *au_lkup_one(struct qstr *name, struct dentry *h_parent,
7095 + struct au_branch *br, struct nameidata *nd);
7096 +struct dentry *au_sio_lkup_one(struct qstr *name, struct dentry *parent,
7097 + struct au_branch *br);
7098 +int au_h_verify(struct dentry *h_dentry, unsigned int udba, struct inode *h_dir,
7099 + struct dentry *h_parent, struct au_branch *br);
7101 +int au_lkup_dentry(struct dentry *dentry, aufs_bindex_t bstart, mode_t type,
7102 + struct nameidata *nd);
7103 +int au_lkup_neg(struct dentry *dentry, aufs_bindex_t bindex);
7104 +int au_refresh_dentry(struct dentry *dentry, struct dentry *parent);
7105 +int au_reval_dpath(struct dentry *dentry, unsigned int sigen);
7108 +void au_di_init_once(void *_di);
7109 +struct au_dinfo *au_di_alloc(struct super_block *sb, unsigned int lsc);
7110 +void au_di_free(struct au_dinfo *dinfo);
7111 +void au_di_swap(struct au_dinfo *a, struct au_dinfo *b);
7112 +void au_di_cp(struct au_dinfo *dst, struct au_dinfo *src);
7113 +int au_di_init(struct dentry *dentry);
7114 +void au_di_fin(struct dentry *dentry);
7115 +int au_di_realloc(struct au_dinfo *dinfo, int nbr);
7117 +void di_read_lock(struct dentry *d, int flags, unsigned int lsc);
7118 +void di_read_unlock(struct dentry *d, int flags);
7119 +void di_downgrade_lock(struct dentry *d, int flags);
7120 +void di_write_lock(struct dentry *d, unsigned int lsc);
7121 +void di_write_unlock(struct dentry *d);
7122 +void di_write_lock2_child(struct dentry *d1, struct dentry *d2, int isdir);
7123 +void di_write_lock2_parent(struct dentry *d1, struct dentry *d2, int isdir);
7124 +void di_write_unlock2(struct dentry *d1, struct dentry *d2);
7126 +struct dentry *au_h_dptr(struct dentry *dentry, aufs_bindex_t bindex);
7127 +struct dentry *au_h_d_alias(struct dentry *dentry, aufs_bindex_t bindex);
7128 +aufs_bindex_t au_dbtail(struct dentry *dentry);
7129 +aufs_bindex_t au_dbtaildir(struct dentry *dentry);
7131 +void au_set_h_dptr(struct dentry *dentry, aufs_bindex_t bindex,
7132 + struct dentry *h_dentry);
7133 +int au_digen_test(struct dentry *dentry, unsigned int sigen);
7134 +int au_dbrange_test(struct dentry *dentry);
7135 +void au_update_digen(struct dentry *dentry);
7136 +void au_update_dbrange(struct dentry *dentry, int do_put_zero);
7137 +void au_update_dbstart(struct dentry *dentry);
7138 +void au_update_dbend(struct dentry *dentry);
7139 +int au_find_dbindex(struct dentry *dentry, struct dentry *h_dentry);
7141 +/* ---------------------------------------------------------------------- */
7143 +static inline struct au_dinfo *au_di(struct dentry *dentry)
7145 + return dentry->d_fsdata;
7148 +/* ---------------------------------------------------------------------- */
7150 +/* lock subclass for dinfo */
7152 + AuLsc_DI_CHILD, /* child first */
7153 + AuLsc_DI_CHILD2, /* rename(2), link(2), and cpup at hnotify */
7154 + AuLsc_DI_CHILD3, /* copyup dirs */
7158 + AuLsc_DI_TMP /* temp for replacing dinfo */
7162 + * di_read_lock_child, di_write_lock_child,
7163 + * di_read_lock_child2, di_write_lock_child2,
7164 + * di_read_lock_child3, di_write_lock_child3,
7165 + * di_read_lock_parent, di_write_lock_parent,
7166 + * di_read_lock_parent2, di_write_lock_parent2,
7167 + * di_read_lock_parent3, di_write_lock_parent3,
7169 +#define AuReadLockFunc(name, lsc) \
7170 +static inline void di_read_lock_##name(struct dentry *d, int flags) \
7171 +{ di_read_lock(d, flags, AuLsc_DI_##lsc); }
7173 +#define AuWriteLockFunc(name, lsc) \
7174 +static inline void di_write_lock_##name(struct dentry *d) \
7175 +{ di_write_lock(d, AuLsc_DI_##lsc); }
7177 +#define AuRWLockFuncs(name, lsc) \
7178 + AuReadLockFunc(name, lsc) \
7179 + AuWriteLockFunc(name, lsc)
7181 +AuRWLockFuncs(child, CHILD);
7182 +AuRWLockFuncs(child2, CHILD2);
7183 +AuRWLockFuncs(child3, CHILD3);
7184 +AuRWLockFuncs(parent, PARENT);
7185 +AuRWLockFuncs(parent2, PARENT2);
7186 +AuRWLockFuncs(parent3, PARENT3);
7188 +#undef AuReadLockFunc
7189 +#undef AuWriteLockFunc
7190 +#undef AuRWLockFuncs
7192 +#define DiMustNoWaiters(d) AuRwMustNoWaiters(&au_di(d)->di_rwsem)
7193 +#define DiMustAnyLock(d) AuRwMustAnyLock(&au_di(d)->di_rwsem)
7194 +#define DiMustWriteLock(d) AuRwMustWriteLock(&au_di(d)->di_rwsem)
7196 +/* ---------------------------------------------------------------------- */
7198 +/* todo: memory barrier? */
7199 +static inline unsigned int au_digen(struct dentry *d)
7201 + return atomic_read(&au_di(d)->di_generation);
7204 +static inline void au_h_dentry_init(struct au_hdentry *hdentry)
7206 + hdentry->hd_dentry = NULL;
7209 +static inline void au_hdput(struct au_hdentry *hd)
7212 + dput(hd->hd_dentry);
7215 +static inline aufs_bindex_t au_dbstart(struct dentry *dentry)
7217 + DiMustAnyLock(dentry);
7218 + return au_di(dentry)->di_bstart;
7221 +static inline aufs_bindex_t au_dbend(struct dentry *dentry)
7223 + DiMustAnyLock(dentry);
7224 + return au_di(dentry)->di_bend;
7227 +static inline aufs_bindex_t au_dbwh(struct dentry *dentry)
7229 + DiMustAnyLock(dentry);
7230 + return au_di(dentry)->di_bwh;
7233 +static inline aufs_bindex_t au_dbdiropq(struct dentry *dentry)
7235 + DiMustAnyLock(dentry);
7236 + return au_di(dentry)->di_bdiropq;
7239 +/* todo: hard/soft set? */
7240 +static inline void au_set_dbstart(struct dentry *dentry, aufs_bindex_t bindex)
7242 + DiMustWriteLock(dentry);
7243 + au_di(dentry)->di_bstart = bindex;
7246 +static inline void au_set_dbend(struct dentry *dentry, aufs_bindex_t bindex)
7248 + DiMustWriteLock(dentry);
7249 + au_di(dentry)->di_bend = bindex;
7252 +static inline void au_set_dbwh(struct dentry *dentry, aufs_bindex_t bindex)
7254 + DiMustWriteLock(dentry);
7255 + /* dbwh can be outside of bstart - bend range */
7256 + au_di(dentry)->di_bwh = bindex;
7259 +static inline void au_set_dbdiropq(struct dentry *dentry, aufs_bindex_t bindex)
7261 + DiMustWriteLock(dentry);
7262 + au_di(dentry)->di_bdiropq = bindex;
7265 +/* ---------------------------------------------------------------------- */
7267 +#ifdef CONFIG_AUFS_HNOTIFY
7268 +static inline void au_digen_dec(struct dentry *d)
7270 + atomic_dec(&au_di(d)->di_generation);
7273 +static inline void au_hn_di_reinit(struct dentry *dentry)
7275 + dentry->d_fsdata = NULL;
7278 +AuStubVoid(au_hn_di_reinit, struct dentry *dentry __maybe_unused)
7279 +#endif /* CONFIG_AUFS_HNOTIFY */
7281 +#endif /* __KERNEL__ */
7282 +#endif /* __AUFS_DENTRY_H__ */
7283 diff -urN /usr/share/empty/fs/aufs/dinfo.c linux/fs/aufs/dinfo.c
7284 --- /usr/share/empty/fs/aufs/dinfo.c 1970-01-01 01:00:00.000000000 +0100
7285 +++ linux/fs/aufs/dinfo.c 2012-02-13 21:54:56.969771692 +0100
7288 + * Copyright (C) 2005-2012 Junjiro R. Okajima
7290 + * This program, aufs is free software; you can redistribute it and/or modify
7291 + * it under the terms of the GNU General Public License as published by
7292 + * the Free Software Foundation; either version 2 of the License, or
7293 + * (at your option) any later version.
7295 + * This program is distributed in the hope that it will be useful,
7296 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
7297 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
7298 + * GNU General Public License for more details.
7300 + * You should have received a copy of the GNU General Public License
7301 + * along with this program; if not, write to the Free Software
7302 + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
7306 + * dentry private data
7311 +void au_di_init_once(void *_dinfo)
7313 + struct au_dinfo *dinfo = _dinfo;
7314 + static struct lock_class_key aufs_di;
7316 + au_rw_init(&dinfo->di_rwsem);
7317 + au_rw_class(&dinfo->di_rwsem, &aufs_di);
7320 +struct au_dinfo *au_di_alloc(struct super_block *sb, unsigned int lsc)
7322 + struct au_dinfo *dinfo;
7325 + dinfo = au_cache_alloc_dinfo();
7326 + if (unlikely(!dinfo))
7329 + nbr = au_sbend(sb) + 1;
7332 + dinfo->di_hdentry = kcalloc(nbr, sizeof(*dinfo->di_hdentry), GFP_NOFS);
7333 + if (dinfo->di_hdentry) {
7334 + au_rw_write_lock_nested(&dinfo->di_rwsem, lsc);
7335 + dinfo->di_bstart = -1;
7336 + dinfo->di_bend = -1;
7337 + dinfo->di_bwh = -1;
7338 + dinfo->di_bdiropq = -1;
7339 + for (i = 0; i < nbr; i++)
7340 + dinfo->di_hdentry[i].hd_id = -1;
7344 + au_cache_free_dinfo(dinfo);
7351 +void au_di_free(struct au_dinfo *dinfo)
7353 + struct au_hdentry *p;
7354 + aufs_bindex_t bend, bindex;
7356 + /* dentry may not be revalidated */
7357 + bindex = dinfo->di_bstart;
7358 + if (bindex >= 0) {
7359 + bend = dinfo->di_bend;
7360 + p = dinfo->di_hdentry + bindex;
7361 + while (bindex++ <= bend)
7364 + kfree(dinfo->di_hdentry);
7365 + au_cache_free_dinfo(dinfo);
7368 +void au_di_swap(struct au_dinfo *a, struct au_dinfo *b)
7370 + struct au_hdentry *p;
7373 + AuRwMustWriteLock(&a->di_rwsem);
7374 + AuRwMustWriteLock(&b->di_rwsem);
7376 +#define DiSwap(v, name) \
7378 + v = a->di_##name; \
7379 + a->di_##name = b->di_##name; \
7380 + b->di_##name = v; \
7383 + DiSwap(p, hdentry);
7384 + DiSwap(bi, bstart);
7387 + DiSwap(bi, bdiropq);
7393 +void au_di_cp(struct au_dinfo *dst, struct au_dinfo *src)
7395 + AuRwMustWriteLock(&dst->di_rwsem);
7396 + AuRwMustWriteLock(&src->di_rwsem);
7398 + dst->di_bstart = src->di_bstart;
7399 + dst->di_bend = src->di_bend;
7400 + dst->di_bwh = src->di_bwh;
7401 + dst->di_bdiropq = src->di_bdiropq;
7405 +int au_di_init(struct dentry *dentry)
7408 + struct super_block *sb;
7409 + struct au_dinfo *dinfo;
7412 + sb = dentry->d_sb;
7413 + dinfo = au_di_alloc(sb, AuLsc_DI_CHILD);
7415 + atomic_set(&dinfo->di_generation, au_sigen(sb));
7416 + /* smp_mb(); */ /* atomic_set */
7417 + dentry->d_fsdata = dinfo;
7424 +void au_di_fin(struct dentry *dentry)
7426 + struct au_dinfo *dinfo;
7428 + dinfo = au_di(dentry);
7429 + AuRwDestroy(&dinfo->di_rwsem);
7430 + au_di_free(dinfo);
7433 +int au_di_realloc(struct au_dinfo *dinfo, int nbr)
7436 + struct au_hdentry *hdp;
7438 + AuRwMustWriteLock(&dinfo->di_rwsem);
7441 + sz = sizeof(*hdp) * (dinfo->di_bend + 1);
7443 + sz = sizeof(*hdp);
7444 + hdp = au_kzrealloc(dinfo->di_hdentry, sz, sizeof(*hdp) * nbr, GFP_NOFS);
7446 + dinfo->di_hdentry = hdp;
7453 +/* ---------------------------------------------------------------------- */
7455 +static void do_ii_write_lock(struct inode *inode, unsigned int lsc)
7458 + case AuLsc_DI_CHILD:
7459 + ii_write_lock_child(inode);
7461 + case AuLsc_DI_CHILD2:
7462 + ii_write_lock_child2(inode);
7464 + case AuLsc_DI_CHILD3:
7465 + ii_write_lock_child3(inode);
7467 + case AuLsc_DI_PARENT:
7468 + ii_write_lock_parent(inode);
7470 + case AuLsc_DI_PARENT2:
7471 + ii_write_lock_parent2(inode);
7473 + case AuLsc_DI_PARENT3:
7474 + ii_write_lock_parent3(inode);
7481 +static void do_ii_read_lock(struct inode *inode, unsigned int lsc)
7484 + case AuLsc_DI_CHILD:
7485 + ii_read_lock_child(inode);
7487 + case AuLsc_DI_CHILD2:
7488 + ii_read_lock_child2(inode);
7490 + case AuLsc_DI_CHILD3:
7491 + ii_read_lock_child3(inode);
7493 + case AuLsc_DI_PARENT:
7494 + ii_read_lock_parent(inode);
7496 + case AuLsc_DI_PARENT2:
7497 + ii_read_lock_parent2(inode);
7499 + case AuLsc_DI_PARENT3:
7500 + ii_read_lock_parent3(inode);
7507 +void di_read_lock(struct dentry *d, int flags, unsigned int lsc)
7509 + au_rw_read_lock_nested(&au_di(d)->di_rwsem, lsc);
7511 + if (au_ftest_lock(flags, IW))
7512 + do_ii_write_lock(d->d_inode, lsc);
7513 + else if (au_ftest_lock(flags, IR))
7514 + do_ii_read_lock(d->d_inode, lsc);
7518 +void di_read_unlock(struct dentry *d, int flags)
7521 + if (au_ftest_lock(flags, IW)) {
7522 + au_dbg_verify_dinode(d);
7523 + ii_write_unlock(d->d_inode);
7524 + } else if (au_ftest_lock(flags, IR)) {
7525 + au_dbg_verify_dinode(d);
7526 + ii_read_unlock(d->d_inode);
7529 + au_rw_read_unlock(&au_di(d)->di_rwsem);
7532 +void di_downgrade_lock(struct dentry *d, int flags)
7534 + if (d->d_inode && au_ftest_lock(flags, IR))
7535 + ii_downgrade_lock(d->d_inode);
7536 + au_rw_dgrade_lock(&au_di(d)->di_rwsem);
7539 +void di_write_lock(struct dentry *d, unsigned int lsc)
7541 + au_rw_write_lock_nested(&au_di(d)->di_rwsem, lsc);
7543 + do_ii_write_lock(d->d_inode, lsc);
7546 +void di_write_unlock(struct dentry *d)
7548 + au_dbg_verify_dinode(d);
7550 + ii_write_unlock(d->d_inode);
7551 + au_rw_write_unlock(&au_di(d)->di_rwsem);
7554 +void di_write_lock2_child(struct dentry *d1, struct dentry *d2, int isdir)
7556 + AuDebugOn(d1 == d2
7557 + || d1->d_inode == d2->d_inode
7558 + || d1->d_sb != d2->d_sb);
7560 + if (isdir && au_test_subdir(d1, d2)) {
7561 + di_write_lock_child(d1);
7562 + di_write_lock_child2(d2);
7564 + /* there should be no races */
7565 + di_write_lock_child(d2);
7566 + di_write_lock_child2(d1);
7570 +void di_write_lock2_parent(struct dentry *d1, struct dentry *d2, int isdir)
7572 + AuDebugOn(d1 == d2
7573 + || d1->d_inode == d2->d_inode
7574 + || d1->d_sb != d2->d_sb);
7576 + if (isdir && au_test_subdir(d1, d2)) {
7577 + di_write_lock_parent(d1);
7578 + di_write_lock_parent2(d2);
7580 + /* there should be no races */
7581 + di_write_lock_parent(d2);
7582 + di_write_lock_parent2(d1);
7586 +void di_write_unlock2(struct dentry *d1, struct dentry *d2)
7588 + di_write_unlock(d1);
7589 + if (d1->d_inode == d2->d_inode)
7590 + au_rw_write_unlock(&au_di(d2)->di_rwsem);
7592 + di_write_unlock(d2);
7595 +/* ---------------------------------------------------------------------- */
7597 +struct dentry *au_h_dptr(struct dentry *dentry, aufs_bindex_t bindex)
7601 + DiMustAnyLock(dentry);
7603 + if (au_dbstart(dentry) < 0 || bindex < au_dbstart(dentry))
7605 + AuDebugOn(bindex < 0);
7606 + d = au_di(dentry)->di_hdentry[0 + bindex].hd_dentry;
7607 + AuDebugOn(d && d->d_count <= 0);
7612 + * extended version of au_h_dptr().
7613 + * returns a hashed and positive h_dentry in bindex, NULL, or error.
7615 +struct dentry *au_h_d_alias(struct dentry *dentry, aufs_bindex_t bindex)
7617 + struct dentry *h_dentry;
7618 + struct inode *inode, *h_inode;
7620 + inode = dentry->d_inode;
7621 + AuDebugOn(!inode);
7624 + if (au_dbstart(dentry) <= bindex
7625 + && bindex <= au_dbend(dentry))
7626 + h_dentry = au_h_dptr(dentry, bindex);
7627 + if (h_dentry && !au_d_hashed_positive(h_dentry)) {
7629 + goto out; /* success */
7632 + AuDebugOn(bindex < au_ibstart(inode));
7633 + AuDebugOn(au_ibend(inode) < bindex);
7634 + h_inode = au_h_iptr(inode, bindex);
7635 + h_dentry = d_find_alias(h_inode);
7637 + if (!IS_ERR(h_dentry)) {
7638 + if (!au_d_hashed_positive(h_dentry))
7639 + goto out; /* success */
7645 + if (au_opt_test(au_mntflags(dentry->d_sb), PLINK)) {
7646 + h_dentry = au_plink_lkup(inode, bindex);
7647 + AuDebugOn(!h_dentry);
7648 + if (!IS_ERR(h_dentry)) {
7649 + if (!au_d_hashed_positive(h_dentry))
7650 + goto out; /* success */
7657 + AuDbgDentry(h_dentry);
7661 +aufs_bindex_t au_dbtail(struct dentry *dentry)
7663 + aufs_bindex_t bend, bwh;
7665 + bend = au_dbend(dentry);
7667 + bwh = au_dbwh(dentry);
7670 + if (0 < bwh && bwh < bend)
7676 +aufs_bindex_t au_dbtaildir(struct dentry *dentry)
7678 + aufs_bindex_t bend, bopq;
7680 + bend = au_dbtail(dentry);
7682 + bopq = au_dbdiropq(dentry);
7683 + if (0 <= bopq && bopq < bend)
7689 +/* ---------------------------------------------------------------------- */
7691 +void au_set_h_dptr(struct dentry *dentry, aufs_bindex_t bindex,
7692 + struct dentry *h_dentry)
7694 + struct au_hdentry *hd = au_di(dentry)->di_hdentry + bindex;
7695 + struct au_branch *br;
7697 + DiMustWriteLock(dentry);
7700 + hd->hd_dentry = h_dentry;
7702 + br = au_sbr(dentry->d_sb, bindex);
7703 + hd->hd_id = br->br_id;
7707 +int au_dbrange_test(struct dentry *dentry)
7710 + aufs_bindex_t bstart, bend;
7713 + bstart = au_dbstart(dentry);
7714 + bend = au_dbend(dentry);
7716 + AuDebugOn(bend < 0 && bstart > bend);
7719 + AuDebugOn(bend >= 0);
7725 +int au_digen_test(struct dentry *dentry, unsigned int sigen)
7730 + if (unlikely(au_digen(dentry) != sigen
7731 + || au_iigen_test(dentry->d_inode, sigen)))
7737 +void au_update_digen(struct dentry *dentry)
7739 + atomic_set(&au_di(dentry)->di_generation, au_sigen(dentry->d_sb));
7740 + /* smp_mb(); */ /* atomic_set */
7743 +void au_update_dbrange(struct dentry *dentry, int do_put_zero)
7745 + struct au_dinfo *dinfo;
7746 + struct dentry *h_d;
7747 + struct au_hdentry *hdp;
7749 + DiMustWriteLock(dentry);
7751 + dinfo = au_di(dentry);
7752 + if (!dinfo || dinfo->di_bstart < 0)
7755 + hdp = dinfo->di_hdentry;
7756 + if (do_put_zero) {
7757 + aufs_bindex_t bindex, bend;
7759 + bend = dinfo->di_bend;
7760 + for (bindex = dinfo->di_bstart; bindex <= bend; bindex++) {
7761 + h_d = hdp[0 + bindex].hd_dentry;
7762 + if (h_d && !h_d->d_inode)
7763 + au_set_h_dptr(dentry, bindex, NULL);
7767 + dinfo->di_bstart = -1;
7768 + while (++dinfo->di_bstart <= dinfo->di_bend)
7769 + if (hdp[0 + dinfo->di_bstart].hd_dentry)
7771 + if (dinfo->di_bstart > dinfo->di_bend) {
7772 + dinfo->di_bstart = -1;
7773 + dinfo->di_bend = -1;
7778 + while (0 <= --dinfo->di_bend)
7779 + if (hdp[0 + dinfo->di_bend].hd_dentry)
7781 + AuDebugOn(dinfo->di_bstart > dinfo->di_bend || dinfo->di_bend < 0);
7784 +void au_update_dbstart(struct dentry *dentry)
7786 + aufs_bindex_t bindex, bend;
7787 + struct dentry *h_dentry;
7789 + bend = au_dbend(dentry);
7790 + for (bindex = au_dbstart(dentry); bindex <= bend; bindex++) {
7791 + h_dentry = au_h_dptr(dentry, bindex);
7794 + if (h_dentry->d_inode) {
7795 + au_set_dbstart(dentry, bindex);
7798 + au_set_h_dptr(dentry, bindex, NULL);
7802 +void au_update_dbend(struct dentry *dentry)
7804 + aufs_bindex_t bindex, bstart;
7805 + struct dentry *h_dentry;
7807 + bstart = au_dbstart(dentry);
7808 + for (bindex = au_dbend(dentry); bindex >= bstart; bindex--) {
7809 + h_dentry = au_h_dptr(dentry, bindex);
7812 + if (h_dentry->d_inode) {
7813 + au_set_dbend(dentry, bindex);
7816 + au_set_h_dptr(dentry, bindex, NULL);
7820 +int au_find_dbindex(struct dentry *dentry, struct dentry *h_dentry)
7822 + aufs_bindex_t bindex, bend;
7824 + bend = au_dbend(dentry);
7825 + for (bindex = au_dbstart(dentry); bindex <= bend; bindex++)
7826 + if (au_h_dptr(dentry, bindex) == h_dentry)
7830 diff -urN /usr/share/empty/fs/aufs/dir.c linux/fs/aufs/dir.c
7831 --- /usr/share/empty/fs/aufs/dir.c 1970-01-01 01:00:00.000000000 +0100
7832 +++ linux/fs/aufs/dir.c 2012-02-13 21:54:56.969771692 +0100
7835 + * Copyright (C) 2005-2012 Junjiro R. Okajima
7837 + * This program, aufs is free software; you can redistribute it and/or modify
7838 + * it under the terms of the GNU General Public License as published by
7839 + * the Free Software Foundation; either version 2 of the License, or
7840 + * (at your option) any later version.
7842 + * This program is distributed in the hope that it will be useful,
7843 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
7844 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
7845 + * GNU General Public License for more details.
7847 + * You should have received a copy of the GNU General Public License
7848 + * along with this program; if not, write to the Free Software
7849 + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
7853 + * directory operations
7856 +#include <linux/fs_stack.h>
7859 +void au_add_nlink(struct inode *dir, struct inode *h_dir)
7861 + unsigned int nlink;
7863 + AuDebugOn(!S_ISDIR(dir->i_mode) || !S_ISDIR(h_dir->i_mode));
7865 + nlink = dir->i_nlink;
7866 + nlink += h_dir->i_nlink - 2;
7867 + if (h_dir->i_nlink < 2)
7869 + set_nlink(dir, nlink);
7872 +void au_sub_nlink(struct inode *dir, struct inode *h_dir)
7874 + unsigned int nlink;
7876 + AuDebugOn(!S_ISDIR(dir->i_mode) || !S_ISDIR(h_dir->i_mode));
7878 + nlink = dir->i_nlink;
7879 + nlink -= h_dir->i_nlink - 2;
7880 + if (h_dir->i_nlink < 2)
7882 + set_nlink(dir, nlink);
7885 +loff_t au_dir_size(struct file *file, struct dentry *dentry)
7888 + aufs_bindex_t bindex, bend;
7889 + struct file *h_file;
7890 + struct dentry *h_dentry;
7894 + AuDebugOn(!file->f_dentry);
7895 + AuDebugOn(!file->f_dentry->d_inode);
7896 + AuDebugOn(!S_ISDIR(file->f_dentry->d_inode->i_mode));
7898 + bend = au_fbend_dir(file);
7899 + for (bindex = au_fbstart(file);
7900 + bindex <= bend && sz < KMALLOC_MAX_SIZE;
7902 + h_file = au_hf_dir(file, bindex);
7904 + && h_file->f_dentry
7905 + && h_file->f_dentry->d_inode)
7906 + sz += i_size_read(h_file->f_dentry->d_inode);
7909 + AuDebugOn(!dentry);
7910 + AuDebugOn(!dentry->d_inode);
7911 + AuDebugOn(!S_ISDIR(dentry->d_inode->i_mode));
7913 + bend = au_dbtaildir(dentry);
7914 + for (bindex = au_dbstart(dentry);
7915 + bindex <= bend && sz < KMALLOC_MAX_SIZE;
7917 + h_dentry = au_h_dptr(dentry, bindex);
7918 + if (h_dentry && h_dentry->d_inode)
7919 + sz += i_size_read(h_dentry->d_inode);
7922 + if (sz < KMALLOC_MAX_SIZE)
7923 + sz = roundup_pow_of_two(sz);
7924 + if (sz > KMALLOC_MAX_SIZE)
7925 + sz = KMALLOC_MAX_SIZE;
7926 + else if (sz < NAME_MAX) {
7927 + BUILD_BUG_ON(AUFS_RDBLK_DEF < NAME_MAX);
7928 + sz = AUFS_RDBLK_DEF;
7933 +/* ---------------------------------------------------------------------- */
7935 +static int reopen_dir(struct file *file)
7938 + unsigned int flags;
7939 + aufs_bindex_t bindex, btail, bstart;
7940 + struct dentry *dentry, *h_dentry;
7941 + struct file *h_file;
7943 + /* open all lower dirs */
7944 + dentry = file->f_dentry;
7945 + bstart = au_dbstart(dentry);
7946 + for (bindex = au_fbstart(file); bindex < bstart; bindex++)
7947 + au_set_h_fptr(file, bindex, NULL);
7948 + au_set_fbstart(file, bstart);
7950 + btail = au_dbtaildir(dentry);
7951 + for (bindex = au_fbend_dir(file); btail < bindex; bindex--)
7952 + au_set_h_fptr(file, bindex, NULL);
7953 + au_set_fbend_dir(file, btail);
7955 + flags = vfsub_file_flags(file);
7956 + for (bindex = bstart; bindex <= btail; bindex++) {
7957 + h_dentry = au_h_dptr(dentry, bindex);
7960 + h_file = au_hf_dir(file, bindex);
7964 + h_file = au_h_open(dentry, bindex, flags, file);
7965 + err = PTR_ERR(h_file);
7966 + if (IS_ERR(h_file))
7967 + goto out; /* close all? */
7968 + au_set_h_fptr(file, bindex, h_file);
7970 + au_update_figen(file);
7971 + /* todo: necessary? */
7972 + /* file->f_ra = h_file->f_ra; */
7979 +static int do_open_dir(struct file *file, int flags)
7982 + aufs_bindex_t bindex, btail;
7983 + struct dentry *dentry, *h_dentry;
7984 + struct file *h_file;
7986 + FiMustWriteLock(file);
7988 + dentry = file->f_dentry;
7989 + err = au_alive_dir(dentry);
7990 + if (unlikely(err))
7993 + file->f_version = dentry->d_inode->i_version;
7994 + bindex = au_dbstart(dentry);
7995 + au_set_fbstart(file, bindex);
7996 + btail = au_dbtaildir(dentry);
7997 + au_set_fbend_dir(file, btail);
7998 + for (; !err && bindex <= btail; bindex++) {
7999 + h_dentry = au_h_dptr(dentry, bindex);
8003 + h_file = au_h_open(dentry, bindex, flags, file);
8004 + if (IS_ERR(h_file)) {
8005 + err = PTR_ERR(h_file);
8008 + au_set_h_fptr(file, bindex, h_file);
8010 + au_update_figen(file);
8011 + /* todo: necessary? */
8012 + /* file->f_ra = h_file->f_ra; */
8014 + return 0; /* success */
8017 + for (bindex = au_fbstart(file); bindex <= btail; bindex++)
8018 + au_set_h_fptr(file, bindex, NULL);
8019 + au_set_fbstart(file, -1);
8020 + au_set_fbend_dir(file, -1);
8026 +static int aufs_open_dir(struct inode *inode __maybe_unused,
8027 + struct file *file)
8030 + struct super_block *sb;
8031 + struct au_fidir *fidir;
8034 + sb = file->f_dentry->d_sb;
8035 + si_read_lock(sb, AuLock_FLUSH);
8036 + fidir = au_fidir_alloc(sb);
8038 + err = au_do_open(file, do_open_dir, fidir);
8039 + if (unlikely(err))
8042 + si_read_unlock(sb);
8046 +static int aufs_release_dir(struct inode *inode __maybe_unused,
8047 + struct file *file)
8049 + struct au_vdir *vdir_cache;
8050 + struct au_finfo *finfo;
8051 + struct au_fidir *fidir;
8052 + aufs_bindex_t bindex, bend;
8054 + finfo = au_fi(file);
8055 + fidir = finfo->fi_hdir;
8057 + /* remove me from sb->s_files */
8058 + file_sb_list_del(file);
8060 + vdir_cache = fidir->fd_vdir_cache; /* lock-free */
8062 + au_vdir_free(vdir_cache);
8064 + bindex = finfo->fi_btop;
8065 + if (bindex >= 0) {
8067 + * calls fput() instead of filp_close(),
8068 + * since no dnotify or lock for the lower file.
8070 + bend = fidir->fd_bbot;
8071 + for (; bindex <= bend; bindex++)
8072 + au_set_h_fptr(file, bindex, NULL);
8075 + finfo->fi_hdir = NULL;
8077 + au_finfo_fin(file);
8081 +/* ---------------------------------------------------------------------- */
8083 +static int au_do_flush_dir(struct file *file, fl_owner_t id)
8086 + aufs_bindex_t bindex, bend;
8087 + struct file *h_file;
8090 + bend = au_fbend_dir(file);
8091 + for (bindex = au_fbstart(file); !err && bindex <= bend; bindex++) {
8092 + h_file = au_hf_dir(file, bindex);
8094 + err = vfsub_flush(h_file, id);
8099 +static int aufs_flush_dir(struct file *file, fl_owner_t id)
8101 + return au_do_flush(file, id, au_do_flush_dir);
8104 +/* ---------------------------------------------------------------------- */
8106 +static int au_do_fsync_dir_no_file(struct dentry *dentry, int datasync)
8109 + aufs_bindex_t bend, bindex;
8110 + struct inode *inode;
8111 + struct super_block *sb;
8114 + sb = dentry->d_sb;
8115 + inode = dentry->d_inode;
8117 + bend = au_dbend(dentry);
8118 + for (bindex = au_dbstart(dentry); !err && bindex <= bend; bindex++) {
8119 + struct path h_path;
8121 + if (au_test_ro(sb, bindex, inode))
8123 + h_path.dentry = au_h_dptr(dentry, bindex);
8124 + if (!h_path.dentry)
8127 + h_path.mnt = au_sbr_mnt(sb, bindex);
8128 + err = vfsub_fsync(NULL, &h_path, datasync);
8134 +static int au_do_fsync_dir(struct file *file, int datasync)
8137 + aufs_bindex_t bend, bindex;
8138 + struct file *h_file;
8139 + struct super_block *sb;
8140 + struct inode *inode;
8142 + err = au_reval_and_lock_fdi(file, reopen_dir, /*wlock*/1);
8143 + if (unlikely(err))
8146 + sb = file->f_dentry->d_sb;
8147 + inode = file->f_dentry->d_inode;
8148 + bend = au_fbend_dir(file);
8149 + for (bindex = au_fbstart(file); !err && bindex <= bend; bindex++) {
8150 + h_file = au_hf_dir(file, bindex);
8151 + if (!h_file || au_test_ro(sb, bindex, inode))
8154 + err = vfsub_fsync(h_file, &h_file->f_path, datasync);
8162 + * @file may be NULL
8164 +static int aufs_fsync_dir(struct file *file, loff_t start, loff_t end,
8168 + struct dentry *dentry;
8169 + struct super_block *sb;
8170 + struct mutex *mtx;
8173 + dentry = file->f_dentry;
8174 + mtx = &dentry->d_inode->i_mutex;
8176 + sb = dentry->d_sb;
8177 + si_noflush_read_lock(sb);
8179 + err = au_do_fsync_dir(file, datasync);
8181 + di_write_lock_child(dentry);
8182 + err = au_do_fsync_dir_no_file(dentry, datasync);
8184 + au_cpup_attr_timesizes(dentry->d_inode);
8185 + di_write_unlock(dentry);
8187 + fi_write_unlock(file);
8189 + si_read_unlock(sb);
8190 + mutex_unlock(mtx);
8194 +/* ---------------------------------------------------------------------- */
8196 +static int aufs_readdir(struct file *file, void *dirent, filldir_t filldir)
8199 + struct dentry *dentry;
8200 + struct inode *inode, *h_inode;
8201 + struct super_block *sb;
8203 + dentry = file->f_dentry;
8204 + inode = dentry->d_inode;
8207 + sb = dentry->d_sb;
8208 + si_read_lock(sb, AuLock_FLUSH);
8209 + err = au_reval_and_lock_fdi(file, reopen_dir, /*wlock*/1);
8210 + if (unlikely(err))
8212 + err = au_alive_dir(dentry);
8214 + err = au_vdir_init(file);
8215 + di_downgrade_lock(dentry, AuLock_IR);
8216 + if (unlikely(err))
8219 + h_inode = au_h_iptr(inode, au_ibstart(inode));
8220 + if (!au_test_nfsd()) {
8221 + err = au_vdir_fill_de(file, dirent, filldir);
8222 + fsstack_copy_attr_atime(inode, h_inode);
8225 + * nfsd filldir may call lookup_one_len(), vfs_getattr(),
8226 + * encode_fh() and others.
8228 + atomic_inc(&h_inode->i_count);
8229 + di_read_unlock(dentry, AuLock_IR);
8230 + si_read_unlock(sb);
8231 + err = au_vdir_fill_de(file, dirent, filldir);
8232 + fsstack_copy_attr_atime(inode, h_inode);
8233 + fi_write_unlock(file);
8241 + di_read_unlock(dentry, AuLock_IR);
8242 + fi_write_unlock(file);
8244 + si_read_unlock(sb);
8248 +/* ---------------------------------------------------------------------- */
8250 +#define AuTestEmpty_WHONLY 1
8251 +#define AuTestEmpty_CALLED (1 << 1)
8252 +#define AuTestEmpty_SHWH (1 << 2)
8253 +#define au_ftest_testempty(flags, name) ((flags) & AuTestEmpty_##name)
8254 +#define au_fset_testempty(flags, name) \
8255 + do { (flags) |= AuTestEmpty_##name; } while (0)
8256 +#define au_fclr_testempty(flags, name) \
8257 + do { (flags) &= ~AuTestEmpty_##name; } while (0)
8259 +#ifndef CONFIG_AUFS_SHWH
8260 +#undef AuTestEmpty_SHWH
8261 +#define AuTestEmpty_SHWH 0
8264 +struct test_empty_arg {
8265 + struct au_nhash *whlist;
8266 + unsigned int flags;
8268 + aufs_bindex_t bindex;
8271 +static int test_empty_cb(void *__arg, const char *__name, int namelen,
8272 + loff_t offset __maybe_unused, u64 ino,
8273 + unsigned int d_type)
8275 + struct test_empty_arg *arg = __arg;
8276 + char *name = (void *)__name;
8279 + au_fset_testempty(arg->flags, CALLED);
8281 + if (name[0] == '.'
8282 + && (namelen == 1 || (name[1] == '.' && namelen == 2)))
8283 + goto out; /* success */
8285 + if (namelen <= AUFS_WH_PFX_LEN
8286 + || memcmp(name, AUFS_WH_PFX, AUFS_WH_PFX_LEN)) {
8287 + if (au_ftest_testempty(arg->flags, WHONLY)
8288 + && !au_nhash_test_known_wh(arg->whlist, name, namelen))
8289 + arg->err = -ENOTEMPTY;
8293 + name += AUFS_WH_PFX_LEN;
8294 + namelen -= AUFS_WH_PFX_LEN;
8295 + if (!au_nhash_test_known_wh(arg->whlist, name, namelen))
8296 + arg->err = au_nhash_append_wh
8297 + (arg->whlist, name, namelen, ino, d_type, arg->bindex,
8298 + au_ftest_testempty(arg->flags, SHWH));
8302 + AuTraceErr(arg->err);
8306 +static int do_test_empty(struct dentry *dentry, struct test_empty_arg *arg)
8309 + struct file *h_file;
8311 + h_file = au_h_open(dentry, arg->bindex,
8312 + O_RDONLY | O_NONBLOCK | O_DIRECTORY | O_LARGEFILE,
8314 + err = PTR_ERR(h_file);
8315 + if (IS_ERR(h_file))
8319 + if (!au_opt_test(au_mntflags(dentry->d_sb), UDBA_NONE)
8320 + && !h_file->f_dentry->d_inode->i_nlink)
8325 + au_fclr_testempty(arg->flags, CALLED);
8327 + err = vfsub_readdir(h_file, test_empty_cb, arg);
8330 + } while (!err && au_ftest_testempty(arg->flags, CALLED));
8334 + au_sbr_put(dentry->d_sb, arg->bindex);
8339 +struct do_test_empty_args {
8341 + struct dentry *dentry;
8342 + struct test_empty_arg *arg;
8345 +static void call_do_test_empty(void *args)
8347 + struct do_test_empty_args *a = args;
8348 + *a->errp = do_test_empty(a->dentry, a->arg);
8351 +static int sio_test_empty(struct dentry *dentry, struct test_empty_arg *arg)
8354 + struct dentry *h_dentry;
8355 + struct inode *h_inode;
8357 + h_dentry = au_h_dptr(dentry, arg->bindex);
8358 + h_inode = h_dentry->d_inode;
8359 + /* todo: i_mode changes anytime? */
8360 + mutex_lock_nested(&h_inode->i_mutex, AuLsc_I_CHILD);
8361 + err = au_test_h_perm_sio(h_inode, MAY_EXEC | MAY_READ);
8362 + mutex_unlock(&h_inode->i_mutex);
8364 + err = do_test_empty(dentry, arg);
8366 + struct do_test_empty_args args = {
8371 + unsigned int flags = arg->flags;
8373 + wkq_err = au_wkq_wait(call_do_test_empty, &args);
8374 + if (unlikely(wkq_err))
8376 + arg->flags = flags;
8382 +int au_test_empty_lower(struct dentry *dentry)
8385 + unsigned int rdhash;
8386 + aufs_bindex_t bindex, bstart, btail;
8387 + struct au_nhash whlist;
8388 + struct test_empty_arg arg;
8390 + SiMustAnyLock(dentry->d_sb);
8392 + rdhash = au_sbi(dentry->d_sb)->si_rdhash;
8394 + rdhash = au_rdhash_est(au_dir_size(/*file*/NULL, dentry));
8395 + err = au_nhash_alloc(&whlist, rdhash, GFP_NOFS);
8396 + if (unlikely(err))
8400 + arg.whlist = &whlist;
8401 + bstart = au_dbstart(dentry);
8402 + if (au_opt_test(au_mntflags(dentry->d_sb), SHWH))
8403 + au_fset_testempty(arg.flags, SHWH);
8404 + arg.bindex = bstart;
8405 + err = do_test_empty(dentry, &arg);
8406 + if (unlikely(err))
8409 + au_fset_testempty(arg.flags, WHONLY);
8410 + btail = au_dbtaildir(dentry);
8411 + for (bindex = bstart + 1; !err && bindex <= btail; bindex++) {
8412 + struct dentry *h_dentry;
8414 + h_dentry = au_h_dptr(dentry, bindex);
8415 + if (h_dentry && h_dentry->d_inode) {
8416 + arg.bindex = bindex;
8417 + err = do_test_empty(dentry, &arg);
8422 + au_nhash_wh_free(&whlist);
8427 +int au_test_empty(struct dentry *dentry, struct au_nhash *whlist)
8430 + struct test_empty_arg arg;
8431 + aufs_bindex_t bindex, btail;
8434 + arg.whlist = whlist;
8435 + arg.flags = AuTestEmpty_WHONLY;
8436 + if (au_opt_test(au_mntflags(dentry->d_sb), SHWH))
8437 + au_fset_testempty(arg.flags, SHWH);
8438 + btail = au_dbtaildir(dentry);
8439 + for (bindex = au_dbstart(dentry); !err && bindex <= btail; bindex++) {
8440 + struct dentry *h_dentry;
8442 + h_dentry = au_h_dptr(dentry, bindex);
8443 + if (h_dentry && h_dentry->d_inode) {
8444 + arg.bindex = bindex;
8445 + err = sio_test_empty(dentry, &arg);
8452 +/* ---------------------------------------------------------------------- */
8454 +const struct file_operations aufs_dir_fop = {
8455 + .owner = THIS_MODULE,
8456 + .llseek = default_llseek,
8457 + .read = generic_read_dir,
8458 + .readdir = aufs_readdir,
8459 + .unlocked_ioctl = aufs_ioctl_dir,
8460 +#ifdef CONFIG_COMPAT
8461 + .compat_ioctl = aufs_compat_ioctl_dir,
8463 + .open = aufs_open_dir,
8464 + .release = aufs_release_dir,
8465 + .flush = aufs_flush_dir,
8466 + .fsync = aufs_fsync_dir
8468 diff -urN /usr/share/empty/fs/aufs/dir.h linux/fs/aufs/dir.h
8469 --- /usr/share/empty/fs/aufs/dir.h 1970-01-01 01:00:00.000000000 +0100
8470 +++ linux/fs/aufs/dir.h 2012-02-13 21:54:56.969771692 +0100
8473 + * Copyright (C) 2005-2012 Junjiro R. Okajima
8475 + * This program, aufs is free software; you can redistribute it and/or modify
8476 + * it under the terms of the GNU General Public License as published by
8477 + * the Free Software Foundation; either version 2 of the License, or
8478 + * (at your option) any later version.
8480 + * This program is distributed in the hope that it will be useful,
8481 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
8482 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
8483 + * GNU General Public License for more details.
8485 + * You should have received a copy of the GNU General Public License
8486 + * along with this program; if not, write to the Free Software
8487 + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
8491 + * directory operations
8494 +#ifndef __AUFS_DIR_H__
8495 +#define __AUFS_DIR_H__
8499 +#include <linux/fs.h>
8501 +/* ---------------------------------------------------------------------- */
8503 +/* need to be faster and smaller */
8506 + unsigned int nh_num;
8507 + struct hlist_head *nh_head;
8510 +struct au_vdir_destr {
8511 + unsigned char len;
8512 + unsigned char name[0];
8515 +struct au_vdir_dehstr {
8516 + struct hlist_node hash;
8517 + struct au_vdir_destr *str;
8518 +} ____cacheline_aligned_in_smp;
8520 +struct au_vdir_de {
8522 + unsigned char de_type;
8523 + /* caution: packed */
8524 + struct au_vdir_destr de_str;
8527 +struct au_vdir_wh {
8528 + struct hlist_node wh_hash;
8529 +#ifdef CONFIG_AUFS_SHWH
8531 + aufs_bindex_t wh_bindex;
8532 + unsigned char wh_type;
8534 + aufs_bindex_t wh_bindex;
8536 + /* caution: packed */
8537 + struct au_vdir_destr wh_str;
8540 +union au_vdir_deblk_p {
8541 + unsigned char *deblk;
8542 + struct au_vdir_de *de;
8546 + unsigned char **vd_deblk;
8547 + unsigned long vd_nblk;
8550 + union au_vdir_deblk_p p;
8553 + unsigned long vd_version;
8554 + unsigned int vd_deblk_sz;
8555 + unsigned long vd_jiffy;
8556 +} ____cacheline_aligned_in_smp;
8558 +/* ---------------------------------------------------------------------- */
8561 +extern const struct file_operations aufs_dir_fop;
8562 +void au_add_nlink(struct inode *dir, struct inode *h_dir);
8563 +void au_sub_nlink(struct inode *dir, struct inode *h_dir);
8564 +loff_t au_dir_size(struct file *file, struct dentry *dentry);
8565 +int au_test_empty_lower(struct dentry *dentry);
8566 +int au_test_empty(struct dentry *dentry, struct au_nhash *whlist);
8569 +unsigned int au_rdhash_est(loff_t sz);
8570 +int au_nhash_alloc(struct au_nhash *nhash, unsigned int num_hash, gfp_t gfp);
8571 +void au_nhash_wh_free(struct au_nhash *whlist);
8572 +int au_nhash_test_longer_wh(struct au_nhash *whlist, aufs_bindex_t btgt,
8574 +int au_nhash_test_known_wh(struct au_nhash *whlist, char *name, int nlen);
8575 +int au_nhash_append_wh(struct au_nhash *whlist, char *name, int nlen, ino_t ino,
8576 + unsigned int d_type, aufs_bindex_t bindex,
8577 + unsigned char shwh);
8578 +void au_vdir_free(struct au_vdir *vdir);
8579 +int au_vdir_init(struct file *file);
8580 +int au_vdir_fill_de(struct file *file, void *dirent, filldir_t filldir);
8583 +long aufs_ioctl_dir(struct file *file, unsigned int cmd, unsigned long arg);
8585 +#ifdef CONFIG_AUFS_RDU
8587 +long au_rdu_ioctl(struct file *file, unsigned int cmd, unsigned long arg);
8588 +#ifdef CONFIG_COMPAT
8589 +long au_rdu_compat_ioctl(struct file *file, unsigned int cmd,
8590 + unsigned long arg);
8593 +static inline long au_rdu_ioctl(struct file *file, unsigned int cmd,
8594 + unsigned long arg)
8598 +#ifdef CONFIG_COMPAT
8599 +static inline long au_rdu_compat_ioctl(struct file *file, unsigned int cmd,
8600 + unsigned long arg)
8607 +#endif /* __KERNEL__ */
8608 +#endif /* __AUFS_DIR_H__ */
8609 diff -urN /usr/share/empty/fs/aufs/dynop.c linux/fs/aufs/dynop.c
8610 --- /usr/share/empty/fs/aufs/dynop.c 1970-01-01 01:00:00.000000000 +0100
8611 +++ linux/fs/aufs/dynop.c 2012-02-13 21:54:56.969771692 +0100
8614 + * Copyright (C) 2010-2012 Junjiro R. Okajima
8616 + * This program, aufs is free software; you can redistribute it and/or modify
8617 + * it under the terms of the GNU General Public License as published by
8618 + * the Free Software Foundation; either version 2 of the License, or
8619 + * (at your option) any later version.
8621 + * This program is distributed in the hope that it will be useful,
8622 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
8623 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
8624 + * GNU General Public License for more details.
8626 + * You should have received a copy of the GNU General Public License
8627 + * along with this program; if not, write to the Free Software
8628 + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
8632 + * dynamically customizable operations for regular files
8637 +#define DyPrSym(key) AuDbgSym(key->dk_op.dy_hop)
8640 + * How large will these lists be?
8641 + * Usually just a few elements, 20-30 at most for each, I guess.
8643 +static struct au_splhead dynop[AuDyLast];
8645 +static struct au_dykey *dy_gfind_get(struct au_splhead *spl, const void *h_op)
8647 + struct au_dykey *key, *tmp;
8648 + struct list_head *head;
8651 + head = &spl->head;
8653 + list_for_each_entry_rcu(tmp, head, dk_list)
8654 + if (tmp->dk_op.dy_hop == h_op) {
8656 + kref_get(&key->dk_kref);
8659 + rcu_read_unlock();
8664 +static struct au_dykey *dy_bradd(struct au_branch *br, struct au_dykey *key)
8666 + struct au_dykey **k, *found;
8667 + const void *h_op = key->dk_op.dy_hop;
8672 + for (i = 0; i < AuBrDynOp; i++)
8674 + if (k[i]->dk_op.dy_hop == h_op) {
8681 + spin_lock(&br->br_dykey_lock);
8682 + for (; i < AuBrDynOp; i++)
8684 + if (k[i]->dk_op.dy_hop == h_op) {
8692 + spin_unlock(&br->br_dykey_lock);
8693 + BUG_ON(i == AuBrDynOp); /* expand the array */
8699 +/* kref_get() if @key is already added */
8700 +static struct au_dykey *dy_gadd(struct au_splhead *spl, struct au_dykey *key)
8702 + struct au_dykey *tmp, *found;
8703 + struct list_head *head;
8704 + const void *h_op = key->dk_op.dy_hop;
8707 + head = &spl->head;
8708 + spin_lock(&spl->spin);
8709 + list_for_each_entry(tmp, head, dk_list)
8710 + if (tmp->dk_op.dy_hop == h_op) {
8711 + kref_get(&tmp->dk_kref);
8716 + list_add_rcu(&key->dk_list, head);
8717 + spin_unlock(&spl->spin);
8724 +static void dy_free_rcu(struct rcu_head *rcu)
8726 + struct au_dykey *key;
8728 + key = container_of(rcu, struct au_dykey, dk_rcu);
8733 +static void dy_free(struct kref *kref)
8735 + struct au_dykey *key;
8736 + struct au_splhead *spl;
8738 + key = container_of(kref, struct au_dykey, dk_kref);
8739 + spl = dynop + key->dk_op.dy_type;
8740 + au_spl_del_rcu(&key->dk_list, spl);
8741 + call_rcu(&key->dk_rcu, dy_free_rcu);
8744 +void au_dy_put(struct au_dykey *key)
8746 + kref_put(&key->dk_kref, dy_free);
8749 +/* ---------------------------------------------------------------------- */
8751 +#define DyDbgSize(cnt, op) AuDebugOn(cnt != sizeof(op)/sizeof(void *))
8753 +#ifdef CONFIG_AUFS_DEBUG
8754 +#define DyDbgDeclare(cnt) unsigned int cnt = 0
8755 +#define DyDbgInc(cnt) do { cnt++; } while (0)
8757 +#define DyDbgDeclare(cnt) do {} while (0)
8758 +#define DyDbgInc(cnt) do {} while (0)
8761 +#define DySet(func, dst, src, h_op, h_sb) do { \
8763 + if (h_op->func) { \
8765 + dst.func = src.func; \
8767 + AuDbg("%s %s\n", au_sbtype(h_sb), #func); \
8771 +#define DySetForce(func, dst, src) do { \
8772 + AuDebugOn(!src.func); \
8774 + dst.func = src.func; \
8777 +#define DySetAop(func) \
8778 + DySet(func, dyaop->da_op, aufs_aop, h_aop, h_sb)
8779 +#define DySetAopForce(func) \
8780 + DySetForce(func, dyaop->da_op, aufs_aop)
8782 +static void dy_aop(struct au_dykey *key, const void *h_op,
8783 + struct super_block *h_sb __maybe_unused)
8785 + struct au_dyaop *dyaop = (void *)key;
8786 + const struct address_space_operations *h_aop = h_op;
8787 + DyDbgDeclare(cnt);
8789 + AuDbg("%s\n", au_sbtype(h_sb));
8791 + DySetAop(writepage);
8792 + DySetAopForce(readpage); /* force */
8793 + DySetAop(writepages);
8794 + DySetAop(set_page_dirty);
8795 + DySetAop(readpages);
8796 + DySetAop(write_begin);
8797 + DySetAop(write_end);
8799 + DySetAop(invalidatepage);
8800 + DySetAop(releasepage);
8801 + DySetAop(freepage);
8802 + /* these two will be changed according to an aufs mount option */
8803 + DySetAop(direct_IO);
8804 + DySetAop(get_xip_mem);
8805 + DySetAop(migratepage);
8806 + DySetAop(launder_page);
8807 + DySetAop(is_partially_uptodate);
8808 + DySetAop(error_remove_page);
8810 + DyDbgSize(cnt, *h_aop);
8811 + dyaop->da_get_xip_mem = h_aop->get_xip_mem;
8814 +/* ---------------------------------------------------------------------- */
8816 +static void dy_bug(struct kref *kref)
8821 +static struct au_dykey *dy_get(struct au_dynop *op, struct au_branch *br)
8823 + struct au_dykey *key, *old;
8824 + struct au_splhead *spl;
8827 + void (*set)(struct au_dykey *key, const void *h_op,
8828 + struct super_block *h_sb __maybe_unused);
8830 + static const struct op a[] = {
8832 + .sz = sizeof(struct au_dyaop),
8836 + const struct op *p;
8838 + spl = dynop + op->dy_type;
8839 + key = dy_gfind_get(spl, op->dy_hop);
8841 + goto out_add; /* success */
8843 + p = a + op->dy_type;
8844 + key = kzalloc(p->sz, GFP_NOFS);
8845 + if (unlikely(!key)) {
8846 + key = ERR_PTR(-ENOMEM);
8850 + key->dk_op.dy_hop = op->dy_hop;
8851 + kref_init(&key->dk_kref);
8852 + p->set(key, op->dy_hop, br->br_mnt->mnt_sb);
8853 + old = dy_gadd(spl, key);
8860 + old = dy_bradd(br, key);
8862 + /* its ref-count should never be zero here */
8863 + kref_put(&key->dk_kref, dy_bug);
8868 +/* ---------------------------------------------------------------------- */
8870 + * Aufs prohibits O_DIRECT by defaut even if the branch supports it.
8871 + * This behaviour is neccessary to return an error from open(O_DIRECT) instead
8872 + * of the succeeding I/O. The dio mount option enables O_DIRECT and makes
8873 + * open(O_DIRECT) always succeed, but the succeeding I/O may return an error.
8874 + * See the aufs manual in detail.
8876 + * To keep this behaviour, aufs has to set NULL to ->get_xip_mem too, and the
8877 + * performance of fadvise() and madvise() may be affected.
8879 +static void dy_adx(struct au_dyaop *dyaop, int do_dx)
8882 + dyaop->da_op.direct_IO = NULL;
8883 + dyaop->da_op.get_xip_mem = NULL;
8885 + dyaop->da_op.direct_IO = aufs_aop.direct_IO;
8886 + dyaop->da_op.get_xip_mem = aufs_aop.get_xip_mem;
8887 + if (!dyaop->da_get_xip_mem)
8888 + dyaop->da_op.get_xip_mem = NULL;
8892 +static struct au_dyaop *dy_aget(struct au_branch *br,
8893 + const struct address_space_operations *h_aop,
8896 + struct au_dyaop *dyaop;
8897 + struct au_dynop op;
8899 + op.dy_type = AuDy_AOP;
8900 + op.dy_haop = h_aop;
8901 + dyaop = (void *)dy_get(&op, br);
8902 + if (IS_ERR(dyaop))
8904 + dy_adx(dyaop, do_dx);
8910 +int au_dy_iaop(struct inode *inode, aufs_bindex_t bindex,
8911 + struct inode *h_inode)
8914 + struct super_block *sb;
8915 + struct au_branch *br;
8916 + struct au_dyaop *dyaop;
8918 + AuDebugOn(!S_ISREG(h_inode->i_mode));
8919 + IiMustWriteLock(inode);
8922 + br = au_sbr(sb, bindex);
8923 + do_dx = !!au_opt_test(au_mntflags(sb), DIO);
8924 + dyaop = dy_aget(br, h_inode->i_mapping->a_ops, do_dx);
8925 + err = PTR_ERR(dyaop);
8926 + if (IS_ERR(dyaop))
8927 + /* unnecessary to call dy_fput() */
8931 + inode->i_mapping->a_ops = &dyaop->da_op;
8938 + * Is it safe to replace a_ops during the inode/file is in operation?
8941 +int au_dy_irefresh(struct inode *inode)
8944 + aufs_bindex_t bstart;
8945 + struct inode *h_inode;
8948 + if (S_ISREG(inode->i_mode)) {
8949 + bstart = au_ibstart(inode);
8950 + h_inode = au_h_iptr(inode, bstart);
8951 + err = au_dy_iaop(inode, bstart, h_inode);
8956 +void au_dy_arefresh(int do_dx)
8958 + struct au_splhead *spl;
8959 + struct list_head *head;
8960 + struct au_dykey *key;
8962 + spl = dynop + AuDy_AOP;
8963 + head = &spl->head;
8964 + spin_lock(&spl->spin);
8965 + list_for_each_entry(key, head, dk_list)
8966 + dy_adx((void *)key, do_dx);
8967 + spin_unlock(&spl->spin);
8970 +/* ---------------------------------------------------------------------- */
8972 +void __init au_dy_init(void)
8976 + /* make sure that 'struct au_dykey *' can be any type */
8977 + BUILD_BUG_ON(offsetof(struct au_dyaop, da_key));
8979 + for (i = 0; i < AuDyLast; i++)
8980 + au_spl_init(dynop + i);
8983 +void au_dy_fin(void)
8987 + for (i = 0; i < AuDyLast; i++)
8988 + WARN_ON(!list_empty(&dynop[i].head));
8990 diff -urN /usr/share/empty/fs/aufs/dynop.h linux/fs/aufs/dynop.h
8991 --- /usr/share/empty/fs/aufs/dynop.h 1970-01-01 01:00:00.000000000 +0100
8992 +++ linux/fs/aufs/dynop.h 2012-02-13 21:54:56.969771692 +0100
8995 + * Copyright (C) 2010-2012 Junjiro R. Okajima
8997 + * This program, aufs is free software; you can redistribute it and/or modify
8998 + * it under the terms of the GNU General Public License as published by
8999 + * the Free Software Foundation; either version 2 of the License, or
9000 + * (at your option) any later version.
9002 + * This program is distributed in the hope that it will be useful,
9003 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
9004 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
9005 + * GNU General Public License for more details.
9007 + * You should have received a copy of the GNU General Public License
9008 + * along with this program; if not, write to the Free Software
9009 + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
9013 + * dynamically customizable operations (for regular files only)
9016 +#ifndef __AUFS_DYNOP_H__
9017 +#define __AUFS_DYNOP_H__
9023 +enum {AuDy_AOP, AuDyLast};
9028 + const void *dy_hop;
9029 + const struct address_space_operations *dy_haop;
9035 + struct list_head dk_list;
9036 + struct rcu_head dk_rcu;
9038 + struct au_dynop dk_op;
9041 + * during I am in the branch local array, kref is gotten. when the
9042 + * branch is removed, kref is put.
9044 + struct kref dk_kref;
9047 +/* stop unioning since their sizes are very different from each other */
9049 + struct au_dykey da_key;
9050 + struct address_space_operations da_op; /* not const */
9051 + int (*da_get_xip_mem)(struct address_space *, pgoff_t, int,
9052 + void **, unsigned long *);
9055 +/* ---------------------------------------------------------------------- */
9059 +void au_dy_put(struct au_dykey *key);
9060 +int au_dy_iaop(struct inode *inode, aufs_bindex_t bindex,
9061 + struct inode *h_inode);
9062 +int au_dy_irefresh(struct inode *inode);
9063 +void au_dy_arefresh(int do_dio);
9065 +void __init au_dy_init(void);
9066 +void au_dy_fin(void);
9068 +#endif /* __KERNEL__ */
9069 +#endif /* __AUFS_DYNOP_H__ */
9070 diff -urN /usr/share/empty/fs/aufs/export.c linux/fs/aufs/export.c
9071 --- /usr/share/empty/fs/aufs/export.c 1970-01-01 01:00:00.000000000 +0100
9072 +++ linux/fs/aufs/export.c 2012-02-13 21:54:56.969771692 +0100
9075 + * Copyright (C) 2005-2012 Junjiro R. Okajima
9077 + * This program, aufs is free software; you can redistribute it and/or modify
9078 + * it under the terms of the GNU General Public License as published by
9079 + * the Free Software Foundation; either version 2 of the License, or
9080 + * (at your option) any later version.
9082 + * This program is distributed in the hope that it will be useful,
9083 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
9084 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
9085 + * GNU General Public License for more details.
9087 + * You should have received a copy of the GNU General Public License
9088 + * along with this program; if not, write to the Free Software
9089 + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
9096 +#include <linux/exportfs.h>
9097 +#include <linux/mnt_namespace.h>
9098 +#include <linux/namei.h>
9099 +#include <linux/nsproxy.h>
9100 +#include <linux/random.h>
9101 +#include <linux/writeback.h>
9105 +#ifdef CONFIG_AUFS_INO_T_64
9113 +static ino_t decode_ino(__u32 *a)
9117 + BUILD_BUG_ON(sizeof(u.ino) != sizeof(u.a));
9119 +#ifdef CONFIG_AUFS_INO_T_64
9125 +static void encode_ino(__u32 *a, ino_t ino)
9131 +#ifdef CONFIG_AUFS_INO_T_64
9136 +/* NFS file handle */
9140 +#ifdef CONFIG_AUFS_INO_T_64
9141 + /* support 64bit inode number */
9155 + Fh_dir_ino = Fh_dir_ino1
9158 +static int au_test_anon(struct dentry *dentry)
9160 + /* note: read d_flags without d_lock */
9161 + return !!(dentry->d_flags & DCACHE_DISCONNECTED);
9164 +/* ---------------------------------------------------------------------- */
9165 +/* inode generation external table */
9167 +void au_xigen_inc(struct inode *inode)
9172 + struct super_block *sb;
9173 + struct au_sbinfo *sbinfo;
9176 + AuDebugOn(!au_opt_test(au_mntflags(sb), XINO));
9178 + sbinfo = au_sbi(sb);
9179 + pos = inode->i_ino;
9180 + pos *= sizeof(igen);
9181 + igen = inode->i_generation + 1;
9182 + sz = xino_fwrite(sbinfo->si_xwrite, sbinfo->si_xigen, &igen,
9183 + sizeof(igen), &pos);
9184 + if (sz == sizeof(igen))
9185 + return; /* success */
9187 + if (unlikely(sz >= 0))
9188 + AuIOErr("xigen error (%zd)\n", sz);
9191 +int au_xigen_new(struct inode *inode)
9196 + struct super_block *sb;
9197 + struct au_sbinfo *sbinfo;
9198 + struct file *file;
9201 + /* todo: dirty, at mount time */
9202 + if (inode->i_ino == AUFS_ROOT_INO)
9205 + SiMustAnyLock(sb);
9206 + if (unlikely(!au_opt_test(au_mntflags(sb), XINO)))
9210 + pos = inode->i_ino;
9211 + if (unlikely(au_loff_max / sizeof(inode->i_generation) - 1 < pos)) {
9212 + AuIOErr1("too large i%lld\n", pos);
9215 + pos *= sizeof(inode->i_generation);
9218 + sbinfo = au_sbi(sb);
9219 + file = sbinfo->si_xigen;
9222 + if (i_size_read(file->f_dentry->d_inode)
9223 + < pos + sizeof(inode->i_generation)) {
9224 + inode->i_generation = atomic_inc_return(&sbinfo->si_xigen_next);
9225 + sz = xino_fwrite(sbinfo->si_xwrite, file, &inode->i_generation,
9226 + sizeof(inode->i_generation), &pos);
9228 + sz = xino_fread(sbinfo->si_xread, file, &inode->i_generation,
9229 + sizeof(inode->i_generation), &pos);
9230 + if (sz == sizeof(inode->i_generation))
9231 + goto out; /* success */
9234 + if (unlikely(sz >= 0)) {
9236 + AuIOErr("xigen error (%zd)\n", sz);
9243 +int au_xigen_set(struct super_block *sb, struct file *base)
9246 + struct au_sbinfo *sbinfo;
9247 + struct file *file;
9249 + SiMustWriteLock(sb);
9251 + sbinfo = au_sbi(sb);
9252 + file = au_xino_create2(base, sbinfo->si_xigen);
9253 + err = PTR_ERR(file);
9257 + if (sbinfo->si_xigen)
9258 + fput(sbinfo->si_xigen);
9259 + sbinfo->si_xigen = file;
9265 +void au_xigen_clr(struct super_block *sb)
9267 + struct au_sbinfo *sbinfo;
9269 + SiMustWriteLock(sb);
9271 + sbinfo = au_sbi(sb);
9272 + if (sbinfo->si_xigen) {
9273 + fput(sbinfo->si_xigen);
9274 + sbinfo->si_xigen = NULL;
9278 +/* ---------------------------------------------------------------------- */
9280 +static struct dentry *decode_by_ino(struct super_block *sb, ino_t ino,
9283 + struct dentry *dentry, *d;
9284 + struct inode *inode;
9285 + unsigned int sigen;
9288 + inode = ilookup(sb, ino);
9292 + dentry = ERR_PTR(-ESTALE);
9293 + sigen = au_sigen(sb);
9294 + if (unlikely(is_bad_inode(inode)
9295 + || IS_DEADDIR(inode)
9296 + || sigen != au_iigen(inode)))
9300 + if (!dir_ino || S_ISDIR(inode->i_mode))
9301 + dentry = d_find_alias(inode);
9303 + spin_lock(&inode->i_lock);
9304 + list_for_each_entry(d, &inode->i_dentry, d_alias) {
9305 + spin_lock(&d->d_lock);
9306 + if (!au_test_anon(d)
9307 + && d->d_parent->d_inode->i_ino == dir_ino) {
9308 + dentry = dget_dlock(d);
9309 + spin_unlock(&d->d_lock);
9312 + spin_unlock(&d->d_lock);
9314 + spin_unlock(&inode->i_lock);
9316 + if (unlikely(dentry && au_digen_test(dentry, sigen))) {
9317 + /* need to refresh */
9325 + AuTraceErrPtr(dentry);
9329 +/* ---------------------------------------------------------------------- */
9332 +/* if exportfs_decode_fh() passed vfsmount*, we could be happy */
9334 +struct au_compare_mnt_args {
9336 + struct super_block *sb;
9339 + struct vfsmount *mnt;
9342 +static int au_compare_mnt(struct vfsmount *mnt, void *arg)
9344 + struct au_compare_mnt_args *a = arg;
9346 + if (mnt->mnt_sb != a->sb)
9348 + a->mnt = mntget(mnt);
9352 +static struct vfsmount *au_mnt_get(struct super_block *sb)
9355 + struct au_compare_mnt_args args = {
9358 + struct mnt_namespace *ns;
9360 + br_read_lock(vfsmount_lock);
9361 + /* no get/put ?? */
9362 + AuDebugOn(!current->nsproxy);
9363 + ns = current->nsproxy->mnt_ns;
9365 + err = iterate_mounts(au_compare_mnt, &args, ns->root);
9366 + br_read_unlock(vfsmount_lock);
9368 + AuDebugOn(!args.mnt);
9372 +struct au_nfsd_si_lock {
9373 + unsigned int sigen;
9374 + aufs_bindex_t bindex, br_id;
9375 + unsigned char force_lock;
9378 +static int si_nfsd_read_lock(struct super_block *sb,
9379 + struct au_nfsd_si_lock *nsi_lock)
9382 + aufs_bindex_t bindex;
9384 + si_read_lock(sb, AuLock_FLUSH);
9386 + /* branch id may be wrapped around */
9388 + bindex = au_br_index(sb, nsi_lock->br_id);
9389 + if (bindex >= 0 && nsi_lock->sigen + AUFS_BRANCH_MAX > au_sigen(sb))
9390 + goto out; /* success */
9394 + if (!nsi_lock->force_lock)
9395 + si_read_unlock(sb);
9398 + nsi_lock->bindex = bindex;
9402 +struct find_name_by_ino {
9403 + int called, found;
9410 +find_name_by_ino(void *arg, const char *name, int namelen, loff_t offset,
9411 + u64 ino, unsigned int d_type)
9413 + struct find_name_by_ino *a = arg;
9416 + if (a->ino != ino)
9419 + memcpy(a->name, name, namelen);
9420 + a->namelen = namelen;
9425 +static struct dentry *au_lkup_by_ino(struct path *path, ino_t ino,
9426 + struct au_nfsd_si_lock *nsi_lock)
9428 + struct dentry *dentry, *parent;
9429 + struct file *file;
9430 + struct inode *dir;
9431 + struct find_name_by_ino arg;
9434 + parent = path->dentry;
9436 + si_read_unlock(parent->d_sb);
9437 + file = vfsub_dentry_open(path, au_dir_roflags);
9438 + dentry = (void *)file;
9442 + dentry = ERR_PTR(-ENOMEM);
9443 + arg.name = __getname_gfp(GFP_NOFS);
9444 + if (unlikely(!arg.name))
9451 + err = vfsub_readdir(file, find_name_by_ino, &arg);
9452 + } while (!err && !arg.found && arg.called);
9453 + dentry = ERR_PTR(err);
9454 + if (unlikely(err))
9456 + dentry = ERR_PTR(-ENOENT);
9460 + /* do not call au_lkup_one() */
9461 + dir = parent->d_inode;
9462 + mutex_lock(&dir->i_mutex);
9463 + dentry = vfsub_lookup_one_len(arg.name, parent, arg.namelen);
9464 + mutex_unlock(&dir->i_mutex);
9465 + AuTraceErrPtr(dentry);
9466 + if (IS_ERR(dentry))
9468 + AuDebugOn(au_test_anon(dentry));
9469 + if (unlikely(!dentry->d_inode)) {
9471 + dentry = ERR_PTR(-ENOENT);
9475 + __putname(arg.name);
9479 + if (unlikely(nsi_lock
9480 + && si_nfsd_read_lock(parent->d_sb, nsi_lock) < 0))
9481 + if (!IS_ERR(dentry)) {
9483 + dentry = ERR_PTR(-ESTALE);
9485 + AuTraceErrPtr(dentry);
9489 +static struct dentry *decode_by_dir_ino(struct super_block *sb, ino_t ino,
9491 + struct au_nfsd_si_lock *nsi_lock)
9493 + struct dentry *dentry;
9496 + if (dir_ino != AUFS_ROOT_INO) {
9497 + path.dentry = decode_by_ino(sb, dir_ino, 0);
9498 + dentry = path.dentry;
9499 + if (!path.dentry || IS_ERR(path.dentry))
9501 + AuDebugOn(au_test_anon(path.dentry));
9503 + path.dentry = dget(sb->s_root);
9505 + path.mnt = au_mnt_get(sb);
9506 + dentry = au_lkup_by_ino(&path, ino, nsi_lock);
9510 + AuTraceErrPtr(dentry);
9514 +/* ---------------------------------------------------------------------- */
9516 +static int h_acceptable(void *expv, struct dentry *dentry)
9521 +static char *au_build_path(struct dentry *h_parent, struct path *h_rootpath,
9522 + char *buf, int len, struct super_block *sb)
9528 + p = d_path(h_rootpath, buf, len);
9533 + path.mnt = h_rootpath->mnt;
9534 + path.dentry = h_parent;
9535 + p = d_path(&path, buf, len);
9541 + path.mnt = au_mnt_get(sb);
9542 + path.dentry = sb->s_root;
9543 + p = d_path(&path, buf, len - strlen(p));
9548 + p[strlen(p)] = '/';
9556 +struct dentry *decode_by_path(struct super_block *sb, ino_t ino, __u32 *fh,
9557 + int fh_len, struct au_nfsd_si_lock *nsi_lock)
9559 + struct dentry *dentry, *h_parent, *root;
9560 + struct super_block *h_sb;
9561 + char *pathname, *p;
9562 + struct vfsmount *h_mnt;
9563 + struct au_branch *br;
9567 + br = au_sbr(sb, nsi_lock->bindex);
9568 + h_mnt = br->br_mnt;
9569 + h_sb = h_mnt->mnt_sb;
9570 + /* todo: call lower fh_to_dentry()? fh_to_parent()? */
9571 + h_parent = exportfs_decode_fh(h_mnt, (void *)(fh + Fh_tail),
9572 + fh_len - Fh_tail, fh[Fh_h_type],
9573 + h_acceptable, /*context*/NULL);
9574 + dentry = h_parent;
9575 + if (unlikely(!h_parent || IS_ERR(h_parent))) {
9576 + AuWarn1("%s decode_fh failed, %ld\n",
9577 + au_sbtype(h_sb), PTR_ERR(h_parent));
9581 + if (unlikely(au_test_anon(h_parent))) {
9582 + AuWarn1("%s decode_fh returned a disconnected dentry\n",
9584 + goto out_h_parent;
9587 + dentry = ERR_PTR(-ENOMEM);
9588 + pathname = (void *)__get_free_page(GFP_NOFS);
9589 + if (unlikely(!pathname))
9590 + goto out_h_parent;
9592 + root = sb->s_root;
9594 + di_read_lock_parent(root, !AuLock_IR);
9595 + path.dentry = au_h_dptr(root, nsi_lock->bindex);
9596 + di_read_unlock(root, !AuLock_IR);
9597 + p = au_build_path(h_parent, &path, pathname, PAGE_SIZE, sb);
9598 + dentry = (void *)p;
9600 + goto out_pathname;
9602 + si_read_unlock(sb);
9603 + err = vfsub_kern_path(p, LOOKUP_FOLLOW | LOOKUP_DIRECTORY, &path);
9604 + dentry = ERR_PTR(err);
9605 + if (unlikely(err))
9608 + dentry = ERR_PTR(-ENOENT);
9609 + AuDebugOn(au_test_anon(path.dentry));
9610 + if (unlikely(!path.dentry->d_inode))
9613 + if (ino != path.dentry->d_inode->i_ino)
9614 + dentry = au_lkup_by_ino(&path, ino, /*nsi_lock*/NULL);
9616 + dentry = dget(path.dentry);
9621 + if (unlikely(si_nfsd_read_lock(sb, nsi_lock) < 0))
9622 + if (!IS_ERR(dentry)) {
9624 + dentry = ERR_PTR(-ESTALE);
9627 + free_page((unsigned long)pathname);
9631 + AuTraceErrPtr(dentry);
9635 +/* ---------------------------------------------------------------------- */
9637 +static struct dentry *
9638 +aufs_fh_to_dentry(struct super_block *sb, struct fid *fid, int fh_len,
9641 + struct dentry *dentry;
9642 + __u32 *fh = fid->raw;
9643 + struct au_branch *br;
9644 + ino_t ino, dir_ino;
9645 + struct au_nfsd_si_lock nsi_lock = {
9649 + dentry = ERR_PTR(-ESTALE);
9650 + /* it should never happen, but the file handle is unreliable */
9651 + if (unlikely(fh_len < Fh_tail))
9653 + nsi_lock.sigen = fh[Fh_sigen];
9654 + nsi_lock.br_id = fh[Fh_br_id];
9656 + /* branch id may be wrapped around */
9658 + if (unlikely(si_nfsd_read_lock(sb, &nsi_lock)))
9660 + nsi_lock.force_lock = 1;
9662 + /* is this inode still cached? */
9663 + ino = decode_ino(fh + Fh_ino);
9664 + /* it should never happen */
9665 + if (unlikely(ino == AUFS_ROOT_INO))
9668 + dir_ino = decode_ino(fh + Fh_dir_ino);
9669 + dentry = decode_by_ino(sb, ino, dir_ino);
9670 + if (IS_ERR(dentry))
9675 + /* is the parent dir cached? */
9676 + br = au_sbr(sb, nsi_lock.bindex);
9677 + atomic_inc(&br->br_count);
9678 + dentry = decode_by_dir_ino(sb, ino, dir_ino, &nsi_lock);
9679 + if (IS_ERR(dentry))
9685 + dentry = decode_by_path(sb, ino, fh, fh_len, &nsi_lock);
9686 + if (IS_ERR(dentry))
9688 + if (unlikely(!dentry))
9689 + /* todo?: make it ESTALE */
9693 + if (!au_digen_test(dentry, au_sigen(sb))
9694 + && dentry->d_inode->i_generation == fh[Fh_igen])
9695 + goto out_unlock; /* success */
9698 + dentry = ERR_PTR(-ESTALE);
9701 + atomic_dec(&br->br_count);
9702 + si_read_unlock(sb);
9704 + AuTraceErrPtr(dentry);
9708 +#if 0 /* reserved for future use */
9709 +/* support subtreecheck option */
9710 +static struct dentry *aufs_fh_to_parent(struct super_block *sb, struct fid *fid,
9711 + int fh_len, int fh_type)
9713 + struct dentry *parent;
9714 + __u32 *fh = fid->raw;
9717 + dir_ino = decode_ino(fh + Fh_dir_ino);
9718 + parent = decode_by_ino(sb, dir_ino, 0);
9719 + if (IS_ERR(parent))
9722 + parent = decode_by_path(sb, au_br_index(sb, fh[Fh_br_id]),
9723 + dir_ino, fh, fh_len);
9726 + AuTraceErrPtr(parent);
9731 +/* ---------------------------------------------------------------------- */
9733 +static int aufs_encode_fh(struct dentry *dentry, __u32 *fh, int *max_len,
9737 + aufs_bindex_t bindex, bend;
9738 + struct super_block *sb, *h_sb;
9739 + struct inode *inode;
9740 + struct dentry *parent, *h_parent;
9741 + struct au_branch *br;
9743 + AuDebugOn(au_test_anon(dentry));
9747 + if (unlikely(*max_len <= Fh_tail)) {
9748 + AuWarn1("NFSv2 client (max_len %d)?\n", *max_len);
9752 + err = FILEID_ROOT;
9753 + if (IS_ROOT(dentry)) {
9754 + AuDebugOn(dentry->d_inode->i_ino != AUFS_ROOT_INO);
9759 + err = aufs_read_lock(dentry, AuLock_FLUSH | AuLock_IR | AuLock_GEN);
9760 + if (unlikely(err))
9763 + inode = dentry->d_inode;
9764 + AuDebugOn(!inode);
9765 + sb = dentry->d_sb;
9766 +#ifdef CONFIG_AUFS_DEBUG
9767 + if (unlikely(!au_opt_test(au_mntflags(sb), XINO)))
9768 + AuWarn1("NFS-exporting requires xino\n");
9771 + parent = dget_parent(dentry);
9772 + di_read_lock_parent(parent, !AuLock_IR);
9773 + bend = au_dbtaildir(parent);
9774 + for (bindex = au_dbstart(parent); bindex <= bend; bindex++) {
9775 + h_parent = au_h_dptr(parent, bindex);
9781 + if (unlikely(!h_parent))
9785 + br = au_sbr(sb, bindex);
9786 + h_sb = br->br_mnt->mnt_sb;
9787 + if (unlikely(!h_sb->s_export_op)) {
9788 + AuErr1("%s branch is not exportable\n", au_sbtype(h_sb));
9792 + fh[Fh_br_id] = br->br_id;
9793 + fh[Fh_sigen] = au_sigen(sb);
9794 + encode_ino(fh + Fh_ino, inode->i_ino);
9795 + encode_ino(fh + Fh_dir_ino, parent->d_inode->i_ino);
9796 + fh[Fh_igen] = inode->i_generation;
9798 + *max_len -= Fh_tail;
9799 + fh[Fh_h_type] = exportfs_encode_fh(h_parent, (void *)(fh + Fh_tail),
9801 + /*connectable or subtreecheck*/0);
9802 + err = fh[Fh_h_type];
9803 + *max_len += Fh_tail;
9804 + /* todo: macros? */
9808 + AuWarn1("%s encode_fh failed\n", au_sbtype(h_sb));
9813 + di_read_unlock(parent, !AuLock_IR);
9815 + aufs_read_unlock(dentry, AuLock_IR);
9817 + if (unlikely(err < 0))
9822 +/* ---------------------------------------------------------------------- */
9824 +static int aufs_commit_metadata(struct inode *inode)
9827 + aufs_bindex_t bindex;
9828 + struct super_block *sb;
9829 + struct inode *h_inode;
9830 + int (*f)(struct inode *inode);
9833 + si_read_lock(sb, AuLock_FLUSH | AuLock_NOPLMW);
9834 + ii_write_lock_child(inode);
9835 + bindex = au_ibstart(inode);
9836 + AuDebugOn(bindex < 0);
9837 + h_inode = au_h_iptr(inode, bindex);
9839 + f = h_inode->i_sb->s_export_op->commit_metadata;
9843 + struct writeback_control wbc = {
9844 + .sync_mode = WB_SYNC_ALL,
9845 + .nr_to_write = 0 /* metadata only */
9848 + err = sync_inode(h_inode, &wbc);
9851 + au_cpup_attr_timesizes(inode);
9852 + ii_write_unlock(inode);
9853 + si_read_unlock(sb);
9857 +/* ---------------------------------------------------------------------- */
9859 +static struct export_operations aufs_export_op = {
9860 + .fh_to_dentry = aufs_fh_to_dentry,
9861 + /* .fh_to_parent = aufs_fh_to_parent, */
9862 + .encode_fh = aufs_encode_fh,
9863 + .commit_metadata = aufs_commit_metadata
9866 +void au_export_init(struct super_block *sb)
9868 + struct au_sbinfo *sbinfo;
9871 + sb->s_export_op = &aufs_export_op;
9872 + sbinfo = au_sbi(sb);
9873 + sbinfo->si_xigen = NULL;
9874 + get_random_bytes(&u, sizeof(u));
9875 + BUILD_BUG_ON(sizeof(u) != sizeof(int));
9876 + atomic_set(&sbinfo->si_xigen_next, u);
9878 diff -urN /usr/share/empty/fs/aufs/file.c linux/fs/aufs/file.c
9879 --- /usr/share/empty/fs/aufs/file.c 1970-01-01 01:00:00.000000000 +0100
9880 +++ linux/fs/aufs/file.c 2012-02-13 21:54:56.969771692 +0100
9883 + * Copyright (C) 2005-2012 Junjiro R. Okajima
9885 + * This program, aufs is free software; you can redistribute it and/or modify
9886 + * it under the terms of the GNU General Public License as published by
9887 + * the Free Software Foundation; either version 2 of the License, or
9888 + * (at your option) any later version.
9890 + * This program is distributed in the hope that it will be useful,
9891 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
9892 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
9893 + * GNU General Public License for more details.
9895 + * You should have received a copy of the GNU General Public License
9896 + * along with this program; if not, write to the Free Software
9897 + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
9901 + * handling file/dir, and address_space operation
9904 +#include <linux/pagemap.h>
9907 +/* drop flags for writing */
9908 +unsigned int au_file_roflags(unsigned int flags)
9910 + flags &= ~(O_WRONLY | O_RDWR | O_APPEND | O_CREAT | O_TRUNC);
9911 + flags |= O_RDONLY | O_NOATIME;
9915 +/* common functions to regular file and dir */
9916 +struct file *au_h_open(struct dentry *dentry, aufs_bindex_t bindex, int flags,
9917 + struct file *file)
9919 + struct file *h_file;
9920 + struct dentry *h_dentry;
9921 + struct inode *h_inode;
9922 + struct super_block *sb;
9923 + struct au_branch *br;
9924 + struct path h_path;
9925 + int err, exec_flag;
9927 + /* a race condition can happen between open and unlink/rmdir */
9928 + h_file = ERR_PTR(-ENOENT);
9929 + h_dentry = au_h_dptr(dentry, bindex);
9930 + if (au_test_nfsd() && !h_dentry)
9932 + h_inode = h_dentry->d_inode;
9933 + if (au_test_nfsd() && !h_inode)
9935 + spin_lock(&h_dentry->d_lock);
9936 + err = (!d_unhashed(dentry) && d_unlinked(h_dentry))
9938 + /* || !dentry->d_inode->i_nlink */
9940 + spin_unlock(&h_dentry->d_lock);
9941 + if (unlikely(err))
9944 + sb = dentry->d_sb;
9945 + br = au_sbr(sb, bindex);
9946 + h_file = ERR_PTR(-EACCES);
9947 + exec_flag = flags & __FMODE_EXEC;
9948 + if (exec_flag && (br->br_mnt->mnt_flags & MNT_NOEXEC))
9951 + /* drop flags for writing */
9952 + if (au_test_ro(sb, bindex, dentry->d_inode))
9953 + flags = au_file_roflags(flags);
9954 + flags &= ~O_CREAT;
9955 + atomic_inc(&br->br_count);
9956 + h_path.dentry = h_dentry;
9957 + h_path.mnt = br->br_mnt;
9958 + if (!au_special_file(h_inode->i_mode))
9959 + h_file = vfsub_dentry_open(&h_path, flags);
9961 + /* this block depends upon the configuration */
9962 + di_read_unlock(dentry, AuLock_IR);
9963 + fi_write_unlock(file);
9964 + si_read_unlock(sb);
9965 + h_file = vfsub_dentry_open(&h_path, flags);
9966 + si_noflush_read_lock(sb);
9967 + fi_write_lock(file);
9968 + di_read_lock_child(dentry, AuLock_IR);
9970 + if (IS_ERR(h_file))
9974 + err = deny_write_access(h_file);
9975 + if (unlikely(err)) {
9977 + h_file = ERR_PTR(err);
9981 + fsnotify_open(h_file);
9982 + goto out; /* success */
9985 + atomic_dec(&br->br_count);
9990 +int au_do_open(struct file *file, int (*open)(struct file *file, int flags),
9991 + struct au_fidir *fidir)
9994 + struct dentry *dentry;
9996 + err = au_finfo_init(file, fidir);
9997 + if (unlikely(err))
10000 + dentry = file->f_dentry;
10001 + di_read_lock_child(dentry, AuLock_IR);
10002 + err = open(file, vfsub_file_flags(file));
10003 + di_read_unlock(dentry, AuLock_IR);
10005 + fi_write_unlock(file);
10006 + if (unlikely(err)) {
10007 + au_fi(file)->fi_hdir = NULL;
10008 + au_finfo_fin(file);
10015 +int au_reopen_nondir(struct file *file)
10018 + aufs_bindex_t bstart;
10019 + struct dentry *dentry;
10020 + struct file *h_file, *h_file_tmp;
10022 + dentry = file->f_dentry;
10023 + AuDebugOn(au_special_file(dentry->d_inode->i_mode));
10024 + bstart = au_dbstart(dentry);
10025 + h_file_tmp = NULL;
10026 + if (au_fbstart(file) == bstart) {
10027 + h_file = au_hf_top(file);
10028 + if (file->f_mode == h_file->f_mode)
10029 + return 0; /* success */
10030 + h_file_tmp = h_file;
10031 + get_file(h_file_tmp);
10032 + au_set_h_fptr(file, bstart, NULL);
10034 + AuDebugOn(au_fi(file)->fi_hdir);
10035 + AuDebugOn(au_fbstart(file) < bstart);
10037 + h_file = au_h_open(dentry, bstart, vfsub_file_flags(file) & ~O_TRUNC,
10039 + err = PTR_ERR(h_file);
10040 + if (IS_ERR(h_file))
10041 + goto out; /* todo: close all? */
10044 + au_set_fbstart(file, bstart);
10045 + au_set_h_fptr(file, bstart, h_file);
10046 + au_update_figen(file);
10047 + /* todo: necessary? */
10048 + /* file->f_ra = h_file->f_ra; */
10052 + fput(h_file_tmp);
10056 +/* ---------------------------------------------------------------------- */
10058 +static int au_reopen_wh(struct file *file, aufs_bindex_t btgt,
10059 + struct dentry *hi_wh)
10062 + aufs_bindex_t bstart;
10063 + struct au_dinfo *dinfo;
10064 + struct dentry *h_dentry;
10065 + struct au_hdentry *hdp;
10067 + dinfo = au_di(file->f_dentry);
10068 + AuRwMustWriteLock(&dinfo->di_rwsem);
10070 + bstart = dinfo->di_bstart;
10071 + dinfo->di_bstart = btgt;
10072 + hdp = dinfo->di_hdentry;
10073 + h_dentry = hdp[0 + btgt].hd_dentry;
10074 + hdp[0 + btgt].hd_dentry = hi_wh;
10075 + err = au_reopen_nondir(file);
10076 + hdp[0 + btgt].hd_dentry = h_dentry;
10077 + dinfo->di_bstart = bstart;
10082 +static int au_ready_to_write_wh(struct file *file, loff_t len,
10083 + aufs_bindex_t bcpup)
10086 + struct inode *inode, *h_inode;
10087 + struct dentry *dentry, *h_dentry, *hi_wh;
10089 + dentry = file->f_dentry;
10090 + au_update_dbstart(dentry);
10091 + inode = dentry->d_inode;
10093 + if (au_dbstart(dentry) <= bcpup && au_dbend(dentry) >= bcpup) {
10094 + h_dentry = au_h_dptr(dentry, bcpup);
10096 + h_inode = h_dentry->d_inode;
10098 + hi_wh = au_hi_wh(inode, bcpup);
10099 + if (!hi_wh && !h_inode)
10100 + err = au_sio_cpup_wh(dentry, bcpup, len, file);
10102 + /* already copied-up after unlink */
10103 + err = au_reopen_wh(file, bcpup, hi_wh);
10106 + && inode->i_nlink > 1
10107 + && au_opt_test(au_mntflags(dentry->d_sb), PLINK))
10108 + au_plink_append(inode, bcpup, au_h_dptr(dentry, bcpup));
10114 + * prepare the @file for writing.
10116 +int au_ready_to_write(struct file *file, loff_t len, struct au_pin *pin)
10119 + aufs_bindex_t bstart, bcpup, dbstart;
10120 + struct dentry *dentry, *parent, *h_dentry;
10121 + struct inode *h_inode, *inode;
10122 + struct super_block *sb;
10123 + struct file *h_file;
10125 + dentry = file->f_dentry;
10126 + sb = dentry->d_sb;
10127 + inode = dentry->d_inode;
10128 + AuDebugOn(au_special_file(inode->i_mode));
10129 + bstart = au_fbstart(file);
10130 + err = au_test_ro(sb, bstart, inode);
10131 + if (!err && (au_hf_top(file)->f_mode & FMODE_WRITE)) {
10132 + err = au_pin(pin, dentry, bstart, AuOpt_UDBA_NONE, /*flags*/0);
10136 + /* need to cpup or reopen */
10137 + parent = dget_parent(dentry);
10138 + di_write_lock_parent(parent);
10139 + err = AuWbrCopyup(au_sbi(sb), dentry);
10141 + if (unlikely(err < 0))
10145 + if (!d_unhashed(dentry) && !au_h_dptr(parent, bcpup)) {
10146 + err = au_cpup_dirs(dentry, bcpup);
10147 + if (unlikely(err))
10151 + err = au_pin(pin, dentry, bcpup, AuOpt_UDBA_NONE,
10152 + AuPin_DI_LOCKED | AuPin_MNT_WRITE);
10153 + if (unlikely(err))
10156 + h_dentry = au_hf_top(file)->f_dentry;
10157 + h_inode = h_dentry->d_inode;
10158 + dbstart = au_dbstart(dentry);
10159 + if (dbstart <= bcpup) {
10160 + h_dentry = au_h_dptr(dentry, bcpup);
10161 + AuDebugOn(!h_dentry);
10162 + h_inode = h_dentry->d_inode;
10163 + AuDebugOn(!h_inode);
10167 + if (dbstart <= bcpup /* just reopen */
10168 + || !d_unhashed(dentry) /* copyup and reopen */
10170 + mutex_lock_nested(&h_inode->i_mutex, AuLsc_I_CHILD);
10171 + h_file = au_h_open_pre(dentry, bstart);
10172 + if (IS_ERR(h_file)) {
10173 + err = PTR_ERR(h_file);
10176 + di_downgrade_lock(parent, AuLock_IR);
10177 + if (dbstart > bcpup)
10178 + err = au_sio_cpup_simple(dentry, bcpup, len,
10181 + err = au_reopen_nondir(file);
10183 + mutex_unlock(&h_inode->i_mutex);
10184 + au_h_open_post(dentry, bstart, h_file);
10185 + } else { /* copyup as wh and reopen */
10187 + * since writable hfsplus branch is not supported,
10188 + * h_open_pre/post() are unnecessary.
10190 + mutex_lock_nested(&h_inode->i_mutex, AuLsc_I_CHILD);
10191 + err = au_ready_to_write_wh(file, len, bcpup);
10192 + di_downgrade_lock(parent, AuLock_IR);
10193 + mutex_unlock(&h_inode->i_mutex);
10197 + au_pin_set_parent_lflag(pin, /*lflag*/0);
10198 + goto out_dput; /* success */
10204 + di_downgrade_lock(parent, AuLock_IR);
10206 + di_read_unlock(parent, AuLock_IR);
10213 +/* ---------------------------------------------------------------------- */
10215 +int au_do_flush(struct file *file, fl_owner_t id,
10216 + int (*flush)(struct file *file, fl_owner_t id))
10219 + struct dentry *dentry;
10220 + struct super_block *sb;
10221 + struct inode *inode;
10223 + dentry = file->f_dentry;
10224 + sb = dentry->d_sb;
10225 + inode = dentry->d_inode;
10226 + si_noflush_read_lock(sb);
10227 + fi_read_lock(file);
10228 + ii_read_lock_child(inode);
10230 + err = flush(file, id);
10231 + au_cpup_attr_timesizes(inode);
10233 + ii_read_unlock(inode);
10234 + fi_read_unlock(file);
10235 + si_read_unlock(sb);
10239 +/* ---------------------------------------------------------------------- */
10241 +static int au_file_refresh_by_inode(struct file *file, int *need_reopen)
10244 + aufs_bindex_t bstart;
10245 + struct au_pin pin;
10246 + struct au_finfo *finfo;
10247 + struct dentry *dentry, *parent, *hi_wh;
10248 + struct inode *inode;
10249 + struct super_block *sb;
10251 + FiMustWriteLock(file);
10254 + finfo = au_fi(file);
10255 + dentry = file->f_dentry;
10256 + sb = dentry->d_sb;
10257 + inode = dentry->d_inode;
10258 + bstart = au_ibstart(inode);
10259 + if (bstart == finfo->fi_btop || IS_ROOT(dentry))
10262 + parent = dget_parent(dentry);
10263 + if (au_test_ro(sb, bstart, inode)) {
10264 + di_read_lock_parent(parent, !AuLock_IR);
10265 + err = AuWbrCopyup(au_sbi(sb), dentry);
10267 + di_read_unlock(parent, !AuLock_IR);
10268 + if (unlikely(err < 0))
10273 + di_read_lock_parent(parent, AuLock_IR);
10274 + hi_wh = au_hi_wh(inode, bstart);
10275 + if (!S_ISDIR(inode->i_mode)
10276 + && au_opt_test(au_mntflags(sb), PLINK)
10277 + && au_plink_test(inode)
10278 + && !d_unhashed(dentry)) {
10279 + err = au_test_and_cpup_dirs(dentry, bstart);
10280 + if (unlikely(err))
10283 + /* always superio. */
10284 + err = au_pin(&pin, dentry, bstart, AuOpt_UDBA_NONE,
10285 + AuPin_DI_LOCKED | AuPin_MNT_WRITE);
10287 + err = au_sio_cpup_simple(dentry, bstart, -1,
10290 + } else if (hi_wh) {
10291 + /* already copied-up after unlink */
10292 + err = au_reopen_wh(file, bstart, hi_wh);
10293 + *need_reopen = 0;
10297 + di_read_unlock(parent, AuLock_IR);
10304 +static void au_do_refresh_dir(struct file *file)
10306 + aufs_bindex_t bindex, bend, new_bindex, brid;
10307 + struct au_hfile *p, tmp, *q;
10308 + struct au_finfo *finfo;
10309 + struct super_block *sb;
10310 + struct au_fidir *fidir;
10312 + FiMustWriteLock(file);
10314 + sb = file->f_dentry->d_sb;
10315 + finfo = au_fi(file);
10316 + fidir = finfo->fi_hdir;
10317 + AuDebugOn(!fidir);
10318 + p = fidir->fd_hfile + finfo->fi_btop;
10319 + brid = p->hf_br->br_id;
10320 + bend = fidir->fd_bbot;
10321 + for (bindex = finfo->fi_btop; bindex <= bend; bindex++, p++) {
10325 + new_bindex = au_br_index(sb, p->hf_br->br_id);
10326 + if (new_bindex == bindex)
10328 + if (new_bindex < 0) {
10329 + au_set_h_fptr(file, bindex, NULL);
10333 + /* swap two lower inode, and loop again */
10334 + q = fidir->fd_hfile + new_bindex;
10338 + if (tmp.hf_file) {
10344 + p = fidir->fd_hfile;
10345 + if (!au_test_mmapped(file) && !d_unlinked(file->f_dentry)) {
10346 + bend = au_sbend(sb);
10347 + for (finfo->fi_btop = 0; finfo->fi_btop <= bend;
10348 + finfo->fi_btop++, p++)
10349 + if (p->hf_file) {
10350 + if (p->hf_file->f_dentry
10351 + && p->hf_file->f_dentry->d_inode)
10354 + au_hfput(p, file);
10357 + bend = au_br_index(sb, brid);
10358 + for (finfo->fi_btop = 0; finfo->fi_btop < bend;
10359 + finfo->fi_btop++, p++)
10361 + au_hfput(p, file);
10362 + bend = au_sbend(sb);
10365 + p = fidir->fd_hfile + bend;
10366 + for (fidir->fd_bbot = bend; fidir->fd_bbot >= finfo->fi_btop;
10367 + fidir->fd_bbot--, p--)
10368 + if (p->hf_file) {
10369 + if (p->hf_file->f_dentry
10370 + && p->hf_file->f_dentry->d_inode)
10373 + au_hfput(p, file);
10375 + AuDebugOn(fidir->fd_bbot < finfo->fi_btop);
10379 + * after branch manipulating, refresh the file.
10381 +static int refresh_file(struct file *file, int (*reopen)(struct file *file))
10383 + int err, need_reopen;
10384 + aufs_bindex_t bend, bindex;
10385 + struct dentry *dentry;
10386 + struct au_finfo *finfo;
10387 + struct au_hfile *hfile;
10389 + dentry = file->f_dentry;
10390 + finfo = au_fi(file);
10391 + if (!finfo->fi_hdir) {
10392 + hfile = &finfo->fi_htop;
10393 + AuDebugOn(!hfile->hf_file);
10394 + bindex = au_br_index(dentry->d_sb, hfile->hf_br->br_id);
10395 + AuDebugOn(bindex < 0);
10396 + if (bindex != finfo->fi_btop)
10397 + au_set_fbstart(file, bindex);
10399 + err = au_fidir_realloc(finfo, au_sbend(dentry->d_sb) + 1);
10400 + if (unlikely(err))
10402 + au_do_refresh_dir(file);
10407 + if (!au_test_mmapped(file))
10408 + err = au_file_refresh_by_inode(file, &need_reopen);
10409 + if (!err && need_reopen && !d_unlinked(dentry))
10410 + err = reopen(file);
10412 + au_update_figen(file);
10413 + goto out; /* success */
10416 + /* error, close all lower files */
10417 + if (finfo->fi_hdir) {
10418 + bend = au_fbend_dir(file);
10419 + for (bindex = au_fbstart(file); bindex <= bend; bindex++)
10420 + au_set_h_fptr(file, bindex, NULL);
10427 +/* common function to regular file and dir */
10428 +int au_reval_and_lock_fdi(struct file *file, int (*reopen)(struct file *file),
10432 + unsigned int sigen, figen;
10433 + aufs_bindex_t bstart;
10434 + unsigned char pseudo_link;
10435 + struct dentry *dentry;
10436 + struct inode *inode;
10439 + dentry = file->f_dentry;
10440 + inode = dentry->d_inode;
10441 + AuDebugOn(au_special_file(inode->i_mode));
10442 + sigen = au_sigen(dentry->d_sb);
10443 + fi_write_lock(file);
10444 + figen = au_figen(file);
10445 + di_write_lock_child(dentry);
10446 + bstart = au_dbstart(dentry);
10447 + pseudo_link = (bstart != au_ibstart(inode));
10448 + if (sigen == figen && !pseudo_link && au_fbstart(file) == bstart) {
10450 + di_downgrade_lock(dentry, AuLock_IR);
10451 + fi_downgrade_lock(file);
10453 + goto out; /* success */
10456 + AuDbg("sigen %d, figen %d\n", sigen, figen);
10457 + if (au_digen_test(dentry, sigen)) {
10458 + err = au_reval_dpath(dentry, sigen);
10459 + AuDebugOn(!err && au_digen_test(dentry, sigen));
10463 + err = refresh_file(file, reopen);
10466 + di_downgrade_lock(dentry, AuLock_IR);
10467 + fi_downgrade_lock(file);
10470 + di_write_unlock(dentry);
10471 + fi_write_unlock(file);
10478 +/* ---------------------------------------------------------------------- */
10480 +/* cf. aufs_nopage() */
10481 +/* for madvise(2) */
10482 +static int aufs_readpage(struct file *file __maybe_unused, struct page *page)
10484 + unlock_page(page);
10488 +/* it will never be called, but necessary to support O_DIRECT */
10489 +static ssize_t aufs_direct_IO(int rw, struct kiocb *iocb,
10490 + const struct iovec *iov, loff_t offset,
10491 + unsigned long nr_segs)
10492 +{ BUG(); return 0; }
10495 + * it will never be called, but madvise and fadvise behaves differently
10496 + * when get_xip_mem is defined
10498 +static int aufs_get_xip_mem(struct address_space *mapping, pgoff_t pgoff,
10499 + int create, void **kmem, unsigned long *pfn)
10500 +{ BUG(); return 0; }
10502 +/* they will never be called. */
10503 +#ifdef CONFIG_AUFS_DEBUG
10504 +static int aufs_write_begin(struct file *file, struct address_space *mapping,
10505 + loff_t pos, unsigned len, unsigned flags,
10506 + struct page **pagep, void **fsdata)
10507 +{ AuUnsupport(); return 0; }
10508 +static int aufs_write_end(struct file *file, struct address_space *mapping,
10509 + loff_t pos, unsigned len, unsigned copied,
10510 + struct page *page, void *fsdata)
10511 +{ AuUnsupport(); return 0; }
10512 +static int aufs_writepage(struct page *page, struct writeback_control *wbc)
10513 +{ AuUnsupport(); return 0; }
10515 +static int aufs_set_page_dirty(struct page *page)
10516 +{ AuUnsupport(); return 0; }
10517 +static void aufs_invalidatepage(struct page *page, unsigned long offset)
10518 +{ AuUnsupport(); }
10519 +static int aufs_releasepage(struct page *page, gfp_t gfp)
10520 +{ AuUnsupport(); return 0; }
10521 +static int aufs_migratepage(struct address_space *mapping, struct page *newpage,
10522 + struct page *page)
10523 +{ AuUnsupport(); return 0; }
10524 +static int aufs_launder_page(struct page *page)
10525 +{ AuUnsupport(); return 0; }
10526 +static int aufs_is_partially_uptodate(struct page *page,
10527 + read_descriptor_t *desc,
10528 + unsigned long from)
10529 +{ AuUnsupport(); return 0; }
10530 +static int aufs_error_remove_page(struct address_space *mapping,
10531 + struct page *page)
10532 +{ AuUnsupport(); return 0; }
10533 +#endif /* CONFIG_AUFS_DEBUG */
10535 +const struct address_space_operations aufs_aop = {
10536 + .readpage = aufs_readpage,
10537 + .direct_IO = aufs_direct_IO,
10538 + .get_xip_mem = aufs_get_xip_mem,
10539 +#ifdef CONFIG_AUFS_DEBUG
10540 + .writepage = aufs_writepage,
10541 + /* no writepages, because of writepage */
10542 + .set_page_dirty = aufs_set_page_dirty,
10543 + /* no readpages, because of readpage */
10544 + .write_begin = aufs_write_begin,
10545 + .write_end = aufs_write_end,
10546 + /* no bmap, no block device */
10547 + .invalidatepage = aufs_invalidatepage,
10548 + .releasepage = aufs_releasepage,
10549 + .migratepage = aufs_migratepage,
10550 + .launder_page = aufs_launder_page,
10551 + .is_partially_uptodate = aufs_is_partially_uptodate,
10552 + .error_remove_page = aufs_error_remove_page
10553 +#endif /* CONFIG_AUFS_DEBUG */
10555 diff -urN /usr/share/empty/fs/aufs/file.h linux/fs/aufs/file.h
10556 --- /usr/share/empty/fs/aufs/file.h 1970-01-01 01:00:00.000000000 +0100
10557 +++ linux/fs/aufs/file.h 2012-02-13 21:54:56.969771692 +0100
10560 + * Copyright (C) 2005-2012 Junjiro R. Okajima
10562 + * This program, aufs is free software; you can redistribute it and/or modify
10563 + * it under the terms of the GNU General Public License as published by
10564 + * the Free Software Foundation; either version 2 of the License, or
10565 + * (at your option) any later version.
10567 + * This program is distributed in the hope that it will be useful,
10568 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
10569 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
10570 + * GNU General Public License for more details.
10572 + * You should have received a copy of the GNU General Public License
10573 + * along with this program; if not, write to the Free Software
10574 + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
10578 + * file operations
10581 +#ifndef __AUFS_FILE_H__
10582 +#define __AUFS_FILE_H__
10586 +#include <linux/file.h>
10587 +#include <linux/fs.h>
10588 +#include <linux/poll.h>
10589 +#include "rwsem.h"
10593 + struct file *hf_file;
10594 + struct au_branch *hf_br;
10599 + aufs_bindex_t fd_bbot;
10600 + aufs_bindex_t fd_nent;
10601 + struct au_vdir *fd_vdir_cache;
10602 + struct au_hfile fd_hfile[];
10605 +static inline int au_fidir_sz(int nent)
10607 + AuDebugOn(nent < 0);
10608 + return sizeof(struct au_fidir) + sizeof(struct au_hfile) * nent;
10612 + atomic_t fi_generation;
10614 + struct au_rwsem fi_rwsem;
10615 + aufs_bindex_t fi_btop;
10617 + /* do not union them */
10618 + struct { /* for non-dir */
10619 + struct au_hfile fi_htop;
10620 + atomic_t fi_mmapped;
10622 + struct au_fidir *fi_hdir; /* for dir only */
10623 +} ____cacheline_aligned_in_smp;
10625 +/* ---------------------------------------------------------------------- */
10628 +extern const struct address_space_operations aufs_aop;
10629 +unsigned int au_file_roflags(unsigned int flags);
10630 +struct file *au_h_open(struct dentry *dentry, aufs_bindex_t bindex, int flags,
10631 + struct file *file);
10632 +int au_do_open(struct file *file, int (*open)(struct file *file, int flags),
10633 + struct au_fidir *fidir);
10634 +int au_reopen_nondir(struct file *file);
10636 +int au_ready_to_write(struct file *file, loff_t len, struct au_pin *pin);
10637 +int au_reval_and_lock_fdi(struct file *file, int (*reopen)(struct file *file),
10639 +int au_do_flush(struct file *file, fl_owner_t id,
10640 + int (*flush)(struct file *file, fl_owner_t id));
10643 +#ifdef CONFIG_AUFS_POLL
10644 +unsigned int aufs_poll(struct file *file, poll_table *wait);
10647 +#ifdef CONFIG_AUFS_BR_HFSPLUS
10649 +struct file *au_h_open_pre(struct dentry *dentry, aufs_bindex_t bindex);
10650 +void au_h_open_post(struct dentry *dentry, aufs_bindex_t bindex,
10651 + struct file *h_file);
10654 +struct file *au_h_open_pre(struct dentry *dentry, aufs_bindex_t bindex)
10659 +AuStubVoid(au_h_open_post, struct dentry *dentry, aufs_bindex_t bindex,
10660 + struct file *h_file);
10664 +extern const struct file_operations aufs_file_fop;
10665 +int au_do_open_nondir(struct file *file, int flags);
10666 +int aufs_release_nondir(struct inode *inode __maybe_unused, struct file *file);
10668 +#ifdef CONFIG_AUFS_SP_IATTR
10670 +int au_special_file(umode_t mode);
10671 +void au_init_special_fop(struct inode *inode, umode_t mode, dev_t rdev);
10673 +AuStubInt0(au_special_file, umode_t mode)
10674 +static inline void au_init_special_fop(struct inode *inode, umode_t mode,
10677 + init_special_inode(inode, mode, rdev);
10682 +void au_hfput(struct au_hfile *hf, struct file *file);
10683 +void au_set_h_fptr(struct file *file, aufs_bindex_t bindex,
10684 + struct file *h_file);
10686 +void au_update_figen(struct file *file);
10687 +struct au_fidir *au_fidir_alloc(struct super_block *sb);
10688 +int au_fidir_realloc(struct au_finfo *finfo, int nbr);
10690 +void au_fi_init_once(void *_fi);
10691 +void au_finfo_fin(struct file *file);
10692 +int au_finfo_init(struct file *file, struct au_fidir *fidir);
10695 +long aufs_ioctl_nondir(struct file *file, unsigned int cmd, unsigned long arg);
10696 +#ifdef CONFIG_COMPAT
10697 +long aufs_compat_ioctl_dir(struct file *file, unsigned int cmd,
10698 + unsigned long arg);
10701 +/* ---------------------------------------------------------------------- */
10703 +static inline struct au_finfo *au_fi(struct file *file)
10705 + return file->private_data;
10708 +/* ---------------------------------------------------------------------- */
10711 + * fi_read_lock, fi_write_lock,
10712 + * fi_read_unlock, fi_write_unlock, fi_downgrade_lock
10714 +AuSimpleRwsemFuncs(fi, struct file *f, &au_fi(f)->fi_rwsem);
10716 +#define FiMustNoWaiters(f) AuRwMustNoWaiters(&au_fi(f)->fi_rwsem)
10717 +#define FiMustAnyLock(f) AuRwMustAnyLock(&au_fi(f)->fi_rwsem)
10718 +#define FiMustWriteLock(f) AuRwMustWriteLock(&au_fi(f)->fi_rwsem)
10720 +/* ---------------------------------------------------------------------- */
10722 +/* todo: hard/soft set? */
10723 +static inline aufs_bindex_t au_fbstart(struct file *file)
10725 + FiMustAnyLock(file);
10726 + return au_fi(file)->fi_btop;
10729 +static inline aufs_bindex_t au_fbend_dir(struct file *file)
10731 + FiMustAnyLock(file);
10732 + AuDebugOn(!au_fi(file)->fi_hdir);
10733 + return au_fi(file)->fi_hdir->fd_bbot;
10736 +static inline struct au_vdir *au_fvdir_cache(struct file *file)
10738 + FiMustAnyLock(file);
10739 + AuDebugOn(!au_fi(file)->fi_hdir);
10740 + return au_fi(file)->fi_hdir->fd_vdir_cache;
10743 +static inline void au_set_fbstart(struct file *file, aufs_bindex_t bindex)
10745 + FiMustWriteLock(file);
10746 + au_fi(file)->fi_btop = bindex;
10749 +static inline void au_set_fbend_dir(struct file *file, aufs_bindex_t bindex)
10751 + FiMustWriteLock(file);
10752 + AuDebugOn(!au_fi(file)->fi_hdir);
10753 + au_fi(file)->fi_hdir->fd_bbot = bindex;
10756 +static inline void au_set_fvdir_cache(struct file *file,
10757 + struct au_vdir *vdir_cache)
10759 + FiMustWriteLock(file);
10760 + AuDebugOn(!au_fi(file)->fi_hdir);
10761 + au_fi(file)->fi_hdir->fd_vdir_cache = vdir_cache;
10764 +static inline struct file *au_hf_top(struct file *file)
10766 + FiMustAnyLock(file);
10767 + AuDebugOn(au_fi(file)->fi_hdir);
10768 + return au_fi(file)->fi_htop.hf_file;
10771 +static inline struct file *au_hf_dir(struct file *file, aufs_bindex_t bindex)
10773 + FiMustAnyLock(file);
10774 + AuDebugOn(!au_fi(file)->fi_hdir);
10775 + return au_fi(file)->fi_hdir->fd_hfile[0 + bindex].hf_file;
10778 +/* todo: memory barrier? */
10779 +static inline unsigned int au_figen(struct file *f)
10781 + return atomic_read(&au_fi(f)->fi_generation);
10784 +static inline void au_set_mmapped(struct file *f)
10786 + if (atomic_inc_return(&au_fi(f)->fi_mmapped))
10788 + pr_warning("fi_mmapped wrapped around\n");
10789 + while (!atomic_inc_return(&au_fi(f)->fi_mmapped))
10793 +static inline void au_unset_mmapped(struct file *f)
10795 + atomic_dec(&au_fi(f)->fi_mmapped);
10798 +static inline int au_test_mmapped(struct file *f)
10800 + return atomic_read(&au_fi(f)->fi_mmapped);
10803 +/* customize vma->vm_file */
10805 +static inline void au_do_vm_file_reset(struct vm_area_struct *vma,
10806 + struct file *file)
10810 + f = vma->vm_file;
10812 + vma->vm_file = file;
10817 +#define AuDbgVmRegion(file, vma) do {} while (0)
10819 +static inline void au_vm_file_reset(struct vm_area_struct *vma,
10820 + struct file *file)
10822 + au_do_vm_file_reset(vma, file);
10825 +#define AuDbgVmRegion(file, vma) \
10826 + AuDebugOn((vma)->vm_region && (vma)->vm_region->vm_file != (file))
10828 +static inline void au_vm_file_reset(struct vm_area_struct *vma,
10829 + struct file *file)
10833 + au_do_vm_file_reset(vma, file);
10834 + f = vma->vm_region->vm_file;
10836 + vma->vm_region->vm_file = file;
10839 +#endif /* CONFIG_MMU */
10841 +/* handle vma->vm_prfile */
10842 +static inline void au_vm_prfile_set(struct vm_area_struct *vma,
10843 + struct file *file)
10845 +#ifdef CONFIG_AUFS_PROC_MAP
10847 + vma->vm_prfile = file;
10848 +#ifndef CONFIG_MMU
10850 + vma->vm_region->vm_prfile = file;
10855 +#endif /* __KERNEL__ */
10856 +#endif /* __AUFS_FILE_H__ */
10857 diff -urN /usr/share/empty/fs/aufs/finfo.c linux/fs/aufs/finfo.c
10858 --- /usr/share/empty/fs/aufs/finfo.c 1970-01-01 01:00:00.000000000 +0100
10859 +++ linux/fs/aufs/finfo.c 2012-02-13 21:54:56.969771692 +0100
10862 + * Copyright (C) 2005-2012 Junjiro R. Okajima
10864 + * This program, aufs is free software; you can redistribute it and/or modify
10865 + * it under the terms of the GNU General Public License as published by
10866 + * the Free Software Foundation; either version 2 of the License, or
10867 + * (at your option) any later version.
10869 + * This program is distributed in the hope that it will be useful,
10870 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
10871 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
10872 + * GNU General Public License for more details.
10874 + * You should have received a copy of the GNU General Public License
10875 + * along with this program; if not, write to the Free Software
10876 + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
10880 + * file private data
10885 +void au_hfput(struct au_hfile *hf, struct file *file)
10887 + /* todo: direct access f_flags */
10888 + if (vfsub_file_flags(file) & __FMODE_EXEC)
10889 + allow_write_access(hf->hf_file);
10890 + fput(hf->hf_file);
10891 + hf->hf_file = NULL;
10892 + atomic_dec(&hf->hf_br->br_count);
10893 + hf->hf_br = NULL;
10896 +void au_set_h_fptr(struct file *file, aufs_bindex_t bindex, struct file *val)
10898 + struct au_finfo *finfo = au_fi(file);
10899 + struct au_hfile *hf;
10900 + struct au_fidir *fidir;
10902 + fidir = finfo->fi_hdir;
10904 + AuDebugOn(finfo->fi_btop != bindex);
10905 + hf = &finfo->fi_htop;
10907 + hf = fidir->fd_hfile + bindex;
10909 + if (hf && hf->hf_file)
10910 + au_hfput(hf, file);
10912 + FiMustWriteLock(file);
10913 + hf->hf_file = val;
10914 + hf->hf_br = au_sbr(file->f_dentry->d_sb, bindex);
10918 +void au_update_figen(struct file *file)
10920 + atomic_set(&au_fi(file)->fi_generation, au_digen(file->f_dentry));
10921 + /* smp_mb(); */ /* atomic_set */
10924 +/* ---------------------------------------------------------------------- */
10926 +struct au_fidir *au_fidir_alloc(struct super_block *sb)
10928 + struct au_fidir *fidir;
10931 + nbr = au_sbend(sb) + 1;
10933 + nbr = 2; /* initial allocate for 2 branches */
10934 + fidir = kzalloc(au_fidir_sz(nbr), GFP_NOFS);
10936 + fidir->fd_bbot = -1;
10937 + fidir->fd_nent = nbr;
10938 + fidir->fd_vdir_cache = NULL;
10944 +int au_fidir_realloc(struct au_finfo *finfo, int nbr)
10947 + struct au_fidir *fidir, *p;
10949 + AuRwMustWriteLock(&finfo->fi_rwsem);
10950 + fidir = finfo->fi_hdir;
10951 + AuDebugOn(!fidir);
10954 + p = au_kzrealloc(fidir, au_fidir_sz(fidir->fd_nent), au_fidir_sz(nbr),
10957 + p->fd_nent = nbr;
10958 + finfo->fi_hdir = p;
10965 +/* ---------------------------------------------------------------------- */
10967 +void au_finfo_fin(struct file *file)
10969 + struct au_finfo *finfo;
10971 + au_nfiles_dec(file->f_dentry->d_sb);
10973 + finfo = au_fi(file);
10974 + AuDebugOn(finfo->fi_hdir);
10975 + AuRwDestroy(&finfo->fi_rwsem);
10976 + au_cache_free_finfo(finfo);
10979 +void au_fi_init_once(void *_finfo)
10981 + struct au_finfo *finfo = _finfo;
10982 + static struct lock_class_key aufs_fi;
10984 + au_rw_init(&finfo->fi_rwsem);
10985 + au_rw_class(&finfo->fi_rwsem, &aufs_fi);
10988 +int au_finfo_init(struct file *file, struct au_fidir *fidir)
10991 + struct au_finfo *finfo;
10992 + struct dentry *dentry;
10995 + dentry = file->f_dentry;
10996 + finfo = au_cache_alloc_finfo();
10997 + if (unlikely(!finfo))
11001 + au_nfiles_inc(dentry->d_sb);
11002 + lc_idx = AuLcNonDir_FIINFO;
11004 + lc_idx = AuLcDir_FIINFO;
11005 + au_rw_class(&finfo->fi_rwsem, au_lc_key + lc_idx);
11006 + au_rw_write_lock(&finfo->fi_rwsem);
11007 + finfo->fi_btop = -1;
11008 + finfo->fi_hdir = fidir;
11009 + atomic_set(&finfo->fi_generation, au_digen(dentry));
11010 + /* smp_mb(); */ /* atomic_set */
11012 + file->private_data = finfo;
11017 diff -urN /usr/share/empty/fs/aufs/f_op.c linux/fs/aufs/f_op.c
11018 --- /usr/share/empty/fs/aufs/f_op.c 1970-01-01 01:00:00.000000000 +0100
11019 +++ linux/fs/aufs/f_op.c 2012-02-13 21:54:56.969771692 +0100
11022 + * Copyright (C) 2005-2012 Junjiro R. Okajima
11024 + * This program, aufs is free software; you can redistribute it and/or modify
11025 + * it under the terms of the GNU General Public License as published by
11026 + * the Free Software Foundation; either version 2 of the License, or
11027 + * (at your option) any later version.
11029 + * This program is distributed in the hope that it will be useful,
11030 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
11031 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11032 + * GNU General Public License for more details.
11034 + * You should have received a copy of the GNU General Public License
11035 + * along with this program; if not, write to the Free Software
11036 + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
11040 + * file and vm operations
11043 +#include <linux/fs_stack.h>
11044 +#include <linux/mman.h>
11045 +#include <linux/security.h>
11048 +int au_do_open_nondir(struct file *file, int flags)
11051 + aufs_bindex_t bindex;
11052 + struct file *h_file;
11053 + struct dentry *dentry;
11054 + struct au_finfo *finfo;
11056 + FiMustWriteLock(file);
11058 + dentry = file->f_dentry;
11059 + err = au_d_alive(dentry);
11060 + if (unlikely(err))
11063 + finfo = au_fi(file);
11064 + memset(&finfo->fi_htop, 0, sizeof(finfo->fi_htop));
11065 + atomic_set(&finfo->fi_mmapped, 0);
11066 + bindex = au_dbstart(dentry);
11067 + h_file = au_h_open(dentry, bindex, flags, file);
11068 + if (IS_ERR(h_file))
11069 + err = PTR_ERR(h_file);
11071 + au_set_fbstart(file, bindex);
11072 + au_set_h_fptr(file, bindex, h_file);
11073 + au_update_figen(file);
11074 + /* todo: necessary? */
11075 + /* file->f_ra = h_file->f_ra; */
11082 +static int aufs_open_nondir(struct inode *inode __maybe_unused,
11083 + struct file *file)
11086 + struct super_block *sb;
11088 + AuDbg("%.*s, f_flags 0x%x, f_mode 0x%x\n",
11089 + AuDLNPair(file->f_dentry), vfsub_file_flags(file),
11092 + sb = file->f_dentry->d_sb;
11093 + si_read_lock(sb, AuLock_FLUSH);
11094 + err = au_do_open(file, au_do_open_nondir, /*fidir*/NULL);
11095 + si_read_unlock(sb);
11099 +int aufs_release_nondir(struct inode *inode __maybe_unused, struct file *file)
11101 + struct au_finfo *finfo;
11102 + aufs_bindex_t bindex;
11104 + finfo = au_fi(file);
11105 + bindex = finfo->fi_btop;
11106 + if (bindex >= 0) {
11107 + /* remove me from sb->s_files */
11108 + file_sb_list_del(file);
11109 + au_set_h_fptr(file, bindex, NULL);
11112 + au_finfo_fin(file);
11116 +/* ---------------------------------------------------------------------- */
11118 +static int au_do_flush_nondir(struct file *file, fl_owner_t id)
11121 + struct file *h_file;
11124 + h_file = au_hf_top(file);
11126 + err = vfsub_flush(h_file, id);
11130 +static int aufs_flush_nondir(struct file *file, fl_owner_t id)
11132 + return au_do_flush(file, id, au_do_flush_nondir);
11135 +/* ---------------------------------------------------------------------- */
11137 + * read and write functions acquire [fdi]_rwsem once, but release before
11138 + * mmap_sem. This is because to stop a race condition between mmap(2).
11139 + * Releasing these aufs-rwsem should be safe, no branch-mamagement (by keeping
11140 + * si_rwsem), no harmful copy-up should happen. Actually copy-up may happen in
11141 + * read functions after [fdi]_rwsem are released, but it should be harmless.
11144 +static ssize_t aufs_read(struct file *file, char __user *buf, size_t count,
11148 + struct dentry *dentry;
11149 + struct file *h_file;
11150 + struct super_block *sb;
11152 + dentry = file->f_dentry;
11153 + sb = dentry->d_sb;
11154 + si_read_lock(sb, AuLock_FLUSH | AuLock_NOPLMW);
11155 + err = au_reval_and_lock_fdi(file, au_reopen_nondir, /*wlock*/0);
11156 + if (unlikely(err))
11159 + h_file = au_hf_top(file);
11160 + get_file(h_file);
11161 + di_read_unlock(dentry, AuLock_IR);
11162 + fi_read_unlock(file);
11164 + /* filedata may be obsoleted by concurrent copyup, but no problem */
11165 + err = vfsub_read_u(h_file, buf, count, ppos);
11166 + /* todo: necessary? */
11167 + /* file->f_ra = h_file->f_ra; */
11168 + /* update without lock, I don't think it a problem */
11169 + fsstack_copy_attr_atime(dentry->d_inode, h_file->f_dentry->d_inode);
11173 + si_read_unlock(sb);
11178 + * todo: very ugly
11179 + * it locks both of i_mutex and si_rwsem for read in safe.
11180 + * if the plink maintenance mode continues forever (that is the problem),
11181 + * may loop forever.
11183 +static void au_mtx_and_read_lock(struct inode *inode)
11186 + struct super_block *sb = inode->i_sb;
11189 + mutex_lock(&inode->i_mutex);
11190 + err = si_read_lock(sb, AuLock_FLUSH | AuLock_NOPLM);
11193 + mutex_unlock(&inode->i_mutex);
11194 + si_read_lock(sb, AuLock_NOPLMW);
11195 + si_read_unlock(sb);
11199 +static ssize_t aufs_write(struct file *file, const char __user *ubuf,
11200 + size_t count, loff_t *ppos)
11203 + struct au_pin pin;
11204 + struct dentry *dentry;
11205 + struct super_block *sb;
11206 + struct inode *inode;
11207 + struct file *h_file;
11208 + char __user *buf = (char __user *)ubuf;
11210 + dentry = file->f_dentry;
11211 + sb = dentry->d_sb;
11212 + inode = dentry->d_inode;
11213 + au_mtx_and_read_lock(inode);
11215 + err = au_reval_and_lock_fdi(file, au_reopen_nondir, /*wlock*/1);
11216 + if (unlikely(err))
11219 + err = au_ready_to_write(file, -1, &pin);
11220 + di_downgrade_lock(dentry, AuLock_IR);
11221 + if (unlikely(err)) {
11222 + di_read_unlock(dentry, AuLock_IR);
11223 + fi_write_unlock(file);
11227 + h_file = au_hf_top(file);
11228 + get_file(h_file);
11230 + di_read_unlock(dentry, AuLock_IR);
11231 + fi_write_unlock(file);
11233 + err = vfsub_write_u(h_file, buf, count, ppos);
11234 + ii_write_lock_child(inode);
11235 + au_cpup_attr_timesizes(inode);
11236 + inode->i_mode = h_file->f_dentry->d_inode->i_mode;
11237 + ii_write_unlock(inode);
11241 + si_read_unlock(sb);
11242 + mutex_unlock(&inode->i_mutex);
11246 +static ssize_t au_do_aio(struct file *h_file, int rw, struct kiocb *kio,
11247 + const struct iovec *iov, unsigned long nv, loff_t pos)
11250 + struct file *file;
11251 + ssize_t (*func)(struct kiocb *, const struct iovec *, unsigned long,
11254 + err = security_file_permission(h_file, rw);
11255 + if (unlikely(err))
11260 + if (rw == MAY_READ)
11261 + func = h_file->f_op->aio_read;
11262 + else if (rw == MAY_WRITE)
11263 + func = h_file->f_op->aio_write;
11265 + file = kio->ki_filp;
11266 + kio->ki_filp = h_file;
11268 + err = func(kio, iov, nv, pos);
11270 + kio->ki_filp = file;
11272 + /* currently there is no such fs */
11279 +static ssize_t aufs_aio_read(struct kiocb *kio, const struct iovec *iov,
11280 + unsigned long nv, loff_t pos)
11283 + struct file *file, *h_file;
11284 + struct dentry *dentry;
11285 + struct super_block *sb;
11287 + file = kio->ki_filp;
11288 + dentry = file->f_dentry;
11289 + sb = dentry->d_sb;
11290 + si_read_lock(sb, AuLock_FLUSH | AuLock_NOPLMW);
11291 + err = au_reval_and_lock_fdi(file, au_reopen_nondir, /*wlock*/0);
11292 + if (unlikely(err))
11295 + h_file = au_hf_top(file);
11296 + get_file(h_file);
11297 + di_read_unlock(dentry, AuLock_IR);
11298 + fi_read_unlock(file);
11300 + err = au_do_aio(h_file, MAY_READ, kio, iov, nv, pos);
11301 + /* todo: necessary? */
11302 + /* file->f_ra = h_file->f_ra; */
11303 + /* update without lock, I don't think it a problem */
11304 + fsstack_copy_attr_atime(dentry->d_inode, h_file->f_dentry->d_inode);
11308 + si_read_unlock(sb);
11312 +static ssize_t aufs_aio_write(struct kiocb *kio, const struct iovec *iov,
11313 + unsigned long nv, loff_t pos)
11316 + struct au_pin pin;
11317 + struct dentry *dentry;
11318 + struct inode *inode;
11319 + struct file *file, *h_file;
11320 + struct super_block *sb;
11322 + file = kio->ki_filp;
11323 + dentry = file->f_dentry;
11324 + sb = dentry->d_sb;
11325 + inode = dentry->d_inode;
11326 + au_mtx_and_read_lock(inode);
11328 + err = au_reval_and_lock_fdi(file, au_reopen_nondir, /*wlock*/1);
11329 + if (unlikely(err))
11332 + err = au_ready_to_write(file, -1, &pin);
11333 + di_downgrade_lock(dentry, AuLock_IR);
11334 + if (unlikely(err)) {
11335 + di_read_unlock(dentry, AuLock_IR);
11336 + fi_write_unlock(file);
11340 + h_file = au_hf_top(file);
11341 + get_file(h_file);
11343 + di_read_unlock(dentry, AuLock_IR);
11344 + fi_write_unlock(file);
11346 + err = au_do_aio(h_file, MAY_WRITE, kio, iov, nv, pos);
11347 + ii_write_lock_child(inode);
11348 + au_cpup_attr_timesizes(inode);
11349 + inode->i_mode = h_file->f_dentry->d_inode->i_mode;
11350 + ii_write_unlock(inode);
11354 + si_read_unlock(sb);
11355 + mutex_unlock(&inode->i_mutex);
11359 +static ssize_t aufs_splice_read(struct file *file, loff_t *ppos,
11360 + struct pipe_inode_info *pipe, size_t len,
11361 + unsigned int flags)
11364 + struct file *h_file;
11365 + struct dentry *dentry;
11366 + struct super_block *sb;
11368 + dentry = file->f_dentry;
11369 + sb = dentry->d_sb;
11370 + si_read_lock(sb, AuLock_FLUSH | AuLock_NOPLMW);
11371 + err = au_reval_and_lock_fdi(file, au_reopen_nondir, /*wlock*/0);
11372 + if (unlikely(err))
11376 + h_file = au_hf_top(file);
11377 + get_file(h_file);
11378 + if (au_test_loopback_kthread()) {
11379 + au_warn_loopback(h_file->f_dentry->d_sb);
11380 + if (file->f_mapping != h_file->f_mapping) {
11381 + file->f_mapping = h_file->f_mapping;
11382 + smp_mb(); /* unnecessary? */
11385 + di_read_unlock(dentry, AuLock_IR);
11386 + fi_read_unlock(file);
11388 + err = vfsub_splice_to(h_file, ppos, pipe, len, flags);
11389 + /* todo: necessasry? */
11390 + /* file->f_ra = h_file->f_ra; */
11391 + /* update without lock, I don't think it a problem */
11392 + fsstack_copy_attr_atime(dentry->d_inode, h_file->f_dentry->d_inode);
11396 + si_read_unlock(sb);
11401 +aufs_splice_write(struct pipe_inode_info *pipe, struct file *file, loff_t *ppos,
11402 + size_t len, unsigned int flags)
11405 + struct au_pin pin;
11406 + struct dentry *dentry;
11407 + struct inode *inode;
11408 + struct file *h_file;
11409 + struct super_block *sb;
11411 + dentry = file->f_dentry;
11412 + sb = dentry->d_sb;
11413 + inode = dentry->d_inode;
11414 + au_mtx_and_read_lock(inode);
11416 + err = au_reval_and_lock_fdi(file, au_reopen_nondir, /*wlock*/1);
11417 + if (unlikely(err))
11420 + err = au_ready_to_write(file, -1, &pin);
11421 + di_downgrade_lock(dentry, AuLock_IR);
11422 + if (unlikely(err)) {
11423 + di_read_unlock(dentry, AuLock_IR);
11424 + fi_write_unlock(file);
11428 + h_file = au_hf_top(file);
11429 + get_file(h_file);
11431 + di_read_unlock(dentry, AuLock_IR);
11432 + fi_write_unlock(file);
11434 + err = vfsub_splice_from(pipe, h_file, ppos, len, flags);
11435 + ii_write_lock_child(inode);
11436 + au_cpup_attr_timesizes(inode);
11437 + inode->i_mode = h_file->f_dentry->d_inode->i_mode;
11438 + ii_write_unlock(inode);
11442 + si_read_unlock(sb);
11443 + mutex_unlock(&inode->i_mutex);
11447 +/* ---------------------------------------------------------------------- */
11450 + * The locking order around current->mmap_sem.
11451 + * - in most and regular cases
11452 + * file I/O syscall -- aufs_read() or something
11453 + * -- si_rwsem for read -- mmap_sem
11454 + * (Note that [fdi]i_rwsem are released before mmap_sem).
11456 + * mmap(2) -- mmap_sem -- aufs_mmap() -- si_rwsem for read -- [fdi]i_rwsem
11457 + * This AB-BA order is definitly bad, but is not a problem since "si_rwsem for
11458 + * read" allows muliple processes to acquire it and [fdi]i_rwsem are not held in
11459 + * file I/O. Aufs needs to stop lockdep in aufs_mmap() though.
11460 + * It means that when aufs acquires si_rwsem for write, the process should never
11461 + * acquire mmap_sem.
11463 + * Actually aufs_readdir() holds [fdi]i_rwsem before mmap_sem, but this is not a
11464 + * problem either since any directory is not able to be mmap-ed.
11465 + * The similar scenario is applied to aufs_readlink() too.
11468 +/* cf. linux/include/linux/mman.h: calc_vm_prot_bits() */
11469 +#define AuConv_VM_PROT(f, b) _calc_vm_trans(f, VM_##b, PROT_##b)
11471 +static unsigned long au_arch_prot_conv(unsigned long flags)
11473 + /* currently ppc64 only */
11474 +#ifdef CONFIG_PPC64
11475 + /* cf. linux/arch/powerpc/include/asm/mman.h */
11476 + AuDebugOn(arch_calc_vm_prot_bits(-1) != VM_SAO);
11477 + return AuConv_VM_PROT(flags, SAO);
11479 + AuDebugOn(arch_calc_vm_prot_bits(-1));
11484 +static unsigned long au_prot_conv(unsigned long flags)
11486 + return AuConv_VM_PROT(flags, READ)
11487 + | AuConv_VM_PROT(flags, WRITE)
11488 + | AuConv_VM_PROT(flags, EXEC)
11489 + | au_arch_prot_conv(flags);
11492 +/* cf. linux/include/linux/mman.h: calc_vm_flag_bits() */
11493 +#define AuConv_VM_MAP(f, b) _calc_vm_trans(f, VM_##b, MAP_##b)
11495 +static unsigned long au_flag_conv(unsigned long flags)
11497 + return AuConv_VM_MAP(flags, GROWSDOWN)
11498 + | AuConv_VM_MAP(flags, DENYWRITE)
11499 + | AuConv_VM_MAP(flags, EXECUTABLE)
11500 + | AuConv_VM_MAP(flags, LOCKED);
11503 +static int aufs_mmap(struct file *file, struct vm_area_struct *vma)
11506 + unsigned long prot;
11507 + aufs_bindex_t bstart;
11508 + const unsigned char wlock
11509 + = (file->f_mode & FMODE_WRITE) && (vma->vm_flags & VM_SHARED);
11510 + struct dentry *dentry;
11511 + struct super_block *sb;
11512 + struct file *h_file;
11513 + struct au_branch *br;
11514 + struct au_pin pin;
11516 + AuDbgVmRegion(file, vma);
11518 + dentry = file->f_dentry;
11519 + sb = dentry->d_sb;
11521 + si_read_lock(sb, AuLock_NOPLMW);
11522 + err = au_reval_and_lock_fdi(file, au_reopen_nondir, /*wlock*/1);
11523 + if (unlikely(err))
11527 + err = au_ready_to_write(file, -1, &pin);
11528 + di_write_unlock(dentry);
11529 + if (unlikely(err)) {
11530 + fi_write_unlock(file);
11535 + di_write_unlock(dentry);
11537 + bstart = au_fbstart(file);
11538 + br = au_sbr(sb, bstart);
11539 + h_file = au_hf_top(file);
11540 + get_file(h_file);
11541 + au_set_mmapped(file);
11542 + fi_write_unlock(file);
11545 + au_vm_file_reset(vma, h_file);
11546 + prot = au_prot_conv(vma->vm_flags);
11547 + err = security_file_mmap(h_file, /*reqprot*/prot, prot,
11548 + au_flag_conv(vma->vm_flags), vma->vm_start, 0);
11550 + err = h_file->f_op->mmap(h_file, vma);
11551 + if (unlikely(err))
11554 + au_vm_prfile_set(vma, file);
11555 + /* update without lock, I don't think it a problem */
11556 + fsstack_copy_attr_atime(file->f_dentry->d_inode,
11557 + h_file->f_dentry->d_inode);
11558 + goto out_fput; /* success */
11561 + au_unset_mmapped(file);
11562 + au_vm_file_reset(vma, file);
11567 + si_read_unlock(sb);
11573 +/* ---------------------------------------------------------------------- */
11575 +static int aufs_fsync_nondir(struct file *file, loff_t start, loff_t end,
11579 + struct au_pin pin;
11580 + struct dentry *dentry;
11581 + struct inode *inode;
11582 + struct file *h_file;
11583 + struct super_block *sb;
11585 + dentry = file->f_dentry;
11586 + inode = dentry->d_inode;
11587 + sb = dentry->d_sb;
11588 + mutex_lock(&inode->i_mutex);
11589 + err = si_read_lock(sb, AuLock_FLUSH | AuLock_NOPLM);
11590 + if (unlikely(err))
11593 + err = 0; /* -EBADF; */ /* posix? */
11594 + if (unlikely(!(file->f_mode & FMODE_WRITE)))
11596 + err = au_reval_and_lock_fdi(file, au_reopen_nondir, /*wlock*/1);
11597 + if (unlikely(err))
11600 + err = au_ready_to_write(file, -1, &pin);
11601 + di_downgrade_lock(dentry, AuLock_IR);
11602 + if (unlikely(err))
11607 + h_file = au_hf_top(file);
11608 + err = vfsub_fsync(h_file, &h_file->f_path, datasync);
11609 + au_cpup_attr_timesizes(inode);
11612 + di_read_unlock(dentry, AuLock_IR);
11613 + fi_write_unlock(file);
11615 + si_read_unlock(sb);
11617 + mutex_unlock(&inode->i_mutex);
11621 +/* no one supports this operation, currently */
11623 +static int aufs_aio_fsync_nondir(struct kiocb *kio, int datasync)
11626 + struct au_pin pin;
11627 + struct dentry *dentry;
11628 + struct inode *inode;
11629 + struct file *file, *h_file;
11631 + file = kio->ki_filp;
11632 + dentry = file->f_dentry;
11633 + inode = dentry->d_inode;
11634 + au_mtx_and_read_lock(inode);
11636 + err = 0; /* -EBADF; */ /* posix? */
11637 + if (unlikely(!(file->f_mode & FMODE_WRITE)))
11639 + err = au_reval_and_lock_fdi(file, au_reopen_nondir, /*wlock*/1);
11640 + if (unlikely(err))
11643 + err = au_ready_to_write(file, -1, &pin);
11644 + di_downgrade_lock(dentry, AuLock_IR);
11645 + if (unlikely(err))
11650 + h_file = au_hf_top(file);
11651 + if (h_file->f_op && h_file->f_op->aio_fsync) {
11652 + struct dentry *h_d;
11653 + struct mutex *h_mtx;
11655 + h_d = h_file->f_dentry;
11656 + h_mtx = &h_d->d_inode->i_mutex;
11657 + if (!is_sync_kiocb(kio)) {
11658 + get_file(h_file);
11661 + kio->ki_filp = h_file;
11662 + err = h_file->f_op->aio_fsync(kio, datasync);
11663 + mutex_lock_nested(h_mtx, AuLsc_I_CHILD);
11665 + vfsub_update_h_iattr(&h_file->f_path, /*did*/NULL);
11667 + au_cpup_attr_timesizes(inode);
11668 + mutex_unlock(h_mtx);
11672 + di_read_unlock(dentry, AuLock_IR);
11673 + fi_write_unlock(file);
11675 + si_read_unlock(inode->sb);
11676 + mutex_unlock(&inode->i_mutex);
11681 +static int aufs_fasync(int fd, struct file *file, int flag)
11684 + struct file *h_file;
11685 + struct dentry *dentry;
11686 + struct super_block *sb;
11688 + dentry = file->f_dentry;
11689 + sb = dentry->d_sb;
11690 + si_read_lock(sb, AuLock_FLUSH | AuLock_NOPLMW);
11691 + err = au_reval_and_lock_fdi(file, au_reopen_nondir, /*wlock*/0);
11692 + if (unlikely(err))
11695 + h_file = au_hf_top(file);
11696 + if (h_file->f_op && h_file->f_op->fasync)
11697 + err = h_file->f_op->fasync(fd, h_file, flag);
11699 + di_read_unlock(dentry, AuLock_IR);
11700 + fi_read_unlock(file);
11703 + si_read_unlock(sb);
11707 +/* ---------------------------------------------------------------------- */
11709 +/* no one supports this operation, currently */
11711 +static ssize_t aufs_sendpage(struct file *file, struct page *page, int offset,
11712 + size_t len, loff_t *pos , int more)
11717 +/* ---------------------------------------------------------------------- */
11719 +const struct file_operations aufs_file_fop = {
11720 + .owner = THIS_MODULE,
11722 + .llseek = default_llseek,
11724 + .read = aufs_read,
11725 + .write = aufs_write,
11726 + .aio_read = aufs_aio_read,
11727 + .aio_write = aufs_aio_write,
11728 +#ifdef CONFIG_AUFS_POLL
11729 + .poll = aufs_poll,
11731 + .unlocked_ioctl = aufs_ioctl_nondir,
11732 +#ifdef CONFIG_COMPAT
11733 + .compat_ioctl = aufs_ioctl_nondir, /* same */
11735 + .mmap = aufs_mmap,
11736 + .open = aufs_open_nondir,
11737 + .flush = aufs_flush_nondir,
11738 + .release = aufs_release_nondir,
11739 + .fsync = aufs_fsync_nondir,
11740 + /* .aio_fsync = aufs_aio_fsync_nondir, */
11741 + .fasync = aufs_fasync,
11742 + /* .sendpage = aufs_sendpage, */
11743 + .splice_write = aufs_splice_write,
11744 + .splice_read = aufs_splice_read,
11746 + .aio_splice_write = aufs_aio_splice_write,
11747 + .aio_splice_read = aufs_aio_splice_read
11750 diff -urN /usr/share/empty/fs/aufs/f_op_sp.c linux/fs/aufs/f_op_sp.c
11751 --- /usr/share/empty/fs/aufs/f_op_sp.c 1970-01-01 01:00:00.000000000 +0100
11752 +++ linux/fs/aufs/f_op_sp.c 2012-02-13 21:54:56.969771692 +0100
11755 + * Copyright (C) 2005-2012 Junjiro R. Okajima
11757 + * This program, aufs is free software; you can redistribute it and/or modify
11758 + * it under the terms of the GNU General Public License as published by
11759 + * the Free Software Foundation; either version 2 of the License, or
11760 + * (at your option) any later version.
11762 + * This program is distributed in the hope that it will be useful,
11763 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
11764 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11765 + * GNU General Public License for more details.
11767 + * You should have received a copy of the GNU General Public License
11768 + * along with this program; if not, write to the Free Software
11769 + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
11773 + * file operations for special files.
11774 + * while they exist in aufs virtually,
11775 + * their file I/O is handled out of aufs.
11780 +static ssize_t aufs_aio_read_sp(struct kiocb *kio, const struct iovec *iov,
11781 + unsigned long nv, loff_t pos)
11784 + aufs_bindex_t bstart;
11785 + unsigned char wbr;
11786 + struct file *file, *h_file;
11787 + struct super_block *sb;
11789 + file = kio->ki_filp;
11790 + sb = file->f_dentry->d_sb;
11791 + si_read_lock(sb, AuLock_FLUSH);
11792 + fi_read_lock(file);
11793 + bstart = au_fbstart(file);
11794 + h_file = au_hf_top(file);
11795 + fi_read_unlock(file);
11796 + wbr = !!au_br_writable(au_sbr(sb, bstart)->br_perm);
11797 + si_read_unlock(sb);
11799 + /* do not change the file in kio */
11800 + AuDebugOn(!h_file->f_op || !h_file->f_op->aio_read);
11801 + err = h_file->f_op->aio_read(kio, iov, nv, pos);
11802 + if (err > 0 && wbr)
11803 + file_accessed(h_file);
11808 +static ssize_t aufs_aio_write_sp(struct kiocb *kio, const struct iovec *iov,
11809 + unsigned long nv, loff_t pos)
11812 + aufs_bindex_t bstart;
11813 + unsigned char wbr;
11814 + struct super_block *sb;
11815 + struct file *file, *h_file;
11817 + file = kio->ki_filp;
11818 + sb = file->f_dentry->d_sb;
11819 + si_read_lock(sb, AuLock_FLUSH);
11820 + fi_read_lock(file);
11821 + bstart = au_fbstart(file);
11822 + h_file = au_hf_top(file);
11823 + fi_read_unlock(file);
11824 + wbr = !!au_br_writable(au_sbr(sb, bstart)->br_perm);
11825 + si_read_unlock(sb);
11827 + /* do not change the file in kio */
11828 + AuDebugOn(!h_file->f_op || !h_file->f_op->aio_write);
11829 + err = h_file->f_op->aio_write(kio, iov, nv, pos);
11830 + if (err > 0 && wbr)
11831 + file_update_time(h_file);
11836 +/* ---------------------------------------------------------------------- */
11838 +static int aufs_release_sp(struct inode *inode, struct file *file)
11841 + struct file *h_file;
11843 + fi_read_lock(file);
11844 + h_file = au_hf_top(file);
11845 + fi_read_unlock(file);
11846 + /* close this fifo in aufs */
11847 + err = h_file->f_op->release(inode, file); /* ignore */
11848 + aufs_release_nondir(inode, file); /* ignore */
11852 +/* ---------------------------------------------------------------------- */
11854 +/* currently, support only FIFO */
11856 + AuSp_FIFO, AuSp_FIFO_R, AuSp_FIFO_W, AuSp_FIFO_RW,
11857 + /* AuSp_SOCK, AuSp_CHR, AuSp_BLK, */
11860 +static int aufs_open_sp(struct inode *inode, struct file *file);
11861 +static struct au_sp_fop {
11863 + struct file_operations fop; /* not 'const' */
11865 +} au_sp_fop[AuSp_Last] = {
11868 + .owner = THIS_MODULE,
11869 + .open = aufs_open_sp
11874 +static void au_init_fop_sp(struct file *file)
11876 + struct au_sp_fop *p;
11878 + struct file *h_file;
11881 + if (unlikely(!p->done)) {
11882 + /* initialize first time only */
11883 + static DEFINE_SPINLOCK(spin);
11885 + spin_lock(&spin);
11887 + BUILD_BUG_ON(sizeof(au_sp_fop)/sizeof(*au_sp_fop)
11889 + for (i = 0; i < AuSp_Last; i++)
11890 + spin_lock_init(&p[i].spin);
11893 + spin_unlock(&spin);
11896 + switch (file->f_mode & (FMODE_READ | FMODE_WRITE)) {
11900 + case FMODE_WRITE:
11903 + case FMODE_READ | FMODE_WRITE:
11904 + i = AuSp_FIFO_RW;
11911 + if (unlikely(!p->done)) {
11912 + /* initialize first time only */
11913 + h_file = au_hf_top(file);
11914 + spin_lock(&p->spin);
11916 + p->fop = *h_file->f_op;
11917 + p->fop.owner = THIS_MODULE;
11918 + if (p->fop.aio_read)
11919 + p->fop.aio_read = aufs_aio_read_sp;
11920 + if (p->fop.aio_write)
11921 + p->fop.aio_write = aufs_aio_write_sp;
11922 + p->fop.release = aufs_release_sp;
11925 + spin_unlock(&p->spin);
11927 + file->f_op = &p->fop;
11930 +static int au_cpup_sp(struct dentry *dentry)
11933 + aufs_bindex_t bcpup;
11934 + struct au_pin pin;
11935 + struct au_wr_dir_args wr_dir_args = {
11936 + .force_btgt = -1,
11940 + AuDbg("%.*s\n", AuDLNPair(dentry));
11942 + di_read_unlock(dentry, AuLock_IR);
11943 + di_write_lock_child(dentry);
11944 + err = au_wr_dir(dentry, /*src_dentry*/NULL, &wr_dir_args);
11945 + if (unlikely(err < 0))
11949 + if (bcpup == au_dbstart(dentry))
11950 + goto out; /* success */
11952 + err = au_pin(&pin, dentry, bcpup, au_opt_udba(dentry->d_sb),
11953 + AuPin_MNT_WRITE);
11955 + err = au_sio_cpup_simple(dentry, bcpup, -1, AuCpup_DTIME);
11960 + di_downgrade_lock(dentry, AuLock_IR);
11964 +static int au_do_open_sp(struct file *file, int flags)
11967 + struct dentry *dentry;
11968 + struct super_block *sb;
11969 + struct file *h_file;
11970 + struct inode *h_inode;
11972 + dentry = file->f_dentry;
11973 + AuDbg("%.*s\n", AuDLNPair(dentry));
11976 + * try copying-up.
11977 + * operate on the ro branch is not an error.
11979 + au_cpup_sp(dentry); /* ignore */
11981 + /* prepare h_file */
11982 + err = au_do_open_nondir(file, vfsub_file_flags(file));
11983 + if (unlikely(err))
11986 + sb = dentry->d_sb;
11987 + h_file = au_hf_top(file);
11988 + h_inode = h_file->f_dentry->d_inode;
11989 + di_read_unlock(dentry, AuLock_IR);
11990 + fi_write_unlock(file);
11991 + si_read_unlock(sb);
11992 + /* open this fifo in aufs */
11993 + err = h_inode->i_fop->open(file->f_dentry->d_inode, file);
11994 + si_noflush_read_lock(sb);
11995 + fi_write_lock(file);
11996 + di_read_lock_child(dentry, AuLock_IR);
11998 + au_init_fop_sp(file);
12004 +static int aufs_open_sp(struct inode *inode, struct file *file)
12007 + struct super_block *sb;
12009 + sb = file->f_dentry->d_sb;
12010 + si_read_lock(sb, AuLock_FLUSH);
12011 + err = au_do_open(file, au_do_open_sp, /*fidir*/NULL);
12012 + si_read_unlock(sb);
12016 +/* ---------------------------------------------------------------------- */
12018 +void au_init_special_fop(struct inode *inode, umode_t mode, dev_t rdev)
12020 + init_special_inode(inode, mode, rdev);
12022 + switch (mode & S_IFMT) {
12024 + inode->i_fop = &au_sp_fop[AuSp_FIFO].fop;
12035 +int au_special_file(umode_t mode)
12040 + switch (mode & S_IFMT) {
12052 diff -urN /usr/share/empty/fs/aufs/fstype.h linux/fs/aufs/fstype.h
12053 --- /usr/share/empty/fs/aufs/fstype.h 1970-01-01 01:00:00.000000000 +0100
12054 +++ linux/fs/aufs/fstype.h 2012-02-13 21:54:56.969771692 +0100
12057 + * Copyright (C) 2005-2012 Junjiro R. Okajima
12059 + * This program, aufs is free software; you can redistribute it and/or modify
12060 + * it under the terms of the GNU General Public License as published by
12061 + * the Free Software Foundation; either version 2 of the License, or
12062 + * (at your option) any later version.
12064 + * This program is distributed in the hope that it will be useful,
12065 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
12066 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12067 + * GNU General Public License for more details.
12069 + * You should have received a copy of the GNU General Public License
12070 + * along with this program; if not, write to the Free Software
12071 + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
12075 + * judging filesystem type
12078 +#ifndef __AUFS_FSTYPE_H__
12079 +#define __AUFS_FSTYPE_H__
12083 +#include <linux/fs.h>
12084 +#include <linux/magic.h>
12085 +#include <linux/romfs_fs.h>
12087 +static inline int au_test_aufs(struct super_block *sb)
12089 + return sb->s_magic == AUFS_SUPER_MAGIC;
12092 +static inline const char *au_sbtype(struct super_block *sb)
12094 + return sb->s_type->name;
12097 +static inline int au_test_iso9660(struct super_block *sb __maybe_unused)
12099 +#if defined(CONFIG_ROMFS_FS) || defined(CONFIG_ROMFS_FS_MODULE)
12100 + return sb->s_magic == ROMFS_MAGIC;
12106 +static inline int au_test_romfs(struct super_block *sb __maybe_unused)
12108 +#if defined(CONFIG_ISO9660_FS) || defined(CONFIG_ISO9660_FS_MODULE)
12109 + return sb->s_magic == ISOFS_SUPER_MAGIC;
12115 +static inline int au_test_cramfs(struct super_block *sb __maybe_unused)
12117 +#if defined(CONFIG_CRAMFS) || defined(CONFIG_CRAMFS_MODULE)
12118 + return sb->s_magic == CRAMFS_MAGIC;
12123 +static inline int au_test_nfs(struct super_block *sb __maybe_unused)
12125 +#if defined(CONFIG_NFS_FS) || defined(CONFIG_NFS_FS_MODULE)
12126 + return sb->s_magic == NFS_SUPER_MAGIC;
12132 +static inline int au_test_fuse(struct super_block *sb __maybe_unused)
12134 +#if defined(CONFIG_FUSE_FS) || defined(CONFIG_FUSE_FS_MODULE)
12135 + return sb->s_magic == FUSE_SUPER_MAGIC;
12141 +static inline int au_test_xfs(struct super_block *sb __maybe_unused)
12143 +#if defined(CONFIG_XFS_FS) || defined(CONFIG_XFS_FS_MODULE)
12144 + return sb->s_magic == XFS_SB_MAGIC;
12150 +static inline int au_test_tmpfs(struct super_block *sb __maybe_unused)
12152 +#ifdef CONFIG_TMPFS
12153 + return sb->s_magic == TMPFS_MAGIC;
12159 +static inline int au_test_ecryptfs(struct super_block *sb __maybe_unused)
12161 +#if defined(CONFIG_ECRYPT_FS) || defined(CONFIG_ECRYPT_FS_MODULE)
12162 + return !strcmp(au_sbtype(sb), "ecryptfs");
12168 +static inline int au_test_smbfs(struct super_block *sb __maybe_unused)
12170 +#if defined(CONFIG_SMB_FS) || defined(CONFIG_SMB_FS_MODULE)
12171 + return sb->s_magic == SMB_SUPER_MAGIC;
12177 +static inline int au_test_ocfs2(struct super_block *sb __maybe_unused)
12179 +#if defined(CONFIG_OCFS2_FS) || defined(CONFIG_OCFS2_FS_MODULE)
12180 + return sb->s_magic == OCFS2_SUPER_MAGIC;
12186 +static inline int au_test_ocfs2_dlmfs(struct super_block *sb __maybe_unused)
12188 +#if defined(CONFIG_OCFS2_FS_O2CB) || defined(CONFIG_OCFS2_FS_O2CB_MODULE)
12189 + return sb->s_magic == DLMFS_MAGIC;
12195 +static inline int au_test_coda(struct super_block *sb __maybe_unused)
12197 +#if defined(CONFIG_CODA_FS) || defined(CONFIG_CODA_FS_MODULE)
12198 + return sb->s_magic == CODA_SUPER_MAGIC;
12204 +static inline int au_test_v9fs(struct super_block *sb __maybe_unused)
12206 +#if defined(CONFIG_9P_FS) || defined(CONFIG_9P_FS_MODULE)
12207 + return sb->s_magic == V9FS_MAGIC;
12213 +static inline int au_test_ext4(struct super_block *sb __maybe_unused)
12215 +#if defined(CONFIG_EXT4DEV_FS) || defined(CONFIG_EXT4DEV_FS_MODULE)
12216 + return sb->s_magic == EXT4_SUPER_MAGIC;
12222 +static inline int au_test_sysv(struct super_block *sb __maybe_unused)
12224 +#if defined(CONFIG_SYSV_FS) || defined(CONFIG_SYSV_FS_MODULE)
12225 + return !strcmp(au_sbtype(sb), "sysv");
12231 +static inline int au_test_ramfs(struct super_block *sb)
12233 + return sb->s_magic == RAMFS_MAGIC;
12236 +static inline int au_test_ubifs(struct super_block *sb __maybe_unused)
12238 +#if defined(CONFIG_UBIFS_FS) || defined(CONFIG_UBIFS_FS_MODULE)
12239 + return sb->s_magic == UBIFS_SUPER_MAGIC;
12245 +static inline int au_test_procfs(struct super_block *sb __maybe_unused)
12247 +#ifdef CONFIG_PROC_FS
12248 + return sb->s_magic == PROC_SUPER_MAGIC;
12254 +static inline int au_test_sysfs(struct super_block *sb __maybe_unused)
12256 +#ifdef CONFIG_SYSFS
12257 + return sb->s_magic == SYSFS_MAGIC;
12263 +static inline int au_test_configfs(struct super_block *sb __maybe_unused)
12265 +#if defined(CONFIG_CONFIGFS_FS) || defined(CONFIG_CONFIGFS_FS_MODULE)
12266 + return sb->s_magic == CONFIGFS_MAGIC;
12272 +static inline int au_test_minix(struct super_block *sb __maybe_unused)
12274 +#if defined(CONFIG_MINIX_FS) || defined(CONFIG_MINIX_FS_MODULE)
12275 + return sb->s_magic == MINIX3_SUPER_MAGIC
12276 + || sb->s_magic == MINIX2_SUPER_MAGIC
12277 + || sb->s_magic == MINIX2_SUPER_MAGIC2
12278 + || sb->s_magic == MINIX_SUPER_MAGIC
12279 + || sb->s_magic == MINIX_SUPER_MAGIC2;
12285 +static inline int au_test_cifs(struct super_block *sb __maybe_unused)
12287 +#if defined(CONFIG_CIFS_FS) || defined(CONFIGCIFS_FS_MODULE)
12288 + return sb->s_magic == CIFS_MAGIC_NUMBER;
12294 +static inline int au_test_fat(struct super_block *sb __maybe_unused)
12296 +#if defined(CONFIG_FAT_FS) || defined(CONFIG_FAT_FS_MODULE)
12297 + return sb->s_magic == MSDOS_SUPER_MAGIC;
12303 +static inline int au_test_msdos(struct super_block *sb)
12305 + return au_test_fat(sb);
12308 +static inline int au_test_vfat(struct super_block *sb)
12310 + return au_test_fat(sb);
12313 +static inline int au_test_securityfs(struct super_block *sb __maybe_unused)
12315 +#ifdef CONFIG_SECURITYFS
12316 + return sb->s_magic == SECURITYFS_MAGIC;
12322 +static inline int au_test_squashfs(struct super_block *sb __maybe_unused)
12324 +#if defined(CONFIG_SQUASHFS) || defined(CONFIG_SQUASHFS_MODULE)
12325 + return sb->s_magic == SQUASHFS_MAGIC;
12331 +static inline int au_test_btrfs(struct super_block *sb __maybe_unused)
12333 +#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE)
12334 + return sb->s_magic == BTRFS_SUPER_MAGIC;
12340 +static inline int au_test_xenfs(struct super_block *sb __maybe_unused)
12342 +#if defined(CONFIG_XENFS) || defined(CONFIG_XENFS_MODULE)
12343 + return sb->s_magic == XENFS_SUPER_MAGIC;
12349 +static inline int au_test_debugfs(struct super_block *sb __maybe_unused)
12351 +#ifdef CONFIG_DEBUG_FS
12352 + return sb->s_magic == DEBUGFS_MAGIC;
12358 +static inline int au_test_nilfs(struct super_block *sb __maybe_unused)
12360 +#if defined(CONFIG_NILFS) || defined(CONFIG_NILFS_MODULE)
12361 + return sb->s_magic == NILFS_SUPER_MAGIC;
12367 +static inline int au_test_hfsplus(struct super_block *sb __maybe_unused)
12369 +#if defined(CONFIG_HFSPLUS_FS) || defined(CONFIG_HFSPLUS_FS_MODULE)
12370 + return sb->s_magic == HFSPLUS_SUPER_MAGIC;
12376 +/* ---------------------------------------------------------------------- */
12378 + * they can't be an aufs branch.
12380 +static inline int au_test_fs_unsuppoted(struct super_block *sb)
12383 +#ifndef CONFIG_AUFS_BR_RAMFS
12384 + au_test_ramfs(sb) ||
12386 + au_test_procfs(sb)
12387 + || au_test_sysfs(sb)
12388 + || au_test_configfs(sb)
12389 + || au_test_debugfs(sb)
12390 + || au_test_securityfs(sb)
12391 + || au_test_xenfs(sb)
12392 + || au_test_ecryptfs(sb)
12393 + /* || !strcmp(au_sbtype(sb), "unionfs") */
12394 + || au_test_aufs(sb); /* will be supported in next version */
12398 + * If the filesystem supports NFS-export, then it has to support NULL as
12399 + * a nameidata parameter for ->create(), ->lookup() and ->d_revalidate().
12400 + * We can apply this principle when we handle a lower filesystem.
12402 +static inline int au_test_fs_null_nd(struct super_block *sb)
12404 + return !!sb->s_export_op;
12407 +static inline int au_test_fs_remote(struct super_block *sb)
12409 + return !au_test_tmpfs(sb)
12410 +#ifdef CONFIG_AUFS_BR_RAMFS
12411 + && !au_test_ramfs(sb)
12413 + && !(sb->s_type->fs_flags & FS_REQUIRES_DEV);
12416 +/* ---------------------------------------------------------------------- */
12419 + * Note: these functions (below) are created after reading ->getattr() in all
12420 + * filesystems under linux/fs. it means we have to do so in every update...
12424 + * some filesystems require getattr to refresh the inode attributes before
12426 + * in most cases, we can rely on the inode attribute in NFS (or every remote fs)
12427 + * and leave the work for d_revalidate()
12429 +static inline int au_test_fs_refresh_iattr(struct super_block *sb)
12431 + return au_test_nfs(sb)
12432 + || au_test_fuse(sb)
12433 + /* || au_test_smbfs(sb) */ /* untested */
12434 + /* || au_test_ocfs2(sb) */ /* untested */
12435 + /* || au_test_btrfs(sb) */ /* untested */
12436 + /* || au_test_coda(sb) */ /* untested */
12437 + /* || au_test_v9fs(sb) */ /* untested */
12442 + * filesystems which don't maintain i_size or i_blocks.
12444 +static inline int au_test_fs_bad_iattr_size(struct super_block *sb)
12446 + return au_test_xfs(sb)
12447 + || au_test_btrfs(sb)
12448 + || au_test_ubifs(sb)
12449 + || au_test_hfsplus(sb) /* maintained, but incorrect */
12450 + /* || au_test_ext4(sb) */ /* untested */
12451 + /* || au_test_ocfs2(sb) */ /* untested */
12452 + /* || au_test_ocfs2_dlmfs(sb) */ /* untested */
12453 + /* || au_test_sysv(sb) */ /* untested */
12454 + /* || au_test_minix(sb) */ /* untested */
12459 + * filesystems which don't store the correct value in some of their inode
12462 +static inline int au_test_fs_bad_iattr(struct super_block *sb)
12464 + return au_test_fs_bad_iattr_size(sb)
12465 + /* || au_test_cifs(sb) */ /* untested */
12466 + || au_test_fat(sb)
12467 + || au_test_msdos(sb)
12468 + || au_test_vfat(sb);
12471 +/* they don't check i_nlink in link(2) */
12472 +static inline int au_test_fs_no_limit_nlink(struct super_block *sb)
12474 + return au_test_tmpfs(sb)
12475 +#ifdef CONFIG_AUFS_BR_RAMFS
12476 + || au_test_ramfs(sb)
12478 + || au_test_ubifs(sb)
12479 + || au_test_btrfs(sb)
12480 + || au_test_hfsplus(sb);
12484 + * filesystems which sets S_NOATIME and S_NOCMTIME.
12486 +static inline int au_test_fs_notime(struct super_block *sb)
12488 + return au_test_nfs(sb)
12489 + || au_test_fuse(sb)
12490 + || au_test_ubifs(sb)
12491 + /* || au_test_cifs(sb) */ /* untested */
12496 + * filesystems which requires replacing i_mapping.
12498 +static inline int au_test_fs_bad_mapping(struct super_block *sb)
12500 + return au_test_fuse(sb)
12501 + || au_test_ubifs(sb);
12504 +/* temporary support for i#1 in cramfs */
12505 +static inline int au_test_fs_unique_ino(struct inode *inode)
12507 + if (au_test_cramfs(inode->i_sb))
12508 + return inode->i_ino != 1;
12512 +/* ---------------------------------------------------------------------- */
12515 + * the filesystem where the xino files placed must support i/o after unlink and
12516 + * maintain i_size and i_blocks.
12518 +static inline int au_test_fs_bad_xino(struct super_block *sb)
12520 + return au_test_fs_remote(sb)
12521 + || au_test_fs_bad_iattr_size(sb)
12522 +#ifdef CONFIG_AUFS_BR_RAMFS
12523 + || !(au_test_ramfs(sb) || au_test_fs_null_nd(sb))
12525 + || !au_test_fs_null_nd(sb) /* to keep xino code simple */
12527 + /* don't want unnecessary work for xino */
12528 + || au_test_aufs(sb)
12529 + || au_test_ecryptfs(sb)
12530 + || au_test_nilfs(sb);
12533 +static inline int au_test_fs_trunc_xino(struct super_block *sb)
12535 + return au_test_tmpfs(sb)
12536 + || au_test_ramfs(sb);
12540 + * test if the @sb is real-readonly.
12542 +static inline int au_test_fs_rr(struct super_block *sb)
12544 + return au_test_squashfs(sb)
12545 + || au_test_iso9660(sb)
12546 + || au_test_cramfs(sb)
12547 + || au_test_romfs(sb);
12550 +#endif /* __KERNEL__ */
12551 +#endif /* __AUFS_FSTYPE_H__ */
12552 diff -urN /usr/share/empty/fs/aufs/hfsnotify.c linux/fs/aufs/hfsnotify.c
12553 --- /usr/share/empty/fs/aufs/hfsnotify.c 1970-01-01 01:00:00.000000000 +0100
12554 +++ linux/fs/aufs/hfsnotify.c 2012-02-13 21:54:56.969771692 +0100
12557 + * Copyright (C) 2005-2012 Junjiro R. Okajima
12559 + * This program, aufs is free software; you can redistribute it and/or modify
12560 + * it under the terms of the GNU General Public License as published by
12561 + * the Free Software Foundation; either version 2 of the License, or
12562 + * (at your option) any later version.
12564 + * This program is distributed in the hope that it will be useful,
12565 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
12566 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12567 + * GNU General Public License for more details.
12569 + * You should have received a copy of the GNU General Public License
12570 + * along with this program; if not, write to the Free Software
12571 + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
12575 + * fsnotify for the lower directories
12580 +/* FS_IN_IGNORED is unnecessary */
12581 +static const __u32 AuHfsnMask = (FS_MOVED_TO | FS_MOVED_FROM | FS_DELETE
12582 + | FS_CREATE | FS_EVENT_ON_CHILD);
12583 +static DECLARE_WAIT_QUEUE_HEAD(au_hfsn_wq);
12585 +static void au_hfsn_free_mark(struct fsnotify_mark *mark)
12587 + struct au_hnotify *hn = container_of(mark, struct au_hnotify,
12590 + hn->hn_mark_dead = 1;
12592 + wake_up_all(&au_hfsn_wq);
12595 +static int au_hfsn_alloc(struct au_hinode *hinode)
12597 + struct au_hnotify *hn;
12598 + struct super_block *sb;
12599 + struct au_branch *br;
12600 + struct fsnotify_mark *mark;
12601 + aufs_bindex_t bindex;
12603 + hn = hinode->hi_notify;
12604 + sb = hn->hn_aufs_inode->i_sb;
12605 + bindex = au_br_index(sb, hinode->hi_id);
12606 + br = au_sbr(sb, bindex);
12607 + hn->hn_mark_dead = 0;
12608 + mark = &hn->hn_mark;
12609 + fsnotify_init_mark(mark, au_hfsn_free_mark);
12610 + mark->mask = AuHfsnMask;
12612 + * by udba rename or rmdir, aufs assign a new inode to the known
12613 + * h_inode, so specify 1 to allow dups.
12615 + return fsnotify_add_mark(mark, br->br_hfsn_group, hinode->hi_inode,
12616 + /*mnt*/NULL, /*allow_dups*/1);
12619 +static void au_hfsn_free(struct au_hinode *hinode)
12621 + struct au_hnotify *hn;
12622 + struct fsnotify_mark *mark;
12624 + hn = hinode->hi_notify;
12625 + mark = &hn->hn_mark;
12626 + fsnotify_destroy_mark(mark);
12627 + fsnotify_put_mark(mark);
12629 + /* TODO: bad approach */
12630 + wait_event(au_hfsn_wq, hn->hn_mark_dead);
12633 +/* ---------------------------------------------------------------------- */
12635 +static void au_hfsn_ctl(struct au_hinode *hinode, int do_set)
12637 + struct fsnotify_mark *mark;
12639 + mark = &hinode->hi_notify->hn_mark;
12640 + spin_lock(&mark->lock);
12642 + AuDebugOn(mark->mask & AuHfsnMask);
12643 + mark->mask |= AuHfsnMask;
12645 + AuDebugOn(!(mark->mask & AuHfsnMask));
12646 + mark->mask &= ~AuHfsnMask;
12648 + spin_unlock(&mark->lock);
12649 + /* fsnotify_recalc_inode_mask(hinode->hi_inode); */
12652 +/* ---------------------------------------------------------------------- */
12654 +/* #define AuDbgHnotify */
12655 +#ifdef AuDbgHnotify
12656 +static char *au_hfsn_name(u32 mask)
12658 +#ifdef CONFIG_AUFS_DEBUG
12659 +#define test_ret(flag) if (mask & flag) \
12661 + test_ret(FS_ACCESS);
12662 + test_ret(FS_MODIFY);
12663 + test_ret(FS_ATTRIB);
12664 + test_ret(FS_CLOSE_WRITE);
12665 + test_ret(FS_CLOSE_NOWRITE);
12666 + test_ret(FS_OPEN);
12667 + test_ret(FS_MOVED_FROM);
12668 + test_ret(FS_MOVED_TO);
12669 + test_ret(FS_CREATE);
12670 + test_ret(FS_DELETE);
12671 + test_ret(FS_DELETE_SELF);
12672 + test_ret(FS_MOVE_SELF);
12673 + test_ret(FS_UNMOUNT);
12674 + test_ret(FS_Q_OVERFLOW);
12675 + test_ret(FS_IN_IGNORED);
12676 + test_ret(FS_IN_ISDIR);
12677 + test_ret(FS_IN_ONESHOT);
12678 + test_ret(FS_EVENT_ON_CHILD);
12687 +/* ---------------------------------------------------------------------- */
12689 +static int au_hfsn_handle_event(struct fsnotify_group *group,
12690 + struct fsnotify_mark *inode_mark,
12691 + struct fsnotify_mark *vfsmount_mark,
12692 + struct fsnotify_event *event)
12695 + struct au_hnotify *hnotify;
12696 + struct inode *h_dir, *h_inode;
12698 + struct qstr h_child_qstr = {
12699 + .name = event->file_name,
12700 + .len = event->name_len
12703 + AuDebugOn(event->data_type != FSNOTIFY_EVENT_INODE);
12706 + /* if FS_UNMOUNT happens, there must be another bug */
12707 + mask = event->mask;
12708 + AuDebugOn(mask & FS_UNMOUNT);
12709 + if (mask & (FS_IN_IGNORED | FS_UNMOUNT))
12712 + h_dir = event->to_tell;
12713 + h_inode = event->inode;
12714 +#ifdef AuDbgHnotify
12716 + if (1 || h_child_qstr.len != sizeof(AUFS_XINO_FNAME) - 1
12717 + || strncmp(h_child_qstr.name, AUFS_XINO_FNAME, h_child_qstr.len)) {
12718 + AuDbg("i%lu, mask 0x%x %s, hcname %.*s, hi%lu\n",
12719 + h_dir->i_ino, mask, au_hfsn_name(mask),
12720 + AuLNPair(&h_child_qstr), h_inode ? h_inode->i_ino : 0);
12721 + /* WARN_ON(1); */
12726 + AuDebugOn(!inode_mark);
12727 + hnotify = container_of(inode_mark, struct au_hnotify, hn_mark);
12728 + err = au_hnotify(h_dir, hnotify, mask, &h_child_qstr, h_inode);
12734 +/* isn't it waste to ask every registered 'group'? */
12735 +/* copied from linux/fs/notify/inotify/inotify_fsnotiry.c */
12736 +/* it should be exported to modules */
12737 +static bool au_hfsn_should_send_event(struct fsnotify_group *group,
12738 + struct inode *h_inode,
12739 + struct fsnotify_mark *inode_mark,
12740 + struct fsnotify_mark *vfsmount_mark,
12741 + __u32 mask, void *data, int data_type)
12743 + mask = (mask & ~FS_EVENT_ON_CHILD);
12744 + return inode_mark->mask & mask;
12747 +static struct fsnotify_ops au_hfsn_ops = {
12748 + .should_send_event = au_hfsn_should_send_event,
12749 + .handle_event = au_hfsn_handle_event
12752 +/* ---------------------------------------------------------------------- */
12754 +static void au_hfsn_fin_br(struct au_branch *br)
12756 + if (br->br_hfsn_group)
12757 + fsnotify_put_group(br->br_hfsn_group);
12760 +static int au_hfsn_init_br(struct au_branch *br, int perm)
12762 + br->br_hfsn_group = NULL;
12763 + br->br_hfsn_ops = au_hfsn_ops;
12767 +static int au_hfsn_reset_br(unsigned int udba, struct au_branch *br, int perm)
12772 + if (udba != AuOpt_UDBA_HNOTIFY
12773 + || !au_br_hnotifyable(perm)) {
12774 + au_hfsn_fin_br(br);
12775 + br->br_hfsn_group = NULL;
12779 + if (br->br_hfsn_group)
12782 + br->br_hfsn_group = fsnotify_alloc_group(&br->br_hfsn_ops);
12783 + if (IS_ERR(br->br_hfsn_group)) {
12784 + err = PTR_ERR(br->br_hfsn_group);
12785 + pr_err("fsnotify_alloc_group() failed, %d\n", err);
12786 + br->br_hfsn_group = NULL;
12794 +const struct au_hnotify_op au_hnotify_op = {
12795 + .ctl = au_hfsn_ctl,
12796 + .alloc = au_hfsn_alloc,
12797 + .free = au_hfsn_free,
12799 + .reset_br = au_hfsn_reset_br,
12800 + .fin_br = au_hfsn_fin_br,
12801 + .init_br = au_hfsn_init_br
12803 diff -urN /usr/share/empty/fs/aufs/hfsplus.c linux/fs/aufs/hfsplus.c
12804 --- /usr/share/empty/fs/aufs/hfsplus.c 1970-01-01 01:00:00.000000000 +0100
12805 +++ linux/fs/aufs/hfsplus.c 2012-02-13 21:54:56.969771692 +0100
12808 + * Copyright (C) 2010-2012 Junjiro R. Okajima
12810 + * This program, aufs is free software; you can redistribute it and/or modify
12811 + * it under the terms of the GNU General Public License as published by
12812 + * the Free Software Foundation; either version 2 of the License, or
12813 + * (at your option) any later version.
12815 + * This program is distributed in the hope that it will be useful,
12816 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
12817 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12818 + * GNU General Public License for more details.
12820 + * You should have received a copy of the GNU General Public License
12821 + * along with this program; if not, write to the Free Software
12822 + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
12826 + * special support for filesystems which aqucires an inode mutex
12827 + * at final closing a file, eg, hfsplus.
12829 + * This trick is very simple and stupid, just to open the file before really
12830 + * neceeary open to tell hfsplus that this is not the final closing.
12831 + * The caller should call au_h_open_pre() after acquiring the inode mutex,
12832 + * and au_h_open_post() after releasing it.
12837 +struct file *au_h_open_pre(struct dentry *dentry, aufs_bindex_t bindex)
12839 + struct file *h_file;
12840 + struct dentry *h_dentry;
12842 + h_dentry = au_h_dptr(dentry, bindex);
12843 + AuDebugOn(!h_dentry);
12844 + AuDebugOn(!h_dentry->d_inode);
12845 + IMustLock(h_dentry->d_inode);
12848 + if (au_test_hfsplus(h_dentry->d_sb)
12849 + && S_ISREG(h_dentry->d_inode->i_mode))
12850 + h_file = au_h_open(dentry, bindex,
12851 + O_RDONLY | O_NOATIME | O_LARGEFILE,
12856 +void au_h_open_post(struct dentry *dentry, aufs_bindex_t bindex,
12857 + struct file *h_file)
12861 + au_sbr_put(dentry->d_sb, bindex);
12864 diff -urN /usr/share/empty/fs/aufs/hnotify.c linux/fs/aufs/hnotify.c
12865 --- /usr/share/empty/fs/aufs/hnotify.c 1970-01-01 01:00:00.000000000 +0100
12866 +++ linux/fs/aufs/hnotify.c 2012-02-13 21:54:56.969771692 +0100
12869 + * Copyright (C) 2005-2012 Junjiro R. Okajima
12871 + * This program, aufs is free software; you can redistribute it and/or modify
12872 + * it under the terms of the GNU General Public License as published by
12873 + * the Free Software Foundation; either version 2 of the License, or
12874 + * (at your option) any later version.
12876 + * This program is distributed in the hope that it will be useful,
12877 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
12878 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12879 + * GNU General Public License for more details.
12881 + * You should have received a copy of the GNU General Public License
12882 + * along with this program; if not, write to the Free Software
12883 + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
12887 + * abstraction to notify the direct changes on lower directories
12892 +int au_hn_alloc(struct au_hinode *hinode, struct inode *inode)
12895 + struct au_hnotify *hn;
12898 + hn = au_cache_alloc_hnotify();
12900 + hn->hn_aufs_inode = inode;
12901 + hinode->hi_notify = hn;
12902 + err = au_hnotify_op.alloc(hinode);
12904 + if (unlikely(err)) {
12905 + hinode->hi_notify = NULL;
12906 + au_cache_free_hnotify(hn);
12908 + * The upper dir was removed by udba, but the same named
12909 + * dir left. In this case, aufs assignes a new inode
12910 + * number and set the monitor again.
12911 + * For the lower dir, the old monitnor is still left.
12913 + if (err == -EEXIST)
12922 +void au_hn_free(struct au_hinode *hinode)
12924 + struct au_hnotify *hn;
12926 + hn = hinode->hi_notify;
12928 + au_hnotify_op.free(hinode);
12929 + au_cache_free_hnotify(hn);
12930 + hinode->hi_notify = NULL;
12934 +/* ---------------------------------------------------------------------- */
12936 +void au_hn_ctl(struct au_hinode *hinode, int do_set)
12938 + if (hinode->hi_notify)
12939 + au_hnotify_op.ctl(hinode, do_set);
12942 +void au_hn_reset(struct inode *inode, unsigned int flags)
12944 + aufs_bindex_t bindex, bend;
12945 + struct inode *hi;
12946 + struct dentry *iwhdentry;
12948 + bend = au_ibend(inode);
12949 + for (bindex = au_ibstart(inode); bindex <= bend; bindex++) {
12950 + hi = au_h_iptr(inode, bindex);
12954 + /* mutex_lock_nested(&hi->i_mutex, AuLsc_I_CHILD); */
12955 + iwhdentry = au_hi_wh(inode, bindex);
12959 + au_set_h_iptr(inode, bindex, NULL, 0);
12960 + au_set_h_iptr(inode, bindex, au_igrab(hi),
12961 + flags & ~AuHi_XINO);
12964 + /* mutex_unlock(&hi->i_mutex); */
12968 +/* ---------------------------------------------------------------------- */
12970 +static int hn_xino(struct inode *inode, struct inode *h_inode)
12973 + aufs_bindex_t bindex, bend, bfound, bstart;
12974 + struct inode *h_i;
12977 + if (unlikely(inode->i_ino == AUFS_ROOT_INO)) {
12978 + pr_warning("branch root dir was changed\n");
12983 + bend = au_ibend(inode);
12984 + bstart = au_ibstart(inode);
12985 +#if 0 /* reserved for future use */
12986 + if (bindex == bend) {
12987 + /* keep this ino in rename case */
12991 + for (bindex = bstart; bindex <= bend; bindex++)
12992 + if (au_h_iptr(inode, bindex) == h_inode) {
12999 + for (bindex = bstart; bindex <= bend; bindex++) {
13000 + h_i = au_h_iptr(inode, bindex);
13004 + err = au_xino_write(inode->i_sb, bindex, h_i->i_ino, /*ino*/0);
13005 + /* ignore this error */
13006 + /* bad action? */
13009 + /* children inode number will be broken */
13016 +static int hn_gen_tree(struct dentry *dentry)
13018 + int err, i, j, ndentry;
13019 + struct au_dcsub_pages dpages;
13020 + struct au_dpage *dpage;
13021 + struct dentry **dentries;
13023 + err = au_dpages_init(&dpages, GFP_NOFS);
13024 + if (unlikely(err))
13026 + err = au_dcsub_pages(&dpages, dentry, NULL, NULL);
13027 + if (unlikely(err))
13030 + for (i = 0; i < dpages.ndpage; i++) {
13031 + dpage = dpages.dpages + i;
13032 + dentries = dpage->dentries;
13033 + ndentry = dpage->ndentry;
13034 + for (j = 0; j < ndentry; j++) {
13035 + struct dentry *d;
13043 + /* todo: reset children xino?
13044 + cached children only? */
13045 + au_iigen_dec(d->d_inode);
13050 + au_dpages_free(&dpages);
13053 + /* discard children */
13054 + dentry_unhash(dentry);
13062 + * return 0 if processed.
13064 +static int hn_gen_by_inode(char *name, unsigned int nlen, struct inode *inode,
13065 + const unsigned int isdir)
13068 + struct dentry *d;
13069 + struct qstr *dname;
13072 + if (unlikely(inode->i_ino == AUFS_ROOT_INO)) {
13073 + pr_warning("branch root dir was changed\n");
13079 + AuDebugOn(!name);
13080 + au_iigen_dec(inode);
13081 + spin_lock(&inode->i_lock);
13082 + list_for_each_entry(d, &inode->i_dentry, d_alias) {
13083 + spin_lock(&d->d_lock);
13084 + dname = &d->d_name;
13085 + if (dname->len != nlen
13086 + && memcmp(dname->name, name, nlen)) {
13087 + spin_unlock(&d->d_lock);
13092 + spin_unlock(&d->d_lock);
13095 + spin_unlock(&inode->i_lock);
13097 + au_fset_si(au_sbi(inode->i_sb), FAILED_REFRESH_DIR);
13098 + d = d_find_alias(inode);
13100 + au_iigen_dec(inode);
13104 + spin_lock(&d->d_lock);
13105 + dname = &d->d_name;
13106 + if (dname->len == nlen && !memcmp(dname->name, name, nlen)) {
13107 + spin_unlock(&d->d_lock);
13108 + err = hn_gen_tree(d);
13109 + spin_lock(&d->d_lock);
13111 + spin_unlock(&d->d_lock);
13120 +static int hn_gen_by_name(struct dentry *dentry, const unsigned int isdir)
13123 + struct inode *inode;
13125 + inode = dentry->d_inode;
13126 + if (IS_ROOT(dentry)
13127 + /* || (inode && inode->i_ino == AUFS_ROOT_INO) */
13129 + pr_warning("branch root dir was changed\n");
13135 + au_digen_dec(dentry);
13137 + au_iigen_dec(inode);
13139 + au_fset_si(au_sbi(dentry->d_sb), FAILED_REFRESH_DIR);
13141 + err = hn_gen_tree(dentry);
13148 +/* ---------------------------------------------------------------------- */
13150 +/* hnotify job flags */
13151 +#define AuHnJob_XINO0 1
13152 +#define AuHnJob_GEN (1 << 1)
13153 +#define AuHnJob_DIRENT (1 << 2)
13154 +#define AuHnJob_ISDIR (1 << 3)
13155 +#define AuHnJob_TRYXINO0 (1 << 4)
13156 +#define AuHnJob_MNTPNT (1 << 5)
13157 +#define au_ftest_hnjob(flags, name) ((flags) & AuHnJob_##name)
13158 +#define au_fset_hnjob(flags, name) \
13159 + do { (flags) |= AuHnJob_##name; } while (0)
13160 +#define au_fclr_hnjob(flags, name) \
13161 + do { (flags) &= ~AuHnJob_##name; } while (0)
13169 +struct au_hnotify_args {
13170 + struct inode *h_dir, *dir, *h_child_inode;
13172 + unsigned int flags[AuHnLast];
13173 + unsigned int h_child_nlen;
13174 + char h_child_name[];
13177 +struct hn_job_args {
13178 + unsigned int flags;
13179 + struct inode *inode, *h_inode, *dir, *h_dir;
13180 + struct dentry *dentry;
13185 +static int hn_job(struct hn_job_args *a)
13187 + const unsigned int isdir = au_ftest_hnjob(a->flags, ISDIR);
13190 + if (au_ftest_hnjob(a->flags, XINO0) && a->inode)
13191 + hn_xino(a->inode, a->h_inode); /* ignore this error */
13193 + if (au_ftest_hnjob(a->flags, TRYXINO0)
13196 + mutex_lock_nested(&a->h_inode->i_mutex, AuLsc_I_CHILD);
13197 + if (!a->h_inode->i_nlink)
13198 + hn_xino(a->inode, a->h_inode); /* ignore this error */
13199 + mutex_unlock(&a->h_inode->i_mutex);
13202 + /* make the generation obsolete */
13203 + if (au_ftest_hnjob(a->flags, GEN)) {
13206 + err = hn_gen_by_inode(a->h_name, a->h_nlen, a->inode,
13208 + if (err && a->dentry)
13209 + hn_gen_by_name(a->dentry, isdir);
13210 + /* ignore this error */
13213 + /* make dir entries obsolete */
13214 + if (au_ftest_hnjob(a->flags, DIRENT) && a->inode) {
13215 + struct au_vdir *vdir;
13217 + vdir = au_ivdir(a->inode);
13219 + vdir->vd_jiffy = 0;
13220 + /* IMustLock(a->inode); */
13221 + /* a->inode->i_version++; */
13224 + /* can do nothing but warn */
13225 + if (au_ftest_hnjob(a->flags, MNTPNT)
13227 + && d_mountpoint(a->dentry))
13228 + pr_warning("mount-point %.*s is removed or renamed\n",
13229 + AuDLNPair(a->dentry));
13234 +/* ---------------------------------------------------------------------- */
13236 +static struct dentry *lookup_wlock_by_name(char *name, unsigned int nlen,
13237 + struct inode *dir)
13239 + struct dentry *dentry, *d, *parent;
13240 + struct qstr *dname;
13242 + parent = d_find_alias(dir);
13247 + spin_lock(&parent->d_lock);
13248 + list_for_each_entry(d, &parent->d_subdirs, d_u.d_child) {
13249 + /* AuDbg("%.*s\n", AuDLNPair(d)); */
13250 + spin_lock_nested(&d->d_lock, DENTRY_D_LOCK_NESTED);
13251 + dname = &d->d_name;
13252 + if (dname->len != nlen || memcmp(dname->name, name, nlen))
13253 + goto cont_unlock;
13257 + goto cont_unlock;
13258 + if (d->d_count) {
13259 + dentry = dget_dlock(d);
13260 + spin_unlock(&d->d_lock);
13265 + spin_unlock(&d->d_lock);
13267 + spin_unlock(&parent->d_lock);
13271 + di_write_lock_child(dentry);
13276 +static struct inode *lookup_wlock_by_ino(struct super_block *sb,
13277 + aufs_bindex_t bindex, ino_t h_ino)
13279 + struct inode *inode;
13284 + err = au_xino_read(sb, bindex, h_ino, &ino);
13286 + inode = ilookup(sb, ino);
13290 + if (unlikely(inode->i_ino == AUFS_ROOT_INO)) {
13291 + pr_warning("wrong root branch\n");
13297 + ii_write_lock_child(inode);
13303 +static void au_hn_bh(void *_args)
13305 + struct au_hnotify_args *a = _args;
13306 + struct super_block *sb;
13307 + aufs_bindex_t bindex, bend, bfound;
13308 + unsigned char xino, try_iput;
13310 + struct inode *inode;
13312 + struct hn_job_args args;
13313 + struct dentry *dentry;
13314 + struct au_sbinfo *sbinfo;
13316 + AuDebugOn(!_args);
13317 + AuDebugOn(!a->h_dir);
13318 + AuDebugOn(!a->dir);
13319 + AuDebugOn(!a->mask);
13320 + AuDbg("mask 0x%x, i%lu, hi%lu, hci%lu\n",
13321 + a->mask, a->dir->i_ino, a->h_dir->i_ino,
13322 + a->h_child_inode ? a->h_child_inode->i_ino : 0);
13327 + * do not lock a->dir->i_mutex here
13328 + * because of d_revalidate() may cause a deadlock.
13330 + sb = a->dir->i_sb;
13332 + sbinfo = au_sbi(sb);
13333 + AuDebugOn(!sbinfo);
13334 + si_write_lock(sb, AuLock_NOPLMW);
13336 + ii_read_lock_parent(a->dir);
13338 + bend = au_ibend(a->dir);
13339 + for (bindex = au_ibstart(a->dir); bindex <= bend; bindex++)
13340 + if (au_h_iptr(a->dir, bindex) == a->h_dir) {
13344 + ii_read_unlock(a->dir);
13345 + if (unlikely(bfound < 0))
13348 + xino = !!au_opt_test(au_mntflags(sb), XINO);
13350 + if (a->h_child_inode)
13351 + h_ino = a->h_child_inode->i_ino;
13353 + if (a->h_child_nlen
13354 + && (au_ftest_hnjob(a->flags[AuHn_CHILD], GEN)
13355 + || au_ftest_hnjob(a->flags[AuHn_CHILD], MNTPNT)))
13356 + dentry = lookup_wlock_by_name(a->h_child_name, a->h_child_nlen,
13360 + inode = dentry->d_inode;
13361 + if (xino && !inode && h_ino
13362 + && (au_ftest_hnjob(a->flags[AuHn_CHILD], XINO0)
13363 + || au_ftest_hnjob(a->flags[AuHn_CHILD], TRYXINO0)
13364 + || au_ftest_hnjob(a->flags[AuHn_CHILD], GEN))) {
13365 + inode = lookup_wlock_by_ino(sb, bfound, h_ino);
13369 + args.flags = a->flags[AuHn_CHILD];
13370 + args.dentry = dentry;
13371 + args.inode = inode;
13372 + args.h_inode = a->h_child_inode;
13373 + args.dir = a->dir;
13374 + args.h_dir = a->h_dir;
13375 + args.h_name = a->h_child_name;
13376 + args.h_nlen = a->h_child_nlen;
13377 + err = hn_job(&args);
13379 + if (au_di(dentry))
13380 + di_write_unlock(dentry);
13383 + if (inode && try_iput) {
13384 + ii_write_unlock(inode);
13388 + ii_write_lock_parent(a->dir);
13389 + args.flags = a->flags[AuHn_PARENT];
13390 + args.dentry = NULL;
13391 + args.inode = a->dir;
13392 + args.h_inode = a->h_dir;
13394 + args.h_dir = NULL;
13395 + args.h_name = NULL;
13397 + err = hn_job(&args);
13398 + ii_write_unlock(a->dir);
13401 + iput(a->h_child_inode);
13404 + si_write_unlock(sb);
13405 + au_nwt_done(&sbinfo->si_nowait);
13409 +/* ---------------------------------------------------------------------- */
13411 +int au_hnotify(struct inode *h_dir, struct au_hnotify *hnotify, u32 mask,
13412 + struct qstr *h_child_qstr, struct inode *h_child_inode)
13415 + unsigned int flags[AuHnLast], f;
13416 + unsigned char isdir, isroot, wh;
13417 + struct inode *dir;
13418 + struct au_hnotify_args *args;
13419 + char *p, *h_child_name;
13422 + AuDebugOn(!hnotify || !hnotify->hn_aufs_inode);
13423 + dir = igrab(hnotify->hn_aufs_inode);
13427 + isroot = (dir->i_ino == AUFS_ROOT_INO);
13429 + h_child_name = (void *)h_child_qstr->name;
13430 + len = h_child_qstr->len;
13431 + if (h_child_name) {
13432 + if (len > AUFS_WH_PFX_LEN
13433 + && !memcmp(h_child_name, AUFS_WH_PFX, AUFS_WH_PFX_LEN)) {
13434 + h_child_name += AUFS_WH_PFX_LEN;
13435 + len -= AUFS_WH_PFX_LEN;
13441 + if (h_child_inode)
13442 + isdir = !!S_ISDIR(h_child_inode->i_mode);
13443 + flags[AuHn_PARENT] = AuHnJob_ISDIR;
13444 + flags[AuHn_CHILD] = 0;
13446 + flags[AuHn_CHILD] = AuHnJob_ISDIR;
13447 + au_fset_hnjob(flags[AuHn_PARENT], DIRENT);
13448 + au_fset_hnjob(flags[AuHn_CHILD], GEN);
13449 + switch (mask & FS_EVENTS_POSS_ON_CHILD) {
13450 + case FS_MOVED_FROM:
13451 + case FS_MOVED_TO:
13452 + au_fset_hnjob(flags[AuHn_CHILD], XINO0);
13453 + au_fset_hnjob(flags[AuHn_CHILD], MNTPNT);
13456 + AuDebugOn(!h_child_name || !h_child_inode);
13461 + * aufs never be able to get this child inode.
13462 + * revalidation should be in d_revalidate()
13463 + * by checking i_nlink, i_generation or d_unhashed().
13465 + AuDebugOn(!h_child_name);
13466 + au_fset_hnjob(flags[AuHn_CHILD], TRYXINO0);
13467 + au_fset_hnjob(flags[AuHn_CHILD], MNTPNT);
13475 + h_child_inode = NULL;
13478 + /* iput() and kfree() will be called in au_hnotify() */
13479 + args = kmalloc(sizeof(*args) + len + 1, GFP_NOFS);
13480 + if (unlikely(!args)) {
13481 + AuErr1("no memory\n");
13485 + args->flags[AuHn_PARENT] = flags[AuHn_PARENT];
13486 + args->flags[AuHn_CHILD] = flags[AuHn_CHILD];
13487 + args->mask = mask;
13489 + args->h_dir = igrab(h_dir);
13490 + if (h_child_inode)
13491 + h_child_inode = igrab(h_child_inode); /* can be NULL */
13492 + args->h_child_inode = h_child_inode;
13493 + args->h_child_nlen = len;
13495 + p = (void *)args;
13496 + p += sizeof(*args);
13497 + memcpy(p, h_child_name, len);
13502 + if (!dir->i_nlink)
13504 + err = au_wkq_nowait(au_hn_bh, args, dir->i_sb, f);
13505 + if (unlikely(err)) {
13506 + pr_err("wkq %d\n", err);
13507 + iput(args->h_child_inode);
13508 + iput(args->h_dir);
13517 +/* ---------------------------------------------------------------------- */
13519 +int au_hnotify_reset_br(unsigned int udba, struct au_branch *br, int perm)
13523 + AuDebugOn(!(udba & AuOptMask_UDBA));
13526 + if (au_hnotify_op.reset_br)
13527 + err = au_hnotify_op.reset_br(udba, br, perm);
13532 +int au_hnotify_init_br(struct au_branch *br, int perm)
13537 + if (au_hnotify_op.init_br)
13538 + err = au_hnotify_op.init_br(br, perm);
13543 +void au_hnotify_fin_br(struct au_branch *br)
13545 + if (au_hnotify_op.fin_br)
13546 + au_hnotify_op.fin_br(br);
13549 +static void au_hn_destroy_cache(void)
13551 + kmem_cache_destroy(au_cachep[AuCache_HNOTIFY]);
13552 + au_cachep[AuCache_HNOTIFY] = NULL;
13555 +int __init au_hnotify_init(void)
13560 + au_cachep[AuCache_HNOTIFY] = AuCache(au_hnotify);
13561 + if (au_cachep[AuCache_HNOTIFY]) {
13563 + if (au_hnotify_op.init)
13564 + err = au_hnotify_op.init();
13565 + if (unlikely(err))
13566 + au_hn_destroy_cache();
13572 +void au_hnotify_fin(void)
13574 + if (au_hnotify_op.fin)
13575 + au_hnotify_op.fin();
13576 + /* cf. au_cache_fin() */
13577 + if (au_cachep[AuCache_HNOTIFY])
13578 + au_hn_destroy_cache();
13580 diff -urN /usr/share/empty/fs/aufs/iinfo.c linux/fs/aufs/iinfo.c
13581 --- /usr/share/empty/fs/aufs/iinfo.c 1970-01-01 01:00:00.000000000 +0100
13582 +++ linux/fs/aufs/iinfo.c 2012-02-13 21:54:56.969771692 +0100
13585 + * Copyright (C) 2005-2012 Junjiro R. Okajima
13587 + * This program, aufs is free software; you can redistribute it and/or modify
13588 + * it under the terms of the GNU General Public License as published by
13589 + * the Free Software Foundation; either version 2 of the License, or
13590 + * (at your option) any later version.
13592 + * This program is distributed in the hope that it will be useful,
13593 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
13594 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13595 + * GNU General Public License for more details.
13597 + * You should have received a copy of the GNU General Public License
13598 + * along with this program; if not, write to the Free Software
13599 + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
13603 + * inode private data
13608 +struct inode *au_h_iptr(struct inode *inode, aufs_bindex_t bindex)
13610 + struct inode *h_inode;
13612 + IiMustAnyLock(inode);
13614 + h_inode = au_ii(inode)->ii_hinode[0 + bindex].hi_inode;
13615 + AuDebugOn(h_inode && atomic_read(&h_inode->i_count) <= 0);
13619 +/* todo: hard/soft set? */
13620 +void au_hiput(struct au_hinode *hinode)
13622 + au_hn_free(hinode);
13623 + dput(hinode->hi_whdentry);
13624 + iput(hinode->hi_inode);
13627 +unsigned int au_hi_flags(struct inode *inode, int isdir)
13629 + unsigned int flags;
13630 + const unsigned int mnt_flags = au_mntflags(inode->i_sb);
13633 + if (au_opt_test(mnt_flags, XINO))
13634 + au_fset_hi(flags, XINO);
13635 + if (isdir && au_opt_test(mnt_flags, UDBA_HNOTIFY))
13636 + au_fset_hi(flags, HNOTIFY);
13640 +void au_set_h_iptr(struct inode *inode, aufs_bindex_t bindex,
13641 + struct inode *h_inode, unsigned int flags)
13643 + struct au_hinode *hinode;
13644 + struct inode *hi;
13645 + struct au_iinfo *iinfo = au_ii(inode);
13647 + IiMustWriteLock(inode);
13649 + hinode = iinfo->ii_hinode + bindex;
13650 + hi = hinode->hi_inode;
13651 + AuDebugOn(h_inode && atomic_read(&h_inode->i_count) <= 0);
13654 + au_hiput(hinode);
13655 + hinode->hi_inode = h_inode;
13658 + struct super_block *sb = inode->i_sb;
13659 + struct au_branch *br;
13661 + AuDebugOn(inode->i_mode
13662 + && (h_inode->i_mode & S_IFMT)
13663 + != (inode->i_mode & S_IFMT));
13664 + if (bindex == iinfo->ii_bstart)
13665 + au_cpup_igen(inode, h_inode);
13666 + br = au_sbr(sb, bindex);
13667 + hinode->hi_id = br->br_id;
13668 + if (au_ftest_hi(flags, XINO)) {
13669 + err = au_xino_write(sb, bindex, h_inode->i_ino,
13671 + if (unlikely(err))
13672 + AuIOErr1("failed au_xino_write() %d\n", err);
13675 + if (au_ftest_hi(flags, HNOTIFY)
13676 + && au_br_hnotifyable(br->br_perm)) {
13677 + err = au_hn_alloc(hinode, inode);
13678 + if (unlikely(err))
13679 + AuIOErr1("au_hn_alloc() %d\n", err);
13684 +void au_set_hi_wh(struct inode *inode, aufs_bindex_t bindex,
13685 + struct dentry *h_wh)
13687 + struct au_hinode *hinode;
13689 + IiMustWriteLock(inode);
13691 + hinode = au_ii(inode)->ii_hinode + bindex;
13692 + AuDebugOn(hinode->hi_whdentry);
13693 + hinode->hi_whdentry = h_wh;
13696 +void au_update_iigen(struct inode *inode)
13698 + atomic_set(&au_ii(inode)->ii_generation, au_sigen(inode->i_sb));
13699 + /* smp_mb(); */ /* atomic_set */
13702 +/* it may be called at remount time, too */
13703 +void au_update_ibrange(struct inode *inode, int do_put_zero)
13705 + struct au_iinfo *iinfo;
13706 + aufs_bindex_t bindex, bend;
13708 + iinfo = au_ii(inode);
13712 + IiMustWriteLock(inode);
13714 + if (do_put_zero && iinfo->ii_bstart >= 0) {
13715 + for (bindex = iinfo->ii_bstart; bindex <= iinfo->ii_bend;
13717 + struct inode *h_i;
13719 + h_i = iinfo->ii_hinode[0 + bindex].hi_inode;
13720 + if (h_i && !h_i->i_nlink)
13721 + au_set_h_iptr(inode, bindex, NULL, 0);
13725 + iinfo->ii_bstart = -1;
13726 + iinfo->ii_bend = -1;
13727 + bend = au_sbend(inode->i_sb);
13728 + for (bindex = 0; bindex <= bend; bindex++)
13729 + if (iinfo->ii_hinode[0 + bindex].hi_inode) {
13730 + iinfo->ii_bstart = bindex;
13733 + if (iinfo->ii_bstart >= 0)
13734 + for (bindex = bend; bindex >= iinfo->ii_bstart; bindex--)
13735 + if (iinfo->ii_hinode[0 + bindex].hi_inode) {
13736 + iinfo->ii_bend = bindex;
13739 + AuDebugOn(iinfo->ii_bstart > iinfo->ii_bend);
13742 +/* ---------------------------------------------------------------------- */
13744 +void au_icntnr_init_once(void *_c)
13746 + struct au_icntnr *c = _c;
13747 + struct au_iinfo *iinfo = &c->iinfo;
13748 + static struct lock_class_key aufs_ii;
13750 + au_rw_init(&iinfo->ii_rwsem);
13751 + au_rw_class(&iinfo->ii_rwsem, &aufs_ii);
13752 + inode_init_once(&c->vfs_inode);
13755 +int au_iinfo_init(struct inode *inode)
13757 + struct au_iinfo *iinfo;
13758 + struct super_block *sb;
13761 + sb = inode->i_sb;
13762 + iinfo = &(container_of(inode, struct au_icntnr, vfs_inode)->iinfo);
13763 + nbr = au_sbend(sb) + 1;
13764 + if (unlikely(nbr <= 0))
13766 + iinfo->ii_hinode = kcalloc(nbr, sizeof(*iinfo->ii_hinode), GFP_NOFS);
13767 + if (iinfo->ii_hinode) {
13768 + au_ninodes_inc(sb);
13769 + for (i = 0; i < nbr; i++)
13770 + iinfo->ii_hinode[i].hi_id = -1;
13772 + atomic_set(&iinfo->ii_generation, au_sigen(sb));
13773 + /* smp_mb(); */ /* atomic_set */
13774 + iinfo->ii_bstart = -1;
13775 + iinfo->ii_bend = -1;
13776 + iinfo->ii_vdir = NULL;
13782 +int au_ii_realloc(struct au_iinfo *iinfo, int nbr)
13785 + struct au_hinode *hip;
13787 + AuRwMustWriteLock(&iinfo->ii_rwsem);
13790 + sz = sizeof(*hip) * (iinfo->ii_bend + 1);
13792 + sz = sizeof(*hip);
13793 + hip = au_kzrealloc(iinfo->ii_hinode, sz, sizeof(*hip) * nbr, GFP_NOFS);
13795 + iinfo->ii_hinode = hip;
13802 +void au_iinfo_fin(struct inode *inode)
13804 + struct au_iinfo *iinfo;
13805 + struct au_hinode *hi;
13806 + struct super_block *sb;
13807 + aufs_bindex_t bindex, bend;
13808 + const unsigned char unlinked = !inode->i_nlink;
13810 + iinfo = au_ii(inode);
13811 + /* bad_inode case */
13815 + sb = inode->i_sb;
13816 + au_ninodes_dec(sb);
13817 + if (si_pid_test(sb))
13818 + au_xino_delete_inode(inode, unlinked);
13821 + * it is safe to hide the dependency between sbinfo and
13825 + si_noflush_read_lock(sb);
13826 + au_xino_delete_inode(inode, unlinked);
13827 + si_read_unlock(sb);
13831 + if (iinfo->ii_vdir)
13832 + au_vdir_free(iinfo->ii_vdir);
13834 + bindex = iinfo->ii_bstart;
13835 + if (bindex >= 0) {
13836 + hi = iinfo->ii_hinode + bindex;
13837 + bend = iinfo->ii_bend;
13838 + while (bindex++ <= bend) {
13839 + if (hi->hi_inode)
13844 + kfree(iinfo->ii_hinode);
13845 + iinfo->ii_hinode = NULL;
13846 + AuRwDestroy(&iinfo->ii_rwsem);
13848 diff -urN /usr/share/empty/fs/aufs/inode.c linux/fs/aufs/inode.c
13849 --- /usr/share/empty/fs/aufs/inode.c 1970-01-01 01:00:00.000000000 +0100
13850 +++ linux/fs/aufs/inode.c 2012-02-13 21:54:56.969771692 +0100
13853 + * Copyright (C) 2005-2012 Junjiro R. Okajima
13855 + * This program, aufs is free software; you can redistribute it and/or modify
13856 + * it under the terms of the GNU General Public License as published by
13857 + * the Free Software Foundation; either version 2 of the License, or
13858 + * (at your option) any later version.
13860 + * This program is distributed in the hope that it will be useful,
13861 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
13862 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13863 + * GNU General Public License for more details.
13865 + * You should have received a copy of the GNU General Public License
13866 + * along with this program; if not, write to the Free Software
13867 + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
13871 + * inode functions
13876 +struct inode *au_igrab(struct inode *inode)
13879 + AuDebugOn(!atomic_read(&inode->i_count));
13885 +static void au_refresh_hinode_attr(struct inode *inode, int do_version)
13887 + au_cpup_attr_all(inode, /*force*/0);
13888 + au_update_iigen(inode);
13890 + inode->i_version++;
13893 +static int au_ii_refresh(struct inode *inode, int *update)
13897 + aufs_bindex_t bindex, new_bindex;
13898 + struct super_block *sb;
13899 + struct au_iinfo *iinfo;
13900 + struct au_hinode *p, *q, tmp;
13902 + IiMustWriteLock(inode);
13905 + sb = inode->i_sb;
13906 + type = inode->i_mode & S_IFMT;
13907 + iinfo = au_ii(inode);
13908 + err = au_ii_realloc(iinfo, au_sbend(sb) + 1);
13909 + if (unlikely(err))
13912 + AuDebugOn(iinfo->ii_bstart < 0);
13913 + p = iinfo->ii_hinode + iinfo->ii_bstart;
13914 + for (bindex = iinfo->ii_bstart; bindex <= iinfo->ii_bend;
13916 + if (!p->hi_inode)
13919 + AuDebugOn(type != (p->hi_inode->i_mode & S_IFMT));
13920 + new_bindex = au_br_index(sb, p->hi_id);
13921 + if (new_bindex == bindex)
13924 + if (new_bindex < 0) {
13927 + p->hi_inode = NULL;
13931 + if (new_bindex < iinfo->ii_bstart)
13932 + iinfo->ii_bstart = new_bindex;
13933 + if (iinfo->ii_bend < new_bindex)
13934 + iinfo->ii_bend = new_bindex;
13935 + /* swap two lower inode, and loop again */
13936 + q = iinfo->ii_hinode + new_bindex;
13940 + if (tmp.hi_inode) {
13945 + au_update_ibrange(inode, /*do_put_zero*/0);
13946 + e = au_dy_irefresh(inode);
13947 + if (unlikely(e && !err))
13955 +int au_refresh_hinode_self(struct inode *inode)
13959 + err = au_ii_refresh(inode, &update);
13961 + au_refresh_hinode_attr(inode, update && S_ISDIR(inode->i_mode));
13967 +int au_refresh_hinode(struct inode *inode, struct dentry *dentry)
13969 + int err, e, update;
13970 + unsigned int flags;
13972 + aufs_bindex_t bindex, bend;
13973 + unsigned char isdir;
13974 + struct au_hinode *p;
13975 + struct au_iinfo *iinfo;
13977 + err = au_ii_refresh(inode, &update);
13978 + if (unlikely(err))
13982 + iinfo = au_ii(inode);
13983 + p = iinfo->ii_hinode + iinfo->ii_bstart;
13984 + mode = (inode->i_mode & S_IFMT);
13985 + isdir = S_ISDIR(mode);
13986 + flags = au_hi_flags(inode, isdir);
13987 + bend = au_dbend(dentry);
13988 + for (bindex = au_dbstart(dentry); bindex <= bend; bindex++) {
13989 + struct inode *h_i;
13990 + struct dentry *h_d;
13992 + h_d = au_h_dptr(dentry, bindex);
13993 + if (!h_d || !h_d->d_inode)
13996 + AuDebugOn(mode != (h_d->d_inode->i_mode & S_IFMT));
13997 + if (iinfo->ii_bstart <= bindex && bindex <= iinfo->ii_bend) {
13998 + h_i = au_h_iptr(inode, bindex);
14000 + if (h_i == h_d->d_inode)
14006 + if (bindex < iinfo->ii_bstart)
14007 + iinfo->ii_bstart = bindex;
14008 + if (iinfo->ii_bend < bindex)
14009 + iinfo->ii_bend = bindex;
14010 + au_set_h_iptr(inode, bindex, au_igrab(h_d->d_inode), flags);
14013 + au_update_ibrange(inode, /*do_put_zero*/0);
14014 + e = au_dy_irefresh(inode);
14015 + if (unlikely(e && !err))
14018 + au_refresh_hinode_attr(inode, update && isdir);
14025 +static int set_inode(struct inode *inode, struct dentry *dentry)
14028 + unsigned int flags;
14030 + aufs_bindex_t bindex, bstart, btail;
14031 + unsigned char isdir;
14032 + struct dentry *h_dentry;
14033 + struct inode *h_inode;
14034 + struct au_iinfo *iinfo;
14036 + IiMustWriteLock(inode);
14040 + bstart = au_dbstart(dentry);
14041 + h_inode = au_h_dptr(dentry, bstart)->d_inode;
14042 + mode = h_inode->i_mode;
14043 + switch (mode & S_IFMT) {
14045 + btail = au_dbtail(dentry);
14046 + inode->i_op = &aufs_iop;
14047 + inode->i_fop = &aufs_file_fop;
14048 + err = au_dy_iaop(inode, bstart, h_inode);
14049 + if (unlikely(err))
14054 + btail = au_dbtaildir(dentry);
14055 + inode->i_op = &aufs_dir_iop;
14056 + inode->i_fop = &aufs_dir_fop;
14059 + btail = au_dbtail(dentry);
14060 + inode->i_op = &aufs_symlink_iop;
14066 + btail = au_dbtail(dentry);
14067 + inode->i_op = &aufs_iop;
14068 + au_init_special_fop(inode, mode, h_inode->i_rdev);
14071 + AuIOErr("Unknown file type 0%o\n", mode);
14076 + /* do not set hnotify for whiteouted dirs (SHWH mode) */
14077 + flags = au_hi_flags(inode, isdir);
14078 + if (au_opt_test(au_mntflags(dentry->d_sb), SHWH)
14079 + && au_ftest_hi(flags, HNOTIFY)
14080 + && dentry->d_name.len > AUFS_WH_PFX_LEN
14081 + && !memcmp(dentry->d_name.name, AUFS_WH_PFX, AUFS_WH_PFX_LEN))
14082 + au_fclr_hi(flags, HNOTIFY);
14083 + iinfo = au_ii(inode);
14084 + iinfo->ii_bstart = bstart;
14085 + iinfo->ii_bend = btail;
14086 + for (bindex = bstart; bindex <= btail; bindex++) {
14087 + h_dentry = au_h_dptr(dentry, bindex);
14089 + au_set_h_iptr(inode, bindex,
14090 + au_igrab(h_dentry->d_inode), flags);
14092 + au_cpup_attr_all(inode, /*force*/1);
14099 + * successful returns with iinfo write_locked
14101 + * zero: success, matched
14102 + * plus: no error, but unmatched
14104 +static int reval_inode(struct inode *inode, struct dentry *dentry)
14107 + aufs_bindex_t bindex, bend;
14108 + struct inode *h_inode, *h_dinode;
14111 + * before this function, if aufs got any iinfo lock, it must be only
14112 + * one, the parent dir.
14113 + * it can happen by UDBA and the obsoleted inode number.
14116 + if (unlikely(inode->i_ino == parent_ino(dentry)))
14120 + ii_write_lock_new_child(inode);
14121 + h_dinode = au_h_dptr(dentry, au_dbstart(dentry))->d_inode;
14122 + bend = au_ibend(inode);
14123 + for (bindex = au_ibstart(inode); bindex <= bend; bindex++) {
14124 + h_inode = au_h_iptr(inode, bindex);
14125 + if (h_inode && h_inode == h_dinode) {
14127 + if (au_iigen_test(inode, au_digen(dentry)))
14128 + err = au_refresh_hinode(inode, dentry);
14133 + if (unlikely(err))
14134 + ii_write_unlock(inode);
14139 +int au_ino(struct super_block *sb, aufs_bindex_t bindex, ino_t h_ino,
14140 + unsigned int d_type, ino_t *ino)
14143 + struct mutex *mtx;
14145 + /* prevent hardlinked inode number from race condition */
14147 + if (d_type != DT_DIR) {
14148 + mtx = &au_sbr(sb, bindex)->br_xino.xi_nondir_mtx;
14151 + err = au_xino_read(sb, bindex, h_ino, ino);
14152 + if (unlikely(err))
14157 + *ino = au_xino_new_ino(sb);
14158 + if (unlikely(!*ino))
14160 + err = au_xino_write(sb, bindex, h_ino, *ino);
14161 + if (unlikely(err))
14167 + mutex_unlock(mtx);
14171 +/* successful returns with iinfo write_locked */
14172 +/* todo: return with unlocked? */
14173 +struct inode *au_new_inode(struct dentry *dentry, int must_new)
14175 + struct inode *inode, *h_inode;
14176 + struct dentry *h_dentry;
14177 + struct super_block *sb;
14178 + struct mutex *mtx;
14179 + ino_t h_ino, ino;
14181 + aufs_bindex_t bstart;
14183 + sb = dentry->d_sb;
14184 + bstart = au_dbstart(dentry);
14185 + h_dentry = au_h_dptr(dentry, bstart);
14186 + h_inode = h_dentry->d_inode;
14187 + h_ino = h_inode->i_ino;
14190 + * stop 'race'-ing between hardlinks under different
14194 + if (!S_ISDIR(h_inode->i_mode))
14195 + mtx = &au_sbr(sb, bstart)->br_xino.xi_nondir_mtx;
14200 + err = au_xino_read(sb, bstart, h_ino, &ino);
14201 + inode = ERR_PTR(err);
14202 + if (unlikely(err))
14206 + ino = au_xino_new_ino(sb);
14207 + if (unlikely(!ino)) {
14208 + inode = ERR_PTR(-EIO);
14213 + AuDbg("i%lu\n", (unsigned long)ino);
14214 + inode = au_iget_locked(sb, ino);
14215 + err = PTR_ERR(inode);
14216 + if (IS_ERR(inode))
14219 + AuDbg("%lx, new %d\n", inode->i_state, !!(inode->i_state & I_NEW));
14220 + if (inode->i_state & I_NEW) {
14221 + ii_write_lock_new_child(inode);
14222 + err = set_inode(inode, dentry);
14224 + unlock_new_inode(inode);
14225 + goto out; /* success */
14229 + * iget_failed() calls iput(), but we need to call
14230 + * ii_write_unlock() after iget_failed(). so dirty hack for
14233 + atomic_inc(&inode->i_count);
14234 + iget_failed(inode);
14235 + ii_write_unlock(inode);
14236 + au_xino_write(sb, bstart, h_ino, /*ino*/0);
14237 + /* ignore this error */
14239 + } else if (!must_new && !IS_DEADDIR(inode) && inode->i_nlink) {
14241 + * horrible race condition between lookup, readdir and copyup
14242 + * (or something).
14245 + mutex_unlock(mtx);
14246 + err = reval_inode(inode, dentry);
14247 + if (unlikely(err < 0)) {
14254 + goto out; /* success */
14259 + if (unlikely(au_test_fs_unique_ino(h_dentry->d_inode)))
14260 + AuWarn1("Warning: Un-notified UDBA or repeatedly renamed dir,"
14261 + " b%d, %s, %.*s, hi%lu, i%lu.\n",
14262 + bstart, au_sbtype(h_dentry->d_sb), AuDLNPair(dentry),
14263 + (unsigned long)h_ino, (unsigned long)ino);
14265 + err = au_xino_write(sb, bstart, h_ino, /*ino*/0);
14269 + mutex_unlock(mtx);
14275 + inode = ERR_PTR(err);
14278 + mutex_unlock(mtx);
14282 +/* ---------------------------------------------------------------------- */
14284 +int au_test_ro(struct super_block *sb, aufs_bindex_t bindex,
14285 + struct inode *inode)
14289 + err = au_br_rdonly(au_sbr(sb, bindex));
14291 + /* pseudo-link after flushed may happen out of bounds */
14294 + && au_ibstart(inode) <= bindex
14295 + && bindex <= au_ibend(inode)) {
14297 + * permission check is unnecessary since vfsub routine
14298 + * will be called later
14300 + struct inode *hi = au_h_iptr(inode, bindex);
14302 + err = IS_IMMUTABLE(hi) ? -EROFS : 0;
14308 +int au_test_h_perm(struct inode *h_inode, int mask)
14310 + if (!current_fsuid())
14312 + return inode_permission(h_inode, mask);
14315 +int au_test_h_perm_sio(struct inode *h_inode, int mask)
14317 + if (au_test_nfs(h_inode->i_sb)
14318 + && (mask & MAY_WRITE)
14319 + && S_ISDIR(h_inode->i_mode))
14320 + mask |= MAY_READ; /* force permission check */
14321 + return au_test_h_perm(h_inode, mask);
14323 diff -urN /usr/share/empty/fs/aufs/inode.h linux/fs/aufs/inode.h
14324 --- /usr/share/empty/fs/aufs/inode.h 1970-01-01 01:00:00.000000000 +0100
14325 +++ linux/fs/aufs/inode.h 2012-02-13 21:54:56.969771692 +0100
14328 + * Copyright (C) 2005-2012 Junjiro R. Okajima
14330 + * This program, aufs is free software; you can redistribute it and/or modify
14331 + * it under the terms of the GNU General Public License as published by
14332 + * the Free Software Foundation; either version 2 of the License, or
14333 + * (at your option) any later version.
14335 + * This program is distributed in the hope that it will be useful,
14336 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
14337 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14338 + * GNU General Public License for more details.
14340 + * You should have received a copy of the GNU General Public License
14341 + * along with this program; if not, write to the Free Software
14342 + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
14346 + * inode operations
14349 +#ifndef __AUFS_INODE_H__
14350 +#define __AUFS_INODE_H__
14354 +#include <linux/fsnotify.h>
14355 +#include "rwsem.h"
14359 +struct au_hnotify {
14360 +#ifdef CONFIG_AUFS_HNOTIFY
14361 +#ifdef CONFIG_AUFS_HFSNOTIFY
14362 + /* never use fsnotify_add_vfsmount_mark() */
14363 + struct fsnotify_mark hn_mark;
14364 + int hn_mark_dead;
14366 + struct inode *hn_aufs_inode; /* no get/put */
14368 +} ____cacheline_aligned_in_smp;
14370 +struct au_hinode {
14371 + struct inode *hi_inode;
14372 + aufs_bindex_t hi_id;
14373 +#ifdef CONFIG_AUFS_HNOTIFY
14374 + struct au_hnotify *hi_notify;
14377 + /* reference to the copied-up whiteout with get/put */
14378 + struct dentry *hi_whdentry;
14383 + atomic_t ii_generation;
14384 + struct super_block *ii_hsb1; /* no get/put */
14386 + struct au_rwsem ii_rwsem;
14387 + aufs_bindex_t ii_bstart, ii_bend;
14389 + struct au_hinode *ii_hinode;
14390 + struct au_vdir *ii_vdir;
14393 +struct au_icntnr {
14394 + struct au_iinfo iinfo;
14395 + struct inode vfs_inode;
14396 +} ____cacheline_aligned_in_smp;
14398 +/* au_pin flags */
14399 +#define AuPin_DI_LOCKED 1
14400 +#define AuPin_MNT_WRITE (1 << 1)
14401 +#define au_ftest_pin(flags, name) ((flags) & AuPin_##name)
14402 +#define au_fset_pin(flags, name) \
14403 + do { (flags) |= AuPin_##name; } while (0)
14404 +#define au_fclr_pin(flags, name) \
14405 + do { (flags) &= ~AuPin_##name; } while (0)
14409 + struct dentry *dentry;
14410 + unsigned int udba;
14411 + unsigned char lsc_di, lsc_hi, flags;
14412 + aufs_bindex_t bindex;
14415 + struct dentry *parent;
14416 + struct au_hinode *hdir;
14417 + struct vfsmount *h_mnt;
14420 +/* ---------------------------------------------------------------------- */
14422 +static inline struct au_iinfo *au_ii(struct inode *inode)
14424 + struct au_iinfo *iinfo;
14426 + iinfo = &(container_of(inode, struct au_icntnr, vfs_inode)->iinfo);
14427 + if (iinfo->ii_hinode)
14429 + return NULL; /* debugging bad_inode case */
14432 +/* ---------------------------------------------------------------------- */
14435 +struct inode *au_igrab(struct inode *inode);
14436 +int au_refresh_hinode_self(struct inode *inode);
14437 +int au_refresh_hinode(struct inode *inode, struct dentry *dentry);
14438 +int au_ino(struct super_block *sb, aufs_bindex_t bindex, ino_t h_ino,
14439 + unsigned int d_type, ino_t *ino);
14440 +struct inode *au_new_inode(struct dentry *dentry, int must_new);
14441 +int au_test_ro(struct super_block *sb, aufs_bindex_t bindex,
14442 + struct inode *inode);
14443 +int au_test_h_perm(struct inode *h_inode, int mask);
14444 +int au_test_h_perm_sio(struct inode *h_inode, int mask);
14446 +static inline int au_wh_ino(struct super_block *sb, aufs_bindex_t bindex,
14447 + ino_t h_ino, unsigned int d_type, ino_t *ino)
14449 +#ifdef CONFIG_AUFS_SHWH
14450 + return au_ino(sb, bindex, h_ino, d_type, ino);
14457 +extern struct inode_operations aufs_iop, aufs_symlink_iop, aufs_dir_iop;
14459 +/* au_wr_dir flags */
14460 +#define AuWrDir_ADD_ENTRY 1
14461 +#define AuWrDir_ISDIR (1 << 1)
14462 +#define au_ftest_wrdir(flags, name) ((flags) & AuWrDir_##name)
14463 +#define au_fset_wrdir(flags, name) \
14464 + do { (flags) |= AuWrDir_##name; } while (0)
14465 +#define au_fclr_wrdir(flags, name) \
14466 + do { (flags) &= ~AuWrDir_##name; } while (0)
14468 +struct au_wr_dir_args {
14469 + aufs_bindex_t force_btgt;
14470 + unsigned char flags;
14472 +int au_wr_dir(struct dentry *dentry, struct dentry *src_dentry,
14473 + struct au_wr_dir_args *args);
14475 +struct dentry *au_pinned_h_parent(struct au_pin *pin);
14476 +void au_pin_init(struct au_pin *pin, struct dentry *dentry,
14477 + aufs_bindex_t bindex, int lsc_di, int lsc_hi,
14478 + unsigned int udba, unsigned char flags);
14479 +int au_pin(struct au_pin *pin, struct dentry *dentry, aufs_bindex_t bindex,
14480 + unsigned int udba, unsigned char flags) __must_check;
14481 +int au_do_pin(struct au_pin *pin) __must_check;
14482 +void au_unpin(struct au_pin *pin);
14485 +int au_may_add(struct dentry *dentry, aufs_bindex_t bindex,
14486 + struct dentry *h_parent, int isdir);
14487 +int aufs_mknod(struct inode *dir, struct dentry *dentry, int mode, dev_t dev);
14488 +int aufs_symlink(struct inode *dir, struct dentry *dentry, const char *symname);
14489 +int aufs_create(struct inode *dir, struct dentry *dentry, int mode,
14490 + struct nameidata *nd);
14491 +int aufs_link(struct dentry *src_dentry, struct inode *dir,
14492 + struct dentry *dentry);
14493 +int aufs_mkdir(struct inode *dir, struct dentry *dentry, int mode);
14496 +int au_wr_dir_need_wh(struct dentry *dentry, int isdir, aufs_bindex_t *bcpup);
14497 +int au_may_del(struct dentry *dentry, aufs_bindex_t bindex,
14498 + struct dentry *h_parent, int isdir);
14499 +int aufs_unlink(struct inode *dir, struct dentry *dentry);
14500 +int aufs_rmdir(struct inode *dir, struct dentry *dentry);
14503 +int au_wbr(struct dentry *dentry, aufs_bindex_t btgt);
14504 +int aufs_rename(struct inode *src_dir, struct dentry *src_dentry,
14505 + struct inode *dir, struct dentry *dentry);
14508 +struct inode *au_h_iptr(struct inode *inode, aufs_bindex_t bindex);
14509 +void au_hiput(struct au_hinode *hinode);
14510 +void au_set_hi_wh(struct inode *inode, aufs_bindex_t bindex,
14511 + struct dentry *h_wh);
14512 +unsigned int au_hi_flags(struct inode *inode, int isdir);
14514 +/* hinode flags */
14515 +#define AuHi_XINO 1
14516 +#define AuHi_HNOTIFY (1 << 1)
14517 +#define au_ftest_hi(flags, name) ((flags) & AuHi_##name)
14518 +#define au_fset_hi(flags, name) \
14519 + do { (flags) |= AuHi_##name; } while (0)
14520 +#define au_fclr_hi(flags, name) \
14521 + do { (flags) &= ~AuHi_##name; } while (0)
14523 +#ifndef CONFIG_AUFS_HNOTIFY
14524 +#undef AuHi_HNOTIFY
14525 +#define AuHi_HNOTIFY 0
14528 +void au_set_h_iptr(struct inode *inode, aufs_bindex_t bindex,
14529 + struct inode *h_inode, unsigned int flags);
14531 +void au_update_iigen(struct inode *inode);
14532 +void au_update_ibrange(struct inode *inode, int do_put_zero);
14534 +void au_icntnr_init_once(void *_c);
14535 +int au_iinfo_init(struct inode *inode);
14536 +void au_iinfo_fin(struct inode *inode);
14537 +int au_ii_realloc(struct au_iinfo *iinfo, int nbr);
14539 +#ifdef CONFIG_PROC_FS
14541 +int au_plink_maint(struct super_block *sb, int flags);
14542 +void au_plink_maint_leave(struct au_sbinfo *sbinfo);
14543 +int au_plink_maint_enter(struct super_block *sb);
14544 +#ifdef CONFIG_AUFS_DEBUG
14545 +void au_plink_list(struct super_block *sb);
14547 +AuStubVoid(au_plink_list, struct super_block *sb)
14549 +int au_plink_test(struct inode *inode);
14550 +struct dentry *au_plink_lkup(struct inode *inode, aufs_bindex_t bindex);
14551 +void au_plink_append(struct inode *inode, aufs_bindex_t bindex,
14552 + struct dentry *h_dentry);
14553 +void au_plink_put(struct super_block *sb, int verbose);
14554 +void au_plink_clean(struct super_block *sb, int verbose);
14555 +void au_plink_half_refresh(struct super_block *sb, aufs_bindex_t br_id);
14557 +AuStubInt0(au_plink_maint, struct super_block *sb, int flags);
14558 +AuStubVoid(au_plink_maint_leave, struct au_sbinfo *sbinfo);
14559 +AuStubInt0(au_plink_maint_enter, struct super_block *sb);
14560 +AuStubVoid(au_plink_list, struct super_block *sb);
14561 +AuStubInt0(au_plink_test, struct inode *inode);
14562 +AuStub(struct dentry *, au_plink_lkup, return NULL,
14563 + struct inode *inode, aufs_bindex_t bindex);
14564 +AuStubVoid(au_plink_append, struct inode *inode, aufs_bindex_t bindex,
14565 + struct dentry *h_dentry);
14566 +AuStubVoid(au_plink_put, struct super_block *sb, int verbose);
14567 +AuStubVoid(au_plink_clean, struct super_block *sb, int verbose);
14568 +AuStubVoid(au_plink_half_refresh, struct super_block *sb, aufs_bindex_t br_id);
14569 +#endif /* CONFIG_PROC_FS */
14571 +/* ---------------------------------------------------------------------- */
14573 +/* lock subclass for iinfo */
14575 + AuLsc_II_CHILD, /* child first */
14576 + AuLsc_II_CHILD2, /* rename(2), link(2), and cpup at hnotify */
14577 + AuLsc_II_CHILD3, /* copyup dirs */
14578 + AuLsc_II_PARENT, /* see AuLsc_I_PARENT in vfsub.h */
14579 + AuLsc_II_PARENT2,
14580 + AuLsc_II_PARENT3, /* copyup dirs */
14581 + AuLsc_II_NEW_CHILD
14585 + * ii_read_lock_child, ii_write_lock_child,
14586 + * ii_read_lock_child2, ii_write_lock_child2,
14587 + * ii_read_lock_child3, ii_write_lock_child3,
14588 + * ii_read_lock_parent, ii_write_lock_parent,
14589 + * ii_read_lock_parent2, ii_write_lock_parent2,
14590 + * ii_read_lock_parent3, ii_write_lock_parent3,
14591 + * ii_read_lock_new_child, ii_write_lock_new_child,
14593 +#define AuReadLockFunc(name, lsc) \
14594 +static inline void ii_read_lock_##name(struct inode *i) \
14596 + au_rw_read_lock_nested(&au_ii(i)->ii_rwsem, AuLsc_II_##lsc); \
14599 +#define AuWriteLockFunc(name, lsc) \
14600 +static inline void ii_write_lock_##name(struct inode *i) \
14602 + au_rw_write_lock_nested(&au_ii(i)->ii_rwsem, AuLsc_II_##lsc); \
14605 +#define AuRWLockFuncs(name, lsc) \
14606 + AuReadLockFunc(name, lsc) \
14607 + AuWriteLockFunc(name, lsc)
14609 +AuRWLockFuncs(child, CHILD);
14610 +AuRWLockFuncs(child2, CHILD2);
14611 +AuRWLockFuncs(child3, CHILD3);
14612 +AuRWLockFuncs(parent, PARENT);
14613 +AuRWLockFuncs(parent2, PARENT2);
14614 +AuRWLockFuncs(parent3, PARENT3);
14615 +AuRWLockFuncs(new_child, NEW_CHILD);
14617 +#undef AuReadLockFunc
14618 +#undef AuWriteLockFunc
14619 +#undef AuRWLockFuncs
14622 + * ii_read_unlock, ii_write_unlock, ii_downgrade_lock
14624 +AuSimpleUnlockRwsemFuncs(ii, struct inode *i, &au_ii(i)->ii_rwsem);
14626 +#define IiMustNoWaiters(i) AuRwMustNoWaiters(&au_ii(i)->ii_rwsem)
14627 +#define IiMustAnyLock(i) AuRwMustAnyLock(&au_ii(i)->ii_rwsem)
14628 +#define IiMustWriteLock(i) AuRwMustWriteLock(&au_ii(i)->ii_rwsem)
14630 +/* ---------------------------------------------------------------------- */
14632 +static inline void au_icntnr_init(struct au_icntnr *c)
14634 +#ifdef CONFIG_AUFS_DEBUG
14635 + c->vfs_inode.i_mode = 0;
14639 +static inline unsigned int au_iigen(struct inode *inode)
14641 + return atomic_read(&au_ii(inode)->ii_generation);
14644 +/* tiny test for inode number */
14645 +/* tmpfs generation is too rough */
14646 +static inline int au_test_higen(struct inode *inode, struct inode *h_inode)
14648 + struct au_iinfo *iinfo;
14650 + iinfo = au_ii(inode);
14651 + AuRwMustAnyLock(&iinfo->ii_rwsem);
14652 + return !(iinfo->ii_hsb1 == h_inode->i_sb
14653 + && iinfo->ii_higen == h_inode->i_generation);
14656 +static inline void au_iigen_dec(struct inode *inode)
14658 + atomic_dec(&au_ii(inode)->ii_generation);
14661 +static inline int au_iigen_test(struct inode *inode, unsigned int sigen)
14666 + if (unlikely(inode && au_iigen(inode) != sigen))
14672 +/* ---------------------------------------------------------------------- */
14674 +static inline aufs_bindex_t au_ii_br_id(struct inode *inode,
14675 + aufs_bindex_t bindex)
14677 + IiMustAnyLock(inode);
14678 + return au_ii(inode)->ii_hinode[0 + bindex].hi_id;
14681 +static inline aufs_bindex_t au_ibstart(struct inode *inode)
14683 + IiMustAnyLock(inode);
14684 + return au_ii(inode)->ii_bstart;
14687 +static inline aufs_bindex_t au_ibend(struct inode *inode)
14689 + IiMustAnyLock(inode);
14690 + return au_ii(inode)->ii_bend;
14693 +static inline struct au_vdir *au_ivdir(struct inode *inode)
14695 + IiMustAnyLock(inode);
14696 + return au_ii(inode)->ii_vdir;
14699 +static inline struct dentry *au_hi_wh(struct inode *inode, aufs_bindex_t bindex)
14701 + IiMustAnyLock(inode);
14702 + return au_ii(inode)->ii_hinode[0 + bindex].hi_whdentry;
14705 +static inline void au_set_ibstart(struct inode *inode, aufs_bindex_t bindex)
14707 + IiMustWriteLock(inode);
14708 + au_ii(inode)->ii_bstart = bindex;
14711 +static inline void au_set_ibend(struct inode *inode, aufs_bindex_t bindex)
14713 + IiMustWriteLock(inode);
14714 + au_ii(inode)->ii_bend = bindex;
14717 +static inline void au_set_ivdir(struct inode *inode, struct au_vdir *vdir)
14719 + IiMustWriteLock(inode);
14720 + au_ii(inode)->ii_vdir = vdir;
14723 +static inline struct au_hinode *au_hi(struct inode *inode, aufs_bindex_t bindex)
14725 + IiMustAnyLock(inode);
14726 + return au_ii(inode)->ii_hinode + bindex;
14729 +/* ---------------------------------------------------------------------- */
14731 +static inline struct dentry *au_pinned_parent(struct au_pin *pin)
14734 + return pin->parent;
14738 +static inline struct inode *au_pinned_h_dir(struct au_pin *pin)
14740 + if (pin && pin->hdir)
14741 + return pin->hdir->hi_inode;
14745 +static inline struct au_hinode *au_pinned_hdir(struct au_pin *pin)
14748 + return pin->hdir;
14752 +static inline void au_pin_set_dentry(struct au_pin *pin, struct dentry *dentry)
14755 + pin->dentry = dentry;
14758 +static inline void au_pin_set_parent_lflag(struct au_pin *pin,
14759 + unsigned char lflag)
14763 + au_fset_pin(pin->flags, DI_LOCKED);
14765 + au_fclr_pin(pin->flags, DI_LOCKED);
14769 +static inline void au_pin_set_parent(struct au_pin *pin, struct dentry *parent)
14772 + dput(pin->parent);
14773 + pin->parent = dget(parent);
14777 +/* ---------------------------------------------------------------------- */
14780 +#ifdef CONFIG_AUFS_HNOTIFY
14781 +struct au_hnotify_op {
14782 + void (*ctl)(struct au_hinode *hinode, int do_set);
14783 + int (*alloc)(struct au_hinode *hinode);
14784 + void (*free)(struct au_hinode *hinode);
14786 + void (*fin)(void);
14787 + int (*init)(void);
14789 + int (*reset_br)(unsigned int udba, struct au_branch *br, int perm);
14790 + void (*fin_br)(struct au_branch *br);
14791 + int (*init_br)(struct au_branch *br, int perm);
14795 +int au_hn_alloc(struct au_hinode *hinode, struct inode *inode);
14796 +void au_hn_free(struct au_hinode *hinode);
14797 +void au_hn_ctl(struct au_hinode *hinode, int do_set);
14798 +void au_hn_reset(struct inode *inode, unsigned int flags);
14799 +int au_hnotify(struct inode *h_dir, struct au_hnotify *hnotify, u32 mask,
14800 + struct qstr *h_child_qstr, struct inode *h_child_inode);
14801 +int au_hnotify_reset_br(unsigned int udba, struct au_branch *br, int perm);
14802 +int au_hnotify_init_br(struct au_branch *br, int perm);
14803 +void au_hnotify_fin_br(struct au_branch *br);
14804 +int __init au_hnotify_init(void);
14805 +void au_hnotify_fin(void);
14808 +extern const struct au_hnotify_op au_hnotify_op;
14811 +void au_hn_init(struct au_hinode *hinode)
14813 + hinode->hi_notify = NULL;
14816 +static inline struct au_hnotify *au_hn(struct au_hinode *hinode)
14818 + return hinode->hi_notify;
14823 +int au_hn_alloc(struct au_hinode *hinode __maybe_unused,
14824 + struct inode *inode __maybe_unused)
14826 + return -EOPNOTSUPP;
14829 +static inline struct au_hnotify *au_hn(struct au_hinode *hinode)
14834 +AuStubVoid(au_hn_free, struct au_hinode *hinode __maybe_unused)
14835 +AuStubVoid(au_hn_ctl, struct au_hinode *hinode __maybe_unused,
14836 + int do_set __maybe_unused)
14837 +AuStubVoid(au_hn_reset, struct inode *inode __maybe_unused,
14838 + unsigned int flags __maybe_unused)
14839 +AuStubInt0(au_hnotify_reset_br, unsigned int udba __maybe_unused,
14840 + struct au_branch *br __maybe_unused,
14841 + int perm __maybe_unused)
14842 +AuStubInt0(au_hnotify_init_br, struct au_branch *br __maybe_unused,
14843 + int perm __maybe_unused)
14844 +AuStubVoid(au_hnotify_fin_br, struct au_branch *br __maybe_unused)
14845 +AuStubInt0(__init au_hnotify_init, void)
14846 +AuStubVoid(au_hnotify_fin, void)
14847 +AuStubVoid(au_hn_init, struct au_hinode *hinode __maybe_unused)
14848 +#endif /* CONFIG_AUFS_HNOTIFY */
14850 +static inline void au_hn_suspend(struct au_hinode *hdir)
14852 + au_hn_ctl(hdir, /*do_set*/0);
14855 +static inline void au_hn_resume(struct au_hinode *hdir)
14857 + au_hn_ctl(hdir, /*do_set*/1);
14860 +static inline void au_hn_imtx_lock(struct au_hinode *hdir)
14862 + mutex_lock(&hdir->hi_inode->i_mutex);
14863 + au_hn_suspend(hdir);
14866 +static inline void au_hn_imtx_lock_nested(struct au_hinode *hdir,
14867 + unsigned int sc __maybe_unused)
14869 + mutex_lock_nested(&hdir->hi_inode->i_mutex, sc);
14870 + au_hn_suspend(hdir);
14873 +static inline void au_hn_imtx_unlock(struct au_hinode *hdir)
14875 + au_hn_resume(hdir);
14876 + mutex_unlock(&hdir->hi_inode->i_mutex);
14879 +#endif /* __KERNEL__ */
14880 +#endif /* __AUFS_INODE_H__ */
14881 diff -urN /usr/share/empty/fs/aufs/ioctl.c linux/fs/aufs/ioctl.c
14882 --- /usr/share/empty/fs/aufs/ioctl.c 1970-01-01 01:00:00.000000000 +0100
14883 +++ linux/fs/aufs/ioctl.c 2012-02-13 21:54:56.969771692 +0100
14886 + * Copyright (C) 2005-2012 Junjiro R. Okajima
14888 + * This program, aufs is free software; you can redistribute it and/or modify
14889 + * it under the terms of the GNU General Public License as published by
14890 + * the Free Software Foundation; either version 2 of the License, or
14891 + * (at your option) any later version.
14893 + * This program is distributed in the hope that it will be useful,
14894 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
14895 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14896 + * GNU General Public License for more details.
14898 + * You should have received a copy of the GNU General Public License
14899 + * along with this program; if not, write to the Free Software
14900 + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
14905 + * plink-management and readdir in userspace.
14906 + * assist the pathconf(3) wrapper library.
14911 +static int au_wbr_fd(struct path *path, struct aufs_wbr_fd __user *arg)
14914 + aufs_bindex_t wbi, bindex, bend;
14915 + struct file *h_file;
14916 + struct super_block *sb;
14917 + struct dentry *root;
14918 + struct au_branch *br;
14919 + struct aufs_wbr_fd wbrfd = {
14920 + .oflags = au_dir_roflags,
14923 + const int valid = O_RDONLY | O_NONBLOCK | O_LARGEFILE | O_DIRECTORY
14924 + | O_NOATIME | O_CLOEXEC;
14926 + AuDebugOn(wbrfd.oflags & ~valid);
14929 + err = copy_from_user(&wbrfd, arg, sizeof(wbrfd));
14930 + if (unlikely(err)) {
14936 + AuDbg("wbrfd{0%o, %d}\n", wbrfd.oflags, wbrfd.brid);
14937 + wbrfd.oflags |= au_dir_roflags;
14938 + AuDbg("0%o\n", wbrfd.oflags);
14939 + if (unlikely(wbrfd.oflags & ~valid))
14943 + fd = get_unused_fd();
14945 + if (unlikely(fd < 0))
14948 + h_file = ERR_PTR(-EINVAL);
14951 + sb = path->dentry->d_sb;
14952 + root = sb->s_root;
14953 + aufs_read_lock(root, AuLock_IR);
14954 + bend = au_sbend(sb);
14955 + if (wbrfd.brid >= 0) {
14956 + wbi = au_br_index(sb, wbrfd.brid);
14957 + if (unlikely(wbi < 0 || wbi > bend))
14961 + h_file = ERR_PTR(-ENOENT);
14962 + br = au_sbr(sb, wbi);
14963 + if (!au_br_writable(br->br_perm)) {
14967 + bindex = wbi + 1;
14969 + for (; bindex <= bend; bindex++) {
14970 + br = au_sbr(sb, bindex);
14971 + if (au_br_writable(br->br_perm)) {
14973 + br = au_sbr(sb, wbi);
14978 + AuDbg("wbi %d\n", wbi);
14980 + h_file = au_h_open(root, wbi, wbrfd.oflags, NULL);
14983 + aufs_read_unlock(root, AuLock_IR);
14984 + err = PTR_ERR(h_file);
14985 + if (IS_ERR(h_file))
14988 + atomic_dec(&br->br_count); /* cf. au_h_open() */
14989 + fd_install(fd, h_file);
14991 + goto out; /* success */
14994 + put_unused_fd(fd);
15000 +/* ---------------------------------------------------------------------- */
15002 +long aufs_ioctl_dir(struct file *file, unsigned int cmd, unsigned long arg)
15007 + case AUFS_CTL_RDU:
15008 + case AUFS_CTL_RDU_INO:
15009 + err = au_rdu_ioctl(file, cmd, arg);
15012 + case AUFS_CTL_WBR_FD:
15013 + err = au_wbr_fd(&file->f_path, (void __user *)arg);
15016 + case AUFS_CTL_IBUSY:
15017 + err = au_ibusy_ioctl(file, arg);
15021 + /* do not call the lower */
15022 + AuDbg("0x%x\n", cmd);
15030 +long aufs_ioctl_nondir(struct file *file, unsigned int cmd, unsigned long arg)
15035 + case AUFS_CTL_WBR_FD:
15036 + err = au_wbr_fd(&file->f_path, (void __user *)arg);
15040 + /* do not call the lower */
15041 + AuDbg("0x%x\n", cmd);
15049 +#ifdef CONFIG_COMPAT
15050 +long aufs_compat_ioctl_dir(struct file *file, unsigned int cmd,
15051 + unsigned long arg)
15056 + case AUFS_CTL_RDU:
15057 + case AUFS_CTL_RDU_INO:
15058 + err = au_rdu_compat_ioctl(file, cmd, arg);
15061 + case AUFS_CTL_IBUSY:
15062 + err = au_ibusy_compat_ioctl(file, arg);
15066 + err = aufs_ioctl_dir(file, cmd, arg);
15073 +#if 0 /* unused yet */
15074 +long aufs_compat_ioctl_nondir(struct file *file, unsigned int cmd,
15075 + unsigned long arg)
15077 + return aufs_ioctl_nondir(file, cmd, (unsigned long)compat_ptr(arg));
15081 diff -urN /usr/share/empty/fs/aufs/i_op_add.c linux/fs/aufs/i_op_add.c
15082 --- /usr/share/empty/fs/aufs/i_op_add.c 1970-01-01 01:00:00.000000000 +0100
15083 +++ linux/fs/aufs/i_op_add.c 2012-02-13 21:54:56.969771692 +0100
15086 + * Copyright (C) 2005-2012 Junjiro R. Okajima
15088 + * This program, aufs is free software; you can redistribute it and/or modify
15089 + * it under the terms of the GNU General Public License as published by
15090 + * the Free Software Foundation; either version 2 of the License, or
15091 + * (at your option) any later version.
15093 + * This program is distributed in the hope that it will be useful,
15094 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
15095 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15096 + * GNU General Public License for more details.
15098 + * You should have received a copy of the GNU General Public License
15099 + * along with this program; if not, write to the Free Software
15100 + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
15104 + * inode operations (add entry)
15110 + * final procedure of adding a new entry, except link(2).
15111 + * remove whiteout, instantiate, copyup the parent dir's times and size
15112 + * and update version.
15113 + * if it failed, re-create the removed whiteout.
15115 +static int epilog(struct inode *dir, aufs_bindex_t bindex,
15116 + struct dentry *wh_dentry, struct dentry *dentry)
15119 + aufs_bindex_t bwh;
15120 + struct path h_path;
15121 + struct inode *inode, *h_dir;
15122 + struct dentry *wh;
15126 + h_dir = wh_dentry->d_parent->d_inode; /* dir inode is locked */
15127 + IMustLock(h_dir);
15128 + AuDebugOn(au_h_iptr(dir, bindex) != h_dir);
15129 + bwh = au_dbwh(dentry);
15130 + h_path.dentry = wh_dentry;
15131 + h_path.mnt = au_sbr_mnt(dir->i_sb, bindex);
15132 + err = au_wh_unlink_dentry(au_h_iptr(dir, bindex), &h_path,
15134 + if (unlikely(err))
15138 + inode = au_new_inode(dentry, /*must_new*/1);
15139 + if (!IS_ERR(inode)) {
15140 + d_instantiate(dentry, inode);
15141 + dir = dentry->d_parent->d_inode; /* dir inode is locked */
15143 + if (au_ibstart(dir) == au_dbstart(dentry))
15144 + au_cpup_attr_timesizes(dir);
15145 + dir->i_version++;
15146 + return 0; /* success */
15149 + err = PTR_ERR(inode);
15154 + /* dir inode is locked */
15155 + wh = au_wh_create(dentry, bwh, wh_dentry->d_parent);
15156 + rerr = PTR_ERR(wh);
15157 + if (IS_ERR(wh)) {
15158 + AuIOErr("%.*s reverting whiteout failed(%d, %d)\n",
15159 + AuDLNPair(dentry), err, rerr);
15168 +static int au_d_may_add(struct dentry *dentry)
15173 + if (unlikely(d_unhashed(dentry)))
15175 + if (unlikely(dentry->d_inode))
15181 + * simple tests for the adding inode operations.
15182 + * following the checks in vfs, plus the parent-child relationship.
15184 +int au_may_add(struct dentry *dentry, aufs_bindex_t bindex,
15185 + struct dentry *h_parent, int isdir)
15189 + struct dentry *h_dentry;
15190 + struct inode *h_inode;
15192 + err = -ENAMETOOLONG;
15193 + if (unlikely(dentry->d_name.len > AUFS_MAX_NAMELEN))
15196 + h_dentry = au_h_dptr(dentry, bindex);
15197 + h_inode = h_dentry->d_inode;
15198 + if (!dentry->d_inode) {
15200 + if (unlikely(h_inode))
15203 + /* rename(2) case */
15205 + if (unlikely(!h_inode || !h_inode->i_nlink))
15208 + h_mode = h_inode->i_mode;
15211 + if (unlikely(S_ISDIR(h_mode)))
15213 + } else if (unlikely(!S_ISDIR(h_mode))) {
15220 + /* expected parent dir is locked */
15221 + if (unlikely(h_parent != h_dentry->d_parent))
15230 + * initial procedure of adding a new entry.
15231 + * prepare writable branch and the parent dir, lock it,
15232 + * and lookup whiteout for the new entry.
15234 +static struct dentry*
15235 +lock_hdir_lkup_wh(struct dentry *dentry, struct au_dtime *dt,
15236 + struct dentry *src_dentry, struct au_pin *pin,
15237 + struct au_wr_dir_args *wr_dir_args)
15239 + struct dentry *wh_dentry, *h_parent;
15240 + struct super_block *sb;
15241 + struct au_branch *br;
15243 + unsigned int udba;
15244 + aufs_bindex_t bcpup;
15246 + AuDbg("%.*s\n", AuDLNPair(dentry));
15248 + err = au_wr_dir(dentry, src_dentry, wr_dir_args);
15250 + wh_dentry = ERR_PTR(err);
15251 + if (unlikely(err < 0))
15254 + sb = dentry->d_sb;
15255 + udba = au_opt_udba(sb);
15256 + err = au_pin(pin, dentry, bcpup, udba,
15257 + AuPin_DI_LOCKED | AuPin_MNT_WRITE);
15258 + wh_dentry = ERR_PTR(err);
15259 + if (unlikely(err))
15262 + h_parent = au_pinned_h_parent(pin);
15263 + if (udba != AuOpt_UDBA_NONE
15264 + && au_dbstart(dentry) == bcpup)
15265 + err = au_may_add(dentry, bcpup, h_parent,
15266 + au_ftest_wrdir(wr_dir_args->flags, ISDIR));
15267 + else if (unlikely(dentry->d_name.len > AUFS_MAX_NAMELEN))
15268 + err = -ENAMETOOLONG;
15269 + wh_dentry = ERR_PTR(err);
15270 + if (unlikely(err))
15273 + br = au_sbr(sb, bcpup);
15275 + struct path tmp = {
15276 + .dentry = h_parent,
15277 + .mnt = br->br_mnt
15279 + au_dtime_store(dt, au_pinned_parent(pin), &tmp);
15282 + wh_dentry = NULL;
15283 + if (bcpup != au_dbwh(dentry))
15284 + goto out; /* success */
15286 + wh_dentry = au_wh_lkup(h_parent, &dentry->d_name, br);
15289 + if (IS_ERR(wh_dentry))
15292 + return wh_dentry;
15295 +/* ---------------------------------------------------------------------- */
15297 +enum { Mknod, Symlink, Creat };
15298 +struct simple_arg {
15303 + struct nameidata *nd;
15306 + const char *symname;
15315 +static int add_simple(struct inode *dir, struct dentry *dentry,
15316 + struct simple_arg *arg)
15319 + aufs_bindex_t bstart;
15320 + unsigned char created;
15321 + struct au_dtime dt;
15322 + struct au_pin pin;
15323 + struct path h_path;
15324 + struct dentry *wh_dentry, *parent;
15325 + struct inode *h_dir;
15326 + struct au_wr_dir_args wr_dir_args = {
15327 + .force_btgt = -1,
15328 + .flags = AuWrDir_ADD_ENTRY
15331 + AuDbg("%.*s\n", AuDLNPair(dentry));
15334 + parent = dentry->d_parent; /* dir inode is locked */
15335 + err = aufs_read_lock(dentry, AuLock_DW | AuLock_GEN);
15336 + if (unlikely(err))
15338 + err = au_d_may_add(dentry);
15339 + if (unlikely(err))
15341 + di_write_lock_parent(parent);
15342 + wh_dentry = lock_hdir_lkup_wh(dentry, &dt, /*src_dentry*/NULL, &pin,
15344 + err = PTR_ERR(wh_dentry);
15345 + if (IS_ERR(wh_dentry))
15348 + bstart = au_dbstart(dentry);
15349 + h_path.dentry = au_h_dptr(dentry, bstart);
15350 + h_path.mnt = au_sbr_mnt(dentry->d_sb, bstart);
15351 + h_dir = au_pinned_h_dir(&pin);
15352 + switch (arg->type) {
15354 + err = vfsub_create(h_dir, &h_path, arg->u.c.mode);
15357 + err = vfsub_symlink(h_dir, &h_path, arg->u.s.symname);
15360 + err = vfsub_mknod(h_dir, &h_path, arg->u.m.mode, arg->u.m.dev);
15367 + err = epilog(dir, bstart, wh_dentry, dentry);
15370 + if (unlikely(created && err && h_path.dentry->d_inode)) {
15372 + rerr = vfsub_unlink(h_dir, &h_path, /*force*/0);
15374 + AuIOErr("%.*s revert failure(%d, %d)\n",
15375 + AuDLNPair(dentry), err, rerr);
15378 + au_dtime_revert(&dt);
15385 + di_write_unlock(parent);
15387 + if (unlikely(err)) {
15388 + au_update_dbstart(dentry);
15391 + aufs_read_unlock(dentry, AuLock_DW);
15396 +int aufs_mknod(struct inode *dir, struct dentry *dentry, int mode, dev_t dev)
15398 + struct simple_arg arg = {
15405 + return add_simple(dir, dentry, &arg);
15408 +int aufs_symlink(struct inode *dir, struct dentry *dentry, const char *symname)
15410 + struct simple_arg arg = {
15412 + .u.s.symname = symname
15414 + return add_simple(dir, dentry, &arg);
15417 +int aufs_create(struct inode *dir, struct dentry *dentry, int mode,
15418 + struct nameidata *nd)
15420 + struct simple_arg arg = {
15427 + return add_simple(dir, dentry, &arg);
15430 +/* ---------------------------------------------------------------------- */
15432 +struct au_link_args {
15433 + aufs_bindex_t bdst, bsrc;
15434 + struct au_pin pin;
15435 + struct path h_path;
15436 + struct dentry *src_parent, *parent;
15439 +static int au_cpup_before_link(struct dentry *src_dentry,
15440 + struct au_link_args *a)
15443 + struct dentry *h_src_dentry;
15444 + struct mutex *h_mtx;
15445 + struct file *h_file;
15447 + di_read_lock_parent(a->src_parent, AuLock_IR);
15448 + err = au_test_and_cpup_dirs(src_dentry, a->bdst);
15449 + if (unlikely(err))
15452 + h_src_dentry = au_h_dptr(src_dentry, a->bsrc);
15453 + h_mtx = &h_src_dentry->d_inode->i_mutex;
15454 + err = au_pin(&a->pin, src_dentry, a->bdst,
15455 + au_opt_udba(src_dentry->d_sb),
15456 + AuPin_DI_LOCKED | AuPin_MNT_WRITE);
15457 + if (unlikely(err))
15459 + mutex_lock_nested(h_mtx, AuLsc_I_CHILD);
15460 + h_file = au_h_open_pre(src_dentry, a->bsrc);
15461 + if (IS_ERR(h_file)) {
15462 + err = PTR_ERR(h_file);
15465 + err = au_sio_cpup_simple(src_dentry, a->bdst, -1,
15466 + AuCpup_DTIME /* | AuCpup_KEEPLINO */);
15467 + mutex_unlock(h_mtx);
15468 + au_h_open_post(src_dentry, a->bsrc, h_file);
15469 + au_unpin(&a->pin);
15472 + di_read_unlock(a->src_parent, AuLock_IR);
15476 +static int au_cpup_or_link(struct dentry *src_dentry, struct au_link_args *a)
15479 + unsigned char plink;
15480 + struct inode *h_inode, *inode;
15481 + struct dentry *h_src_dentry;
15482 + struct super_block *sb;
15483 + struct file *h_file;
15487 + sb = src_dentry->d_sb;
15488 + inode = src_dentry->d_inode;
15489 + if (au_ibstart(inode) <= a->bdst)
15490 + h_inode = au_h_iptr(inode, a->bdst);
15491 + if (!h_inode || !h_inode->i_nlink) {
15492 + /* copyup src_dentry as the name of dentry. */
15493 + au_set_dbstart(src_dentry, a->bdst);
15494 + au_set_h_dptr(src_dentry, a->bdst, dget(a->h_path.dentry));
15495 + h_inode = au_h_dptr(src_dentry, a->bsrc)->d_inode;
15496 + mutex_lock_nested(&h_inode->i_mutex, AuLsc_I_CHILD);
15497 + h_file = au_h_open_pre(src_dentry, a->bsrc);
15498 + if (IS_ERR(h_file)) {
15499 + err = PTR_ERR(h_file);
15502 + err = au_sio_cpup_single(src_dentry, a->bdst, a->bsrc,
15503 + -1, AuCpup_KEEPLINO,
15505 + mutex_unlock(&h_inode->i_mutex);
15506 + au_h_open_post(src_dentry, a->bsrc, h_file);
15507 + au_set_h_dptr(src_dentry, a->bdst, NULL);
15508 + au_set_dbstart(src_dentry, a->bsrc);
15510 + /* the inode of src_dentry already exists on a.bdst branch */
15511 + h_src_dentry = d_find_alias(h_inode);
15512 + if (!h_src_dentry && au_plink_test(inode)) {
15514 + h_src_dentry = au_plink_lkup(inode, a->bdst);
15515 + err = PTR_ERR(h_src_dentry);
15516 + if (IS_ERR(h_src_dentry))
15519 + if (unlikely(!h_src_dentry->d_inode)) {
15520 + dput(h_src_dentry);
15521 + h_src_dentry = NULL;
15525 + if (h_src_dentry) {
15526 + err = vfsub_link(h_src_dentry, au_pinned_h_dir(&a->pin),
15528 + dput(h_src_dentry);
15530 + AuIOErr("no dentry found for hi%lu on b%d\n",
15531 + h_inode->i_ino, a->bdst);
15536 + if (!err && !plink)
15537 + au_plink_append(inode, a->bdst, a->h_path.dentry);
15544 +int aufs_link(struct dentry *src_dentry, struct inode *dir,
15545 + struct dentry *dentry)
15548 + struct au_dtime dt;
15549 + struct au_link_args *a;
15550 + struct dentry *wh_dentry, *h_src_dentry;
15551 + struct inode *inode;
15552 + struct super_block *sb;
15553 + struct au_wr_dir_args wr_dir_args = {
15554 + /* .force_btgt = -1, */
15555 + .flags = AuWrDir_ADD_ENTRY
15559 + inode = src_dentry->d_inode;
15560 + IMustLock(inode);
15563 + a = kzalloc(sizeof(*a), GFP_NOFS);
15564 + if (unlikely(!a))
15567 + a->parent = dentry->d_parent; /* dir inode is locked */
15568 + err = aufs_read_and_write_lock2(dentry, src_dentry,
15569 + AuLock_NOPLM | AuLock_GEN);
15570 + if (unlikely(err))
15572 + err = au_d_hashed_positive(src_dentry);
15573 + if (unlikely(err))
15575 + err = au_d_may_add(dentry);
15576 + if (unlikely(err))
15579 + a->src_parent = dget_parent(src_dentry);
15580 + wr_dir_args.force_btgt = au_ibstart(inode);
15582 + di_write_lock_parent(a->parent);
15583 + wr_dir_args.force_btgt = au_wbr(dentry, wr_dir_args.force_btgt);
15584 + wh_dentry = lock_hdir_lkup_wh(dentry, &dt, src_dentry, &a->pin,
15586 + err = PTR_ERR(wh_dentry);
15587 + if (IS_ERR(wh_dentry))
15591 + sb = dentry->d_sb;
15592 + a->bdst = au_dbstart(dentry);
15593 + a->h_path.dentry = au_h_dptr(dentry, a->bdst);
15594 + a->h_path.mnt = au_sbr_mnt(sb, a->bdst);
15595 + a->bsrc = au_ibstart(inode);
15596 + h_src_dentry = au_h_d_alias(src_dentry, a->bsrc);
15597 + if (!h_src_dentry) {
15598 + a->bsrc = au_dbstart(src_dentry);
15599 + h_src_dentry = au_h_d_alias(src_dentry, a->bsrc);
15600 + AuDebugOn(!h_src_dentry);
15601 + } else if (IS_ERR(h_src_dentry))
15604 + if (au_opt_test(au_mntflags(sb), PLINK)) {
15605 + if (a->bdst < a->bsrc
15606 + /* && h_src_dentry->d_sb != a->h_path.dentry->d_sb */)
15607 + err = au_cpup_or_link(src_dentry, a);
15609 + err = vfsub_link(h_src_dentry, au_pinned_h_dir(&a->pin),
15611 + dput(h_src_dentry);
15614 + * copyup src_dentry to the branch we process,
15615 + * and then link(2) to it.
15617 + dput(h_src_dentry);
15618 + if (a->bdst < a->bsrc
15619 + /* && h_src_dentry->d_sb != a->h_path.dentry->d_sb */) {
15620 + au_unpin(&a->pin);
15621 + di_write_unlock(a->parent);
15622 + err = au_cpup_before_link(src_dentry, a);
15623 + di_write_lock_parent(a->parent);
15625 + err = au_pin(&a->pin, dentry, a->bdst,
15627 + AuPin_DI_LOCKED | AuPin_MNT_WRITE);
15628 + if (unlikely(err))
15632 + h_src_dentry = au_h_dptr(src_dentry, a->bdst);
15634 + if (h_src_dentry && h_src_dentry->d_inode)
15635 + err = vfsub_link(h_src_dentry,
15636 + au_pinned_h_dir(&a->pin),
15640 + if (unlikely(err))
15644 + a->h_path.dentry = wh_dentry;
15645 + err = au_wh_unlink_dentry(au_pinned_h_dir(&a->pin), &a->h_path,
15647 + if (unlikely(err))
15651 + dir->i_version++;
15652 + if (au_ibstart(dir) == au_dbstart(dentry))
15653 + au_cpup_attr_timesizes(dir);
15654 + inc_nlink(inode);
15655 + inode->i_ctime = dir->i_ctime;
15656 + d_instantiate(dentry, au_igrab(inode));
15657 + if (d_unhashed(a->h_path.dentry))
15658 + /* some filesystem calls d_drop() */
15660 + goto out_unpin; /* success */
15663 + rerr = vfsub_unlink(au_pinned_h_dir(&a->pin), &a->h_path, /*force*/0);
15664 + if (unlikely(rerr)) {
15665 + AuIOErr("%.*s reverting failed(%d, %d)\n",
15666 + AuDLNPair(dentry), err, rerr);
15669 + au_dtime_revert(&dt);
15671 + au_unpin(&a->pin);
15675 + di_write_unlock(a->parent);
15676 + dput(a->src_parent);
15678 + if (unlikely(err)) {
15679 + au_update_dbstart(dentry);
15682 + aufs_read_and_write_unlock2(dentry, src_dentry);
15689 +int aufs_mkdir(struct inode *dir, struct dentry *dentry, int mode)
15692 + aufs_bindex_t bindex;
15693 + unsigned char diropq;
15694 + struct path h_path;
15695 + struct dentry *wh_dentry, *parent, *opq_dentry;
15696 + struct mutex *h_mtx;
15697 + struct super_block *sb;
15699 + struct au_pin pin;
15700 + struct au_dtime dt;
15701 + } *a; /* reduce the stack usage */
15702 + struct au_wr_dir_args wr_dir_args = {
15703 + .force_btgt = -1,
15704 + .flags = AuWrDir_ADD_ENTRY | AuWrDir_ISDIR
15710 + a = kmalloc(sizeof(*a), GFP_NOFS);
15711 + if (unlikely(!a))
15714 + err = aufs_read_lock(dentry, AuLock_DW | AuLock_GEN);
15715 + if (unlikely(err))
15717 + err = au_d_may_add(dentry);
15718 + if (unlikely(err))
15721 + parent = dentry->d_parent; /* dir inode is locked */
15722 + di_write_lock_parent(parent);
15723 + wh_dentry = lock_hdir_lkup_wh(dentry, &a->dt, /*src_dentry*/NULL,
15724 + &a->pin, &wr_dir_args);
15725 + err = PTR_ERR(wh_dentry);
15726 + if (IS_ERR(wh_dentry))
15729 + sb = dentry->d_sb;
15730 + bindex = au_dbstart(dentry);
15731 + h_path.dentry = au_h_dptr(dentry, bindex);
15732 + h_path.mnt = au_sbr_mnt(sb, bindex);
15733 + err = vfsub_mkdir(au_pinned_h_dir(&a->pin), &h_path, mode);
15734 + if (unlikely(err))
15737 + /* make the dir opaque */
15739 + h_mtx = &h_path.dentry->d_inode->i_mutex;
15741 + || au_opt_test(au_mntflags(sb), ALWAYS_DIROPQ)) {
15742 + mutex_lock_nested(h_mtx, AuLsc_I_CHILD);
15743 + opq_dentry = au_diropq_create(dentry, bindex);
15744 + mutex_unlock(h_mtx);
15745 + err = PTR_ERR(opq_dentry);
15746 + if (IS_ERR(opq_dentry))
15748 + dput(opq_dentry);
15752 + err = epilog(dir, bindex, wh_dentry, dentry);
15755 + goto out_unpin; /* success */
15760 + AuLabel(revert opq);
15761 + mutex_lock_nested(h_mtx, AuLsc_I_CHILD);
15762 + rerr = au_diropq_remove(dentry, bindex);
15763 + mutex_unlock(h_mtx);
15765 + AuIOErr("%.*s reverting diropq failed(%d, %d)\n",
15766 + AuDLNPair(dentry), err, rerr);
15772 + AuLabel(revert dir);
15773 + rerr = vfsub_rmdir(au_pinned_h_dir(&a->pin), &h_path);
15775 + AuIOErr("%.*s reverting dir failed(%d, %d)\n",
15776 + AuDLNPair(dentry), err, rerr);
15779 + au_dtime_revert(&a->dt);
15781 + au_unpin(&a->pin);
15784 + di_write_unlock(parent);
15786 + if (unlikely(err)) {
15787 + au_update_dbstart(dentry);
15790 + aufs_read_unlock(dentry, AuLock_DW);
15796 diff -urN /usr/share/empty/fs/aufs/i_op.c linux/fs/aufs/i_op.c
15797 --- /usr/share/empty/fs/aufs/i_op.c 1970-01-01 01:00:00.000000000 +0100
15798 +++ linux/fs/aufs/i_op.c 2012-02-13 21:54:56.969771692 +0100
15801 + * Copyright (C) 2005-2012 Junjiro R. Okajima
15803 + * This program, aufs is free software; you can redistribute it and/or modify
15804 + * it under the terms of the GNU General Public License as published by
15805 + * the Free Software Foundation; either version 2 of the License, or
15806 + * (at your option) any later version.
15808 + * This program is distributed in the hope that it will be useful,
15809 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
15810 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15811 + * GNU General Public License for more details.
15813 + * You should have received a copy of the GNU General Public License
15814 + * along with this program; if not, write to the Free Software
15815 + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
15819 + * inode operations (except add/del/rename)
15822 +#include <linux/device_cgroup.h>
15823 +#include <linux/fs_stack.h>
15824 +#include <linux/namei.h>
15825 +#include <linux/security.h>
15828 +static int h_permission(struct inode *h_inode, int mask,
15829 + struct vfsmount *h_mnt, int brperm)
15832 + const unsigned char write_mask = !!(mask & (MAY_WRITE | MAY_APPEND));
15835 + if ((write_mask && IS_IMMUTABLE(h_inode))
15836 + || ((mask & MAY_EXEC)
15837 + && S_ISREG(h_inode->i_mode)
15838 + && ((h_mnt->mnt_flags & MNT_NOEXEC)
15839 + || !(h_inode->i_mode & S_IXUGO))))
15843 + * - skip the lower fs test in the case of write to ro branch.
15844 + * - nfs dir permission write check is optimized, but a policy for
15845 + * link/rename requires a real check.
15847 + if ((write_mask && !au_br_writable(brperm))
15848 + || (au_test_nfs(h_inode->i_sb) && S_ISDIR(h_inode->i_mode)
15849 + && write_mask && !(mask & MAY_READ))
15850 + || !h_inode->i_op->permission) {
15851 + /* AuLabel(generic_permission); */
15852 + err = generic_permission(h_inode, mask);
15854 + /* AuLabel(h_inode->permission); */
15855 + err = h_inode->i_op->permission(h_inode, mask);
15860 + err = devcgroup_inode_permission(h_inode, mask);
15862 + err = security_inode_permission(h_inode, mask);
15866 + /* todo: do we need to call ima_path_check()? */
15867 + struct path h_path = {
15871 + err = ima_path_check(&h_path,
15872 + mask & (MAY_READ | MAY_WRITE | MAY_EXEC),
15873 + IMA_COUNT_LEAVE);
15881 +static int aufs_permission(struct inode *inode, int mask)
15884 + aufs_bindex_t bindex, bend;
15885 + const unsigned char isdir = !!S_ISDIR(inode->i_mode),
15886 + write_mask = !!(mask & (MAY_WRITE | MAY_APPEND));
15887 + struct inode *h_inode;
15888 + struct super_block *sb;
15889 + struct au_branch *br;
15891 + /* todo: support rcu-walk? */
15892 + if (mask & MAY_NOT_BLOCK)
15895 + sb = inode->i_sb;
15896 + si_read_lock(sb, AuLock_FLUSH);
15897 + ii_read_lock_child(inode);
15899 + err = au_iigen_test(inode, au_sigen(sb));
15900 + if (unlikely(err))
15904 + if (!isdir || write_mask) {
15905 + err = au_busy_or_stale();
15906 + h_inode = au_h_iptr(inode, au_ibstart(inode));
15907 + if (unlikely(!h_inode
15908 + || (h_inode->i_mode & S_IFMT)
15909 + != (inode->i_mode & S_IFMT)))
15913 + bindex = au_ibstart(inode);
15914 + br = au_sbr(sb, bindex);
15915 + err = h_permission(h_inode, mask, br->br_mnt, br->br_perm);
15918 + && !special_file(h_inode->i_mode)) {
15919 + /* test whether the upper writable branch exists */
15921 + for (; bindex >= 0; bindex--)
15922 + if (!au_br_rdonly(au_sbr(sb, bindex))) {
15930 + /* non-write to dir */
15932 + bend = au_ibend(inode);
15933 + for (bindex = au_ibstart(inode); !err && bindex <= bend; bindex++) {
15934 + h_inode = au_h_iptr(inode, bindex);
15936 + err = au_busy_or_stale();
15937 + if (unlikely(!S_ISDIR(h_inode->i_mode)))
15940 + br = au_sbr(sb, bindex);
15941 + err = h_permission(h_inode, mask, br->br_mnt,
15947 + ii_read_unlock(inode);
15948 + si_read_unlock(sb);
15952 +/* ---------------------------------------------------------------------- */
15954 +static struct dentry *aufs_lookup(struct inode *dir, struct dentry *dentry,
15955 + struct nameidata *nd)
15957 + struct dentry *ret, *parent;
15958 + struct inode *inode;
15959 + struct super_block *sb;
15960 + int err, npositive, lc_idx;
15965 + err = si_read_lock(sb, AuLock_FLUSH | AuLock_NOPLM);
15966 + ret = ERR_PTR(err);
15967 + if (unlikely(err))
15970 + ret = ERR_PTR(-ENAMETOOLONG);
15971 + if (unlikely(dentry->d_name.len > AUFS_MAX_NAMELEN))
15973 + err = au_di_init(dentry);
15974 + ret = ERR_PTR(err);
15975 + if (unlikely(err))
15979 + npositive = 0; /* suppress a warning */
15980 + parent = dentry->d_parent; /* dir inode is locked */
15981 + di_read_lock_parent(parent, AuLock_IR);
15982 + err = au_alive_dir(parent);
15984 + err = au_digen_test(parent, au_sigen(sb));
15986 + npositive = au_lkup_dentry(dentry, au_dbstart(parent),
15990 + di_read_unlock(parent, AuLock_IR);
15991 + ret = ERR_PTR(err);
15992 + if (unlikely(err < 0))
15996 + inode = au_new_inode(dentry, /*must_new*/0);
15997 + ret = (void *)inode;
15999 + if (IS_ERR(inode)) {
16004 + ret = d_splice_alias(inode, dentry);
16005 + if (unlikely(IS_ERR(ret) && inode)) {
16006 + ii_write_unlock(inode);
16007 + lc_idx = AuLcNonDir_IIINFO;
16008 + if (S_ISLNK(inode->i_mode))
16009 + lc_idx = AuLcSymlink_IIINFO;
16010 + else if (S_ISDIR(inode->i_mode))
16011 + lc_idx = AuLcDir_IIINFO;
16012 + au_rw_class(&au_ii(inode)->ii_rwsem, au_lc_key + lc_idx);
16017 + di_write_unlock(dentry);
16018 + if (unlikely(IS_ERR(ret) && inode)) {
16019 + lc_idx = AuLcNonDir_DIINFO;
16020 + if (S_ISLNK(inode->i_mode))
16021 + lc_idx = AuLcSymlink_DIINFO;
16022 + else if (S_ISDIR(inode->i_mode))
16023 + lc_idx = AuLcDir_DIINFO;
16024 + au_rw_class(&au_di(dentry)->di_rwsem, au_lc_key + lc_idx);
16027 + si_read_unlock(sb);
16032 +/* ---------------------------------------------------------------------- */
16034 +static int au_wr_dir_cpup(struct dentry *dentry, struct dentry *parent,
16035 + const unsigned char add_entry, aufs_bindex_t bcpup,
16036 + aufs_bindex_t bstart)
16039 + struct dentry *h_parent;
16040 + struct inode *h_dir;
16043 + IMustLock(parent->d_inode);
16045 + di_write_lock_parent(parent);
16048 + if (!au_h_dptr(parent, bcpup)) {
16049 + if (bstart < bcpup)
16050 + err = au_cpdown_dirs(dentry, bcpup);
16052 + err = au_cpup_dirs(dentry, bcpup);
16054 + if (!err && add_entry) {
16055 + h_parent = au_h_dptr(parent, bcpup);
16056 + h_dir = h_parent->d_inode;
16057 + mutex_lock_nested(&h_dir->i_mutex, AuLsc_I_PARENT);
16058 + err = au_lkup_neg(dentry, bcpup);
16059 + /* todo: no unlock here */
16060 + mutex_unlock(&h_dir->i_mutex);
16062 + AuDbg("bcpup %d\n", bcpup);
16064 + if (!dentry->d_inode)
16065 + au_set_h_dptr(dentry, bstart, NULL);
16066 + au_update_dbrange(dentry, /*do_put_zero*/0);
16071 + di_write_unlock(parent);
16073 + err = bcpup; /* success */
16080 + * decide the branch and the parent dir where we will create a new entry.
16081 + * returns new bindex or an error.
16082 + * copyup the parent dir if needed.
16084 +int au_wr_dir(struct dentry *dentry, struct dentry *src_dentry,
16085 + struct au_wr_dir_args *args)
16088 + aufs_bindex_t bcpup, bstart, src_bstart;
16089 + const unsigned char add_entry = !!au_ftest_wrdir(args->flags,
16091 + struct super_block *sb;
16092 + struct dentry *parent;
16093 + struct au_sbinfo *sbinfo;
16095 + sb = dentry->d_sb;
16096 + sbinfo = au_sbi(sb);
16097 + parent = dget_parent(dentry);
16098 + bstart = au_dbstart(dentry);
16100 + if (args->force_btgt < 0) {
16101 + if (src_dentry) {
16102 + src_bstart = au_dbstart(src_dentry);
16103 + if (src_bstart < bstart)
16104 + bcpup = src_bstart;
16105 + } else if (add_entry) {
16106 + err = AuWbrCreate(sbinfo, dentry,
16107 + au_ftest_wrdir(args->flags, ISDIR));
16111 + if (bcpup < 0 || au_test_ro(sb, bcpup, dentry->d_inode)) {
16113 + err = AuWbrCopyup(sbinfo, dentry);
16115 + if (!IS_ROOT(dentry)) {
16116 + di_read_lock_parent(parent, !AuLock_IR);
16117 + err = AuWbrCopyup(sbinfo, dentry);
16118 + di_read_unlock(parent, !AuLock_IR);
16120 + err = AuWbrCopyup(sbinfo, dentry);
16123 + if (unlikely(err < 0))
16127 + bcpup = args->force_btgt;
16128 + AuDebugOn(au_test_ro(sb, bcpup, dentry->d_inode));
16131 + AuDbg("bstart %d, bcpup %d\n", bstart, bcpup);
16133 + if (bcpup == bstart)
16134 + goto out; /* success */
16136 + /* copyup the new parent into the branch we process */
16137 + err = au_wr_dir_cpup(dentry, parent, add_entry, bcpup, bstart);
16139 + if (!dentry->d_inode) {
16140 + au_set_h_dptr(dentry, bstart, NULL);
16141 + au_set_dbstart(dentry, bcpup);
16142 + au_set_dbend(dentry, bcpup);
16144 + AuDebugOn(add_entry && !au_h_dptr(dentry, bcpup));
16152 +/* ---------------------------------------------------------------------- */
16154 +struct dentry *au_pinned_h_parent(struct au_pin *pin)
16156 + if (pin && pin->parent)
16157 + return au_h_dptr(pin->parent, pin->bindex);
16161 +void au_unpin(struct au_pin *p)
16163 + if (p->h_mnt && au_ftest_pin(p->flags, MNT_WRITE))
16164 + mnt_drop_write(p->h_mnt);
16168 + au_hn_imtx_unlock(p->hdir);
16169 + if (!au_ftest_pin(p->flags, DI_LOCKED))
16170 + di_read_unlock(p->parent, AuLock_IR);
16171 + iput(p->hdir->hi_inode);
16173 + p->parent = NULL;
16178 +int au_do_pin(struct au_pin *p)
16181 + struct super_block *sb;
16182 + struct dentry *h_dentry, *h_parent;
16183 + struct au_branch *br;
16184 + struct inode *h_dir;
16187 + sb = p->dentry->d_sb;
16188 + br = au_sbr(sb, p->bindex);
16189 + if (IS_ROOT(p->dentry)) {
16190 + if (au_ftest_pin(p->flags, MNT_WRITE)) {
16191 + p->h_mnt = br->br_mnt;
16192 + err = mnt_want_write(p->h_mnt);
16193 + if (unlikely(err)) {
16194 + au_fclr_pin(p->flags, MNT_WRITE);
16202 + if (p->bindex <= au_dbend(p->dentry))
16203 + h_dentry = au_h_dptr(p->dentry, p->bindex);
16205 + p->parent = dget_parent(p->dentry);
16206 + if (!au_ftest_pin(p->flags, DI_LOCKED))
16207 + di_read_lock(p->parent, AuLock_IR, p->lsc_di);
16210 + h_parent = au_h_dptr(p->parent, p->bindex);
16211 + p->hdir = au_hi(p->parent->d_inode, p->bindex);
16213 + h_dir = p->hdir->hi_inode;
16217 + * if DI_LOCKED is not set, then p->parent may be different
16218 + * and h_parent can be NULL.
16220 + if (unlikely(!p->hdir || !h_dir || !h_parent)) {
16222 + if (!au_ftest_pin(p->flags, DI_LOCKED))
16223 + di_read_unlock(p->parent, AuLock_IR);
16225 + p->parent = NULL;
16230 + au_hn_imtx_lock_nested(p->hdir, p->lsc_hi);
16232 + if (unlikely(p->hdir->hi_inode != h_parent->d_inode)) {
16237 + err = au_h_verify(h_dentry, p->udba, h_dir, h_parent, br);
16238 + if (unlikely(err)) {
16239 + au_fclr_pin(p->flags, MNT_WRITE);
16244 + if (au_ftest_pin(p->flags, MNT_WRITE)) {
16245 + p->h_mnt = br->br_mnt;
16246 + err = mnt_want_write(p->h_mnt);
16247 + if (unlikely(err)) {
16248 + au_fclr_pin(p->flags, MNT_WRITE);
16252 + goto out; /* success */
16257 + pr_err("err %d\n", err);
16258 + err = au_busy_or_stale();
16263 +void au_pin_init(struct au_pin *p, struct dentry *dentry,
16264 + aufs_bindex_t bindex, int lsc_di, int lsc_hi,
16265 + unsigned int udba, unsigned char flags)
16267 + p->dentry = dentry;
16269 + p->lsc_di = lsc_di;
16270 + p->lsc_hi = lsc_hi;
16271 + p->flags = flags;
16272 + p->bindex = bindex;
16274 + p->parent = NULL;
16279 +int au_pin(struct au_pin *pin, struct dentry *dentry, aufs_bindex_t bindex,
16280 + unsigned int udba, unsigned char flags)
16282 + au_pin_init(pin, dentry, bindex, AuLsc_DI_PARENT, AuLsc_I_PARENT2,
16284 + return au_do_pin(pin);
16287 +/* ---------------------------------------------------------------------- */
16290 + * ->setattr() and ->getattr() are called in various cases.
16291 + * chmod, stat: dentry is revalidated.
16292 + * fchmod, fstat: file and dentry are not revalidated, additionally they may be
16294 + * for ->setattr(), ia->ia_file is passed from ftruncate only.
16296 +/* todo: consolidate with do_refresh() and simple_reval_dpath() */
16297 +static int au_reval_for_attr(struct dentry *dentry, unsigned int sigen)
16300 + struct inode *inode;
16301 + struct dentry *parent;
16304 + inode = dentry->d_inode;
16305 + if (au_digen_test(dentry, sigen)) {
16306 + parent = dget_parent(dentry);
16307 + di_read_lock_parent(parent, AuLock_IR);
16308 + err = au_refresh_dentry(dentry, parent);
16309 + di_read_unlock(parent, AuLock_IR);
16317 +#define AuIcpup_DID_CPUP 1
16318 +#define au_ftest_icpup(flags, name) ((flags) & AuIcpup_##name)
16319 +#define au_fset_icpup(flags, name) \
16320 + do { (flags) |= AuIcpup_##name; } while (0)
16321 +#define au_fclr_icpup(flags, name) \
16322 + do { (flags) &= ~AuIcpup_##name; } while (0)
16324 +struct au_icpup_args {
16325 + unsigned char flags;
16326 + unsigned char pin_flags;
16327 + aufs_bindex_t btgt;
16328 + unsigned int udba;
16329 + struct au_pin pin;
16330 + struct path h_path;
16331 + struct inode *h_inode;
16334 +static int au_pin_and_icpup(struct dentry *dentry, struct iattr *ia,
16335 + struct au_icpup_args *a)
16339 + aufs_bindex_t bstart, ibstart;
16340 + struct dentry *hi_wh, *parent;
16341 + struct inode *inode;
16342 + struct file *h_file;
16343 + struct au_wr_dir_args wr_dir_args = {
16344 + .force_btgt = -1,
16348 + bstart = au_dbstart(dentry);
16349 + inode = dentry->d_inode;
16350 + if (S_ISDIR(inode->i_mode))
16351 + au_fset_wrdir(wr_dir_args.flags, ISDIR);
16352 + /* plink or hi_wh() case */
16353 + ibstart = au_ibstart(inode);
16354 + if (bstart != ibstart && !au_test_ro(inode->i_sb, ibstart, inode))
16355 + wr_dir_args.force_btgt = ibstart;
16356 + err = au_wr_dir(dentry, /*src_dentry*/NULL, &wr_dir_args);
16357 + if (unlikely(err < 0))
16360 + if (err != bstart)
16361 + au_fset_icpup(a->flags, DID_CPUP);
16364 + a->pin_flags = AuPin_MNT_WRITE;
16366 + if (!IS_ROOT(dentry)) {
16367 + au_fset_pin(a->pin_flags, DI_LOCKED);
16368 + parent = dget_parent(dentry);
16369 + di_write_lock_parent(parent);
16372 + err = au_pin(&a->pin, dentry, a->btgt, a->udba, a->pin_flags);
16373 + if (unlikely(err))
16376 + a->h_path.dentry = au_h_dptr(dentry, bstart);
16377 + a->h_inode = a->h_path.dentry->d_inode;
16378 + mutex_lock_nested(&a->h_inode->i_mutex, AuLsc_I_CHILD);
16380 + if ((ia->ia_valid & ATTR_SIZE) && ia->ia_size < i_size_read(a->h_inode))
16381 + sz = ia->ia_size;
16385 + if (au_ftest_icpup(a->flags, DID_CPUP) && d_unlinked(dentry)) {
16386 + hi_wh = au_hi_wh(inode, a->btgt);
16388 + err = au_sio_cpup_wh(dentry, a->btgt, sz, /*file*/NULL);
16389 + if (unlikely(err))
16391 + hi_wh = au_hi_wh(inode, a->btgt);
16392 + /* todo: revalidate hi_wh? */
16397 + au_pin_set_parent_lflag(&a->pin, /*lflag*/0);
16398 + di_downgrade_lock(parent, AuLock_IR);
16402 + if (!au_ftest_icpup(a->flags, DID_CPUP))
16403 + goto out; /* success */
16405 + if (!d_unhashed(dentry)) {
16406 + h_file = au_h_open_pre(dentry, bstart);
16407 + if (IS_ERR(h_file)) {
16408 + err = PTR_ERR(h_file);
16411 + err = au_sio_cpup_simple(dentry, a->btgt, sz,
16414 + a->h_path.dentry = au_h_dptr(dentry, a->btgt);
16415 + } else if (!hi_wh)
16416 + a->h_path.dentry = au_h_dptr(dentry, a->btgt);
16418 + a->h_path.dentry = hi_wh; /* do not dget here */
16421 + mutex_unlock(&a->h_inode->i_mutex);
16422 + au_h_open_post(dentry, bstart, h_file);
16423 + a->h_inode = a->h_path.dentry->d_inode;
16425 + mutex_lock_nested(&a->h_inode->i_mutex, AuLsc_I_CHILD);
16426 + goto out; /* success */
16429 + au_unpin(&a->pin);
16432 + di_write_unlock(parent);
16439 +static int aufs_setattr(struct dentry *dentry, struct iattr *ia)
16442 + struct inode *inode;
16443 + struct super_block *sb;
16444 + struct file *file;
16445 + struct au_icpup_args *a;
16447 + inode = dentry->d_inode;
16448 + IMustLock(inode);
16451 + a = kzalloc(sizeof(*a), GFP_NOFS);
16452 + if (unlikely(!a))
16455 + if (ia->ia_valid & (ATTR_KILL_SUID | ATTR_KILL_SGID))
16456 + ia->ia_valid &= ~ATTR_MODE;
16459 + sb = dentry->d_sb;
16460 + err = si_read_lock(sb, AuLock_FLUSH | AuLock_NOPLM);
16461 + if (unlikely(err))
16464 + if (ia->ia_valid & ATTR_FILE) {
16465 + /* currently ftruncate(2) only */
16466 + AuDebugOn(!S_ISREG(inode->i_mode));
16467 + file = ia->ia_file;
16468 + err = au_reval_and_lock_fdi(file, au_reopen_nondir, /*wlock*/1);
16469 + if (unlikely(err))
16471 + ia->ia_file = au_hf_top(file);
16472 + a->udba = AuOpt_UDBA_NONE;
16474 + /* fchmod() doesn't pass ia_file */
16475 + a->udba = au_opt_udba(sb);
16476 + di_write_lock_child(dentry);
16477 + /* no d_unlinked(), to set UDBA_NONE for root */
16478 + if (d_unhashed(dentry))
16479 + a->udba = AuOpt_UDBA_NONE;
16480 + if (a->udba != AuOpt_UDBA_NONE) {
16481 + AuDebugOn(IS_ROOT(dentry));
16482 + err = au_reval_for_attr(dentry, au_sigen(sb));
16483 + if (unlikely(err))
16488 + err = au_pin_and_icpup(dentry, ia, a);
16489 + if (unlikely(err < 0))
16491 + if (au_ftest_icpup(a->flags, DID_CPUP)) {
16492 + ia->ia_file = NULL;
16493 + ia->ia_valid &= ~ATTR_FILE;
16496 + a->h_path.mnt = au_sbr_mnt(sb, a->btgt);
16497 + if ((ia->ia_valid & (ATTR_MODE | ATTR_CTIME))
16498 + == (ATTR_MODE | ATTR_CTIME)) {
16499 + err = security_path_chmod(a->h_path.dentry, a->h_path.mnt,
16501 + if (unlikely(err))
16503 + } else if ((ia->ia_valid & (ATTR_UID | ATTR_GID))
16504 + && (ia->ia_valid & ATTR_CTIME)) {
16505 + err = security_path_chown(&a->h_path, ia->ia_uid, ia->ia_gid);
16506 + if (unlikely(err))
16510 + if (ia->ia_valid & ATTR_SIZE) {
16513 + if (ia->ia_size < i_size_read(inode))
16515 + truncate_setsize(inode, ia->ia_size);
16518 + if (ia->ia_valid & ATTR_FILE)
16520 + mutex_unlock(&a->h_inode->i_mutex);
16521 + err = vfsub_trunc(&a->h_path, ia->ia_size, ia->ia_valid, f);
16522 + mutex_lock_nested(&a->h_inode->i_mutex, AuLsc_I_CHILD);
16524 + err = vfsub_notify_change(&a->h_path, ia);
16526 + au_cpup_attr_changeable(inode);
16529 + mutex_unlock(&a->h_inode->i_mutex);
16530 + au_unpin(&a->pin);
16531 + if (unlikely(err))
16532 + au_update_dbstart(dentry);
16534 + di_write_unlock(dentry);
16536 + fi_write_unlock(file);
16537 + ia->ia_file = file;
16538 + ia->ia_valid |= ATTR_FILE;
16541 + si_read_unlock(sb);
16549 +static void au_refresh_iattr(struct inode *inode, struct kstat *st,
16550 + unsigned int nlink)
16554 + inode->i_mode = st->mode;
16555 + inode->i_uid = st->uid;
16556 + inode->i_gid = st->gid;
16557 + inode->i_atime = st->atime;
16558 + inode->i_mtime = st->mtime;
16559 + inode->i_ctime = st->ctime;
16561 + au_cpup_attr_nlink(inode, /*force*/0);
16562 + if (S_ISDIR(inode->i_mode)) {
16563 + n = inode->i_nlink;
16566 + set_nlink(inode, n);
16569 + spin_lock(&inode->i_lock);
16570 + inode->i_blocks = st->blocks;
16571 + i_size_write(inode, st->size);
16572 + spin_unlock(&inode->i_lock);
16575 +static int aufs_getattr(struct vfsmount *mnt __maybe_unused,
16576 + struct dentry *dentry, struct kstat *st)
16579 + unsigned int mnt_flags;
16580 + aufs_bindex_t bindex;
16581 + unsigned char udba_none, positive;
16582 + struct super_block *sb, *h_sb;
16583 + struct inode *inode;
16584 + struct vfsmount *h_mnt;
16585 + struct dentry *h_dentry;
16587 + sb = dentry->d_sb;
16588 + inode = dentry->d_inode;
16589 + err = si_read_lock(sb, AuLock_FLUSH | AuLock_NOPLM);
16590 + if (unlikely(err))
16592 + mnt_flags = au_mntflags(sb);
16593 + udba_none = !!au_opt_test(mnt_flags, UDBA_NONE);
16595 + /* support fstat(2) */
16596 + if (!d_unlinked(dentry) && !udba_none) {
16597 + unsigned int sigen = au_sigen(sb);
16598 + err = au_digen_test(dentry, sigen);
16600 + di_read_lock_child(dentry, AuLock_IR);
16601 + err = au_dbrange_test(dentry);
16602 + if (unlikely(err))
16605 + AuDebugOn(IS_ROOT(dentry));
16606 + di_write_lock_child(dentry);
16607 + err = au_dbrange_test(dentry);
16609 + err = au_reval_for_attr(dentry, sigen);
16610 + di_downgrade_lock(dentry, AuLock_IR);
16611 + if (unlikely(err))
16615 + di_read_lock_child(dentry, AuLock_IR);
16617 + bindex = au_ibstart(inode);
16618 + h_mnt = au_sbr_mnt(sb, bindex);
16619 + h_sb = h_mnt->mnt_sb;
16620 + if (!au_test_fs_bad_iattr(h_sb) && udba_none)
16621 + goto out_fill; /* success */
16624 + if (au_dbstart(dentry) == bindex)
16625 + h_dentry = dget(au_h_dptr(dentry, bindex));
16626 + else if (au_opt_test(mnt_flags, PLINK) && au_plink_test(inode)) {
16627 + h_dentry = au_plink_lkup(inode, bindex);
16628 + if (IS_ERR(h_dentry))
16629 + goto out_fill; /* pretending success */
16631 + /* illegally overlapped or something */
16632 + if (unlikely(!h_dentry))
16633 + goto out_fill; /* pretending success */
16635 + positive = !!h_dentry->d_inode;
16637 + err = vfs_getattr(h_mnt, h_dentry, st);
16641 + au_refresh_iattr(inode, st, h_dentry->d_inode->i_nlink);
16642 + goto out_fill; /* success */
16648 + generic_fillattr(inode, st);
16650 + di_read_unlock(dentry, AuLock_IR);
16651 + si_read_unlock(sb);
16657 +/* ---------------------------------------------------------------------- */
16659 +static int h_readlink(struct dentry *dentry, int bindex, char __user *buf,
16663 + struct super_block *sb;
16664 + struct dentry *h_dentry;
16667 + h_dentry = au_h_dptr(dentry, bindex);
16668 + if (unlikely(!h_dentry->d_inode->i_op->readlink))
16671 + err = security_inode_readlink(h_dentry);
16672 + if (unlikely(err))
16675 + sb = dentry->d_sb;
16676 + if (!au_test_ro(sb, bindex, dentry->d_inode)) {
16677 + vfsub_touch_atime(au_sbr_mnt(sb, bindex), h_dentry);
16678 + fsstack_copy_attr_atime(dentry->d_inode, h_dentry->d_inode);
16680 + err = h_dentry->d_inode->i_op->readlink(h_dentry, buf, bufsiz);
16686 +static int aufs_readlink(struct dentry *dentry, char __user *buf, int bufsiz)
16690 + err = aufs_read_lock(dentry, AuLock_IR | AuLock_GEN);
16691 + if (unlikely(err))
16693 + err = au_d_hashed_positive(dentry);
16695 + err = h_readlink(dentry, au_dbstart(dentry), buf, bufsiz);
16696 + aufs_read_unlock(dentry, AuLock_IR);
16702 +static void *aufs_follow_link(struct dentry *dentry, struct nameidata *nd)
16705 + mm_segment_t old_fs;
16712 + buf.k = __getname_gfp(GFP_NOFS);
16713 + if (unlikely(!buf.k))
16716 + err = aufs_read_lock(dentry, AuLock_IR | AuLock_GEN);
16717 + if (unlikely(err))
16720 + err = au_d_hashed_positive(dentry);
16722 + old_fs = get_fs();
16723 + set_fs(KERNEL_DS);
16724 + err = h_readlink(dentry, au_dbstart(dentry), buf.u, PATH_MAX);
16727 + aufs_read_unlock(dentry, AuLock_IR);
16731 + /* will be freed by put_link */
16732 + nd_set_link(nd, buf.k);
16733 + return NULL; /* success */
16737 + __putname(buf.k);
16739 + path_put(&nd->path);
16741 + return ERR_PTR(err);
16744 +static void aufs_put_link(struct dentry *dentry __maybe_unused,
16745 + struct nameidata *nd, void *cookie __maybe_unused)
16747 + __putname(nd_get_link(nd));
16750 +/* ---------------------------------------------------------------------- */
16752 +static void aufs_truncate_range(struct inode *inode __maybe_unused,
16753 + loff_t start __maybe_unused,
16754 + loff_t end __maybe_unused)
16759 +/* ---------------------------------------------------------------------- */
16761 +struct inode_operations aufs_symlink_iop = {
16762 + .permission = aufs_permission,
16763 + .setattr = aufs_setattr,
16764 + .getattr = aufs_getattr,
16765 + .readlink = aufs_readlink,
16766 + .follow_link = aufs_follow_link,
16767 + .put_link = aufs_put_link
16770 +struct inode_operations aufs_dir_iop = {
16771 + .create = aufs_create,
16772 + .lookup = aufs_lookup,
16773 + .link = aufs_link,
16774 + .unlink = aufs_unlink,
16775 + .symlink = aufs_symlink,
16776 + .mkdir = aufs_mkdir,
16777 + .rmdir = aufs_rmdir,
16778 + .mknod = aufs_mknod,
16779 + .rename = aufs_rename,
16781 + .permission = aufs_permission,
16782 + .setattr = aufs_setattr,
16783 + .getattr = aufs_getattr
16786 +struct inode_operations aufs_iop = {
16787 + .permission = aufs_permission,
16788 + .setattr = aufs_setattr,
16789 + .getattr = aufs_getattr,
16790 + .truncate_range = aufs_truncate_range
16792 diff -urN /usr/share/empty/fs/aufs/i_op_del.c linux/fs/aufs/i_op_del.c
16793 --- /usr/share/empty/fs/aufs/i_op_del.c 1970-01-01 01:00:00.000000000 +0100
16794 +++ linux/fs/aufs/i_op_del.c 2012-02-13 21:54:56.969771692 +0100
16797 + * Copyright (C) 2005-2012 Junjiro R. Okajima
16799 + * This program, aufs is free software; you can redistribute it and/or modify
16800 + * it under the terms of the GNU General Public License as published by
16801 + * the Free Software Foundation; either version 2 of the License, or
16802 + * (at your option) any later version.
16804 + * This program is distributed in the hope that it will be useful,
16805 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
16806 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16807 + * GNU General Public License for more details.
16809 + * You should have received a copy of the GNU General Public License
16810 + * along with this program; if not, write to the Free Software
16811 + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
16815 + * inode operations (del entry)
16821 + * decide if a new whiteout for @dentry is necessary or not.
16822 + * when it is necessary, prepare the parent dir for the upper branch whose
16823 + * branch index is @bcpup for creation. the actual creation of the whiteout will
16824 + * be done by caller.
16826 + * 0: wh is unnecessary
16827 + * plus: wh is necessary
16830 +int au_wr_dir_need_wh(struct dentry *dentry, int isdir, aufs_bindex_t *bcpup)
16832 + int need_wh, err;
16833 + aufs_bindex_t bstart;
16834 + struct super_block *sb;
16836 + sb = dentry->d_sb;
16837 + bstart = au_dbstart(dentry);
16838 + if (*bcpup < 0) {
16840 + if (au_test_ro(sb, bstart, dentry->d_inode)) {
16841 + err = AuWbrCopyup(au_sbi(sb), dentry);
16843 + if (unlikely(err < 0))
16847 + AuDebugOn(bstart < *bcpup
16848 + || au_test_ro(sb, *bcpup, dentry->d_inode));
16849 + AuDbg("bcpup %d, bstart %d\n", *bcpup, bstart);
16851 + if (*bcpup != bstart) {
16852 + err = au_cpup_dirs(dentry, *bcpup);
16853 + if (unlikely(err))
16857 + struct au_dinfo *dinfo, *tmp;
16859 + need_wh = -ENOMEM;
16860 + dinfo = au_di(dentry);
16861 + tmp = au_di_alloc(sb, AuLsc_DI_TMP);
16863 + au_di_cp(tmp, dinfo);
16864 + au_di_swap(tmp, dinfo);
16865 + /* returns the number of positive dentries */
16866 + need_wh = au_lkup_dentry(dentry, bstart + 1, /*type*/0,
16868 + au_di_swap(tmp, dinfo);
16869 + au_rw_write_unlock(&tmp->di_rwsem);
16873 + AuDbg("need_wh %d\n", need_wh);
16881 + * simple tests for the del-entry operations.
16882 + * following the checks in vfs, plus the parent-child relationship.
16884 +int au_may_del(struct dentry *dentry, aufs_bindex_t bindex,
16885 + struct dentry *h_parent, int isdir)
16889 + struct dentry *h_dentry, *h_latest;
16890 + struct inode *h_inode;
16892 + h_dentry = au_h_dptr(dentry, bindex);
16893 + h_inode = h_dentry->d_inode;
16894 + if (dentry->d_inode) {
16896 + if (unlikely(!h_inode || !h_inode->i_nlink))
16899 + h_mode = h_inode->i_mode;
16902 + if (unlikely(S_ISDIR(h_mode)))
16904 + } else if (unlikely(!S_ISDIR(h_mode))) {
16909 + /* rename(2) case */
16911 + if (unlikely(h_inode))
16916 + /* expected parent dir is locked */
16917 + if (unlikely(h_parent != h_dentry->d_parent))
16922 + * rmdir a dir may break the consistency on some filesystem.
16923 + * let's try heavy test.
16926 + if (unlikely(au_test_h_perm(h_parent->d_inode, MAY_EXEC | MAY_WRITE)))
16929 + h_latest = au_sio_lkup_one(&dentry->d_name, h_parent,
16930 + au_sbr(dentry->d_sb, bindex));
16932 + if (IS_ERR(h_latest))
16934 + if (h_latest == h_dentry)
16943 + * decide the branch where we operate for @dentry. the branch index will be set
16944 + * @rbcpup. after diciding it, 'pin' it and store the timestamps of the parent
16945 + * dir for reverting.
16946 + * when a new whiteout is necessary, create it.
16948 +static struct dentry*
16949 +lock_hdir_create_wh(struct dentry *dentry, int isdir, aufs_bindex_t *rbcpup,
16950 + struct au_dtime *dt, struct au_pin *pin)
16952 + struct dentry *wh_dentry;
16953 + struct super_block *sb;
16954 + struct path h_path;
16955 + int err, need_wh;
16956 + unsigned int udba;
16957 + aufs_bindex_t bcpup;
16959 + need_wh = au_wr_dir_need_wh(dentry, isdir, rbcpup);
16960 + wh_dentry = ERR_PTR(need_wh);
16961 + if (unlikely(need_wh < 0))
16964 + sb = dentry->d_sb;
16965 + udba = au_opt_udba(sb);
16967 + err = au_pin(pin, dentry, bcpup, udba,
16968 + AuPin_DI_LOCKED | AuPin_MNT_WRITE);
16969 + wh_dentry = ERR_PTR(err);
16970 + if (unlikely(err))
16973 + h_path.dentry = au_pinned_h_parent(pin);
16974 + if (udba != AuOpt_UDBA_NONE
16975 + && au_dbstart(dentry) == bcpup) {
16976 + err = au_may_del(dentry, bcpup, h_path.dentry, isdir);
16977 + wh_dentry = ERR_PTR(err);
16978 + if (unlikely(err))
16982 + h_path.mnt = au_sbr_mnt(sb, bcpup);
16983 + au_dtime_store(dt, au_pinned_parent(pin), &h_path);
16984 + wh_dentry = NULL;
16986 + goto out; /* success, no need to create whiteout */
16988 + wh_dentry = au_wh_create(dentry, bcpup, h_path.dentry);
16989 + if (IS_ERR(wh_dentry))
16992 + /* returns with the parent is locked and wh_dentry is dget-ed */
16993 + goto out; /* success */
16998 + return wh_dentry;
17002 + * when removing a dir, rename it to a unique temporary whiteout-ed name first
17003 + * in order to be revertible and save time for removing many child whiteouts
17005 + * returns 1 when there are too many child whiteout and caller should remove
17006 + * them asynchronously. returns 0 when the number of children is enough small to
17007 + * remove now or the branch fs is a remote fs.
17008 + * otherwise return an error.
17010 +static int renwh_and_rmdir(struct dentry *dentry, aufs_bindex_t bindex,
17011 + struct au_nhash *whlist, struct inode *dir)
17013 + int rmdir_later, err, dirwh;
17014 + struct dentry *h_dentry;
17015 + struct super_block *sb;
17017 + sb = dentry->d_sb;
17018 + SiMustAnyLock(sb);
17019 + h_dentry = au_h_dptr(dentry, bindex);
17020 + err = au_whtmp_ren(h_dentry, au_sbr(sb, bindex));
17021 + if (unlikely(err))
17024 + /* stop monitoring */
17025 + au_hn_free(au_hi(dentry->d_inode, bindex));
17027 + if (!au_test_fs_remote(h_dentry->d_sb)) {
17028 + dirwh = au_sbi(sb)->si_dirwh;
17029 + rmdir_later = (dirwh <= 1);
17030 + if (!rmdir_later)
17031 + rmdir_later = au_nhash_test_longer_wh(whlist, bindex,
17034 + return rmdir_later;
17037 + err = au_whtmp_rmdir(dir, bindex, h_dentry, whlist);
17038 + if (unlikely(err)) {
17039 + AuIOErr("rmdir %.*s, b%d failed, %d. ignored\n",
17040 + AuDLNPair(h_dentry), bindex, err);
17050 + * final procedure for deleting a entry.
17051 + * maintain dentry and iattr.
17053 +static void epilog(struct inode *dir, struct dentry *dentry,
17054 + aufs_bindex_t bindex)
17056 + struct inode *inode;
17058 + inode = dentry->d_inode;
17060 + inode->i_ctime = dir->i_ctime;
17062 + if (au_ibstart(dir) == bindex)
17063 + au_cpup_attr_timesizes(dir);
17064 + dir->i_version++;
17068 + * when an error happened, remove the created whiteout and revert everything.
17070 +static int do_revert(int err, struct inode *dir, aufs_bindex_t bindex,
17071 + aufs_bindex_t bwh, struct dentry *wh_dentry,
17072 + struct dentry *dentry, struct au_dtime *dt)
17075 + struct path h_path = {
17076 + .dentry = wh_dentry,
17077 + .mnt = au_sbr_mnt(dir->i_sb, bindex)
17080 + rerr = au_wh_unlink_dentry(au_h_iptr(dir, bindex), &h_path, dentry);
17082 + au_set_dbwh(dentry, bwh);
17083 + au_dtime_revert(dt);
17087 + AuIOErr("%.*s reverting whiteout failed(%d, %d)\n",
17088 + AuDLNPair(dentry), err, rerr);
17092 +/* ---------------------------------------------------------------------- */
17094 +int aufs_unlink(struct inode *dir, struct dentry *dentry)
17097 + aufs_bindex_t bwh, bindex, bstart;
17098 + struct au_dtime dt;
17099 + struct au_pin pin;
17100 + struct path h_path;
17101 + struct inode *inode, *h_dir;
17102 + struct dentry *parent, *wh_dentry;
17106 + err = aufs_read_lock(dentry, AuLock_DW | AuLock_GEN);
17107 + if (unlikely(err))
17109 + err = au_d_hashed_positive(dentry);
17110 + if (unlikely(err))
17112 + inode = dentry->d_inode;
17113 + IMustLock(inode);
17115 + if (unlikely(S_ISDIR(inode->i_mode)))
17116 + goto out_unlock; /* possible? */
17118 + bstart = au_dbstart(dentry);
17119 + bwh = au_dbwh(dentry);
17121 + parent = dentry->d_parent; /* dir inode is locked */
17122 + di_write_lock_parent(parent);
17123 + wh_dentry = lock_hdir_create_wh(dentry, /*isdir*/0, &bindex, &dt, &pin);
17124 + err = PTR_ERR(wh_dentry);
17125 + if (IS_ERR(wh_dentry))
17128 + h_path.mnt = au_sbr_mnt(dentry->d_sb, bstart);
17129 + h_path.dentry = au_h_dptr(dentry, bstart);
17130 + dget(h_path.dentry);
17131 + if (bindex == bstart) {
17132 + h_dir = au_pinned_h_dir(&pin);
17133 + err = vfsub_unlink(h_dir, &h_path, /*force*/0);
17135 + /* dir inode is locked */
17136 + h_dir = wh_dentry->d_parent->d_inode;
17137 + IMustLock(h_dir);
17142 + vfsub_drop_nlink(inode);
17143 + epilog(dir, dentry, bindex);
17145 + /* update target timestamps */
17146 + if (bindex == bstart) {
17147 + vfsub_update_h_iattr(&h_path, /*did*/NULL); /*ignore*/
17148 + inode->i_ctime = h_path.dentry->d_inode->i_ctime;
17150 + /* todo: this timestamp may be reverted later */
17151 + inode->i_ctime = h_dir->i_ctime;
17152 + goto out_unpin; /* success */
17159 + rerr = do_revert(err, dir, bindex, bwh, wh_dentry, dentry, &dt);
17167 + dput(h_path.dentry);
17169 + di_write_unlock(parent);
17171 + aufs_read_unlock(dentry, AuLock_DW);
17176 +int aufs_rmdir(struct inode *dir, struct dentry *dentry)
17178 + int err, rmdir_later;
17179 + aufs_bindex_t bwh, bindex, bstart;
17180 + struct au_dtime dt;
17181 + struct au_pin pin;
17182 + struct inode *inode;
17183 + struct dentry *parent, *wh_dentry, *h_dentry;
17184 + struct au_whtmp_rmdir *args;
17188 + err = aufs_read_lock(dentry, AuLock_DW | AuLock_FLUSH | AuLock_GEN);
17189 + if (unlikely(err))
17191 + err = au_alive_dir(dentry);
17192 + if (unlikely(err))
17194 + inode = dentry->d_inode;
17195 + IMustLock(inode);
17197 + if (unlikely(!S_ISDIR(inode->i_mode)))
17198 + goto out_unlock; /* possible? */
17201 + args = au_whtmp_rmdir_alloc(dir->i_sb, GFP_NOFS);
17202 + if (unlikely(!args))
17205 + parent = dentry->d_parent; /* dir inode is locked */
17206 + di_write_lock_parent(parent);
17207 + err = au_test_empty(dentry, &args->whlist);
17208 + if (unlikely(err))
17211 + bstart = au_dbstart(dentry);
17212 + bwh = au_dbwh(dentry);
17214 + wh_dentry = lock_hdir_create_wh(dentry, /*isdir*/1, &bindex, &dt, &pin);
17215 + err = PTR_ERR(wh_dentry);
17216 + if (IS_ERR(wh_dentry))
17219 + h_dentry = au_h_dptr(dentry, bstart);
17222 + if (bindex == bstart) {
17223 + err = renwh_and_rmdir(dentry, bstart, &args->whlist, dir);
17225 + rmdir_later = err;
17229 + /* stop monitoring */
17230 + au_hn_free(au_hi(inode, bstart));
17232 + /* dir inode is locked */
17233 + IMustLock(wh_dentry->d_parent->d_inode);
17238 + vfsub_dead_dir(inode);
17239 + au_set_dbdiropq(dentry, -1);
17240 + epilog(dir, dentry, bindex);
17242 + if (rmdir_later) {
17243 + au_whtmp_kick_rmdir(dir, bstart, h_dentry, args);
17247 + goto out_unpin; /* success */
17255 + rerr = do_revert(err, dir, bindex, bwh, wh_dentry, dentry, &dt);
17265 + di_write_unlock(parent);
17267 + au_whtmp_rmdir_free(args);
17269 + aufs_read_unlock(dentry, AuLock_DW);
17274 diff -urN /usr/share/empty/fs/aufs/i_op_ren.c linux/fs/aufs/i_op_ren.c
17275 --- /usr/share/empty/fs/aufs/i_op_ren.c 1970-01-01 01:00:00.000000000 +0100
17276 +++ linux/fs/aufs/i_op_ren.c 2012-02-13 21:54:56.969771692 +0100
17279 + * Copyright (C) 2005-2012 Junjiro R. Okajima
17281 + * This program, aufs is free software; you can redistribute it and/or modify
17282 + * it under the terms of the GNU General Public License as published by
17283 + * the Free Software Foundation; either version 2 of the License, or
17284 + * (at your option) any later version.
17286 + * This program is distributed in the hope that it will be useful,
17287 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
17288 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17289 + * GNU General Public License for more details.
17291 + * You should have received a copy of the GNU General Public License
17292 + * along with this program; if not, write to the Free Software
17293 + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
17297 + * inode operation (rename entry)
17298 + * todo: this is crazy monster
17303 +enum { AuSRC, AuDST, AuSrcDst };
17304 +enum { AuPARENT, AuCHILD, AuParentChild };
17306 +#define AuRen_ISDIR 1
17307 +#define AuRen_ISSAMEDIR (1 << 1)
17308 +#define AuRen_WHSRC (1 << 2)
17309 +#define AuRen_WHDST (1 << 3)
17310 +#define AuRen_MNT_WRITE (1 << 4)
17311 +#define AuRen_DT_DSTDIR (1 << 5)
17312 +#define AuRen_DIROPQ (1 << 6)
17313 +#define AuRen_CPUP (1 << 7)
17314 +#define au_ftest_ren(flags, name) ((flags) & AuRen_##name)
17315 +#define au_fset_ren(flags, name) \
17316 + do { (flags) |= AuRen_##name; } while (0)
17317 +#define au_fclr_ren(flags, name) \
17318 + do { (flags) &= ~AuRen_##name; } while (0)
17320 +struct au_ren_args {
17322 + struct dentry *dentry, *h_dentry, *parent, *h_parent,
17324 + struct inode *dir, *inode;
17325 + struct au_hinode *hdir;
17326 + struct au_dtime dt[AuParentChild];
17327 + aufs_bindex_t bstart;
17330 +#define src_dentry sd[AuSRC].dentry
17331 +#define src_dir sd[AuSRC].dir
17332 +#define src_inode sd[AuSRC].inode
17333 +#define src_h_dentry sd[AuSRC].h_dentry
17334 +#define src_parent sd[AuSRC].parent
17335 +#define src_h_parent sd[AuSRC].h_parent
17336 +#define src_wh_dentry sd[AuSRC].wh_dentry
17337 +#define src_hdir sd[AuSRC].hdir
17338 +#define src_h_dir sd[AuSRC].hdir->hi_inode
17339 +#define src_dt sd[AuSRC].dt
17340 +#define src_bstart sd[AuSRC].bstart
17342 +#define dst_dentry sd[AuDST].dentry
17343 +#define dst_dir sd[AuDST].dir
17344 +#define dst_inode sd[AuDST].inode
17345 +#define dst_h_dentry sd[AuDST].h_dentry
17346 +#define dst_parent sd[AuDST].parent
17347 +#define dst_h_parent sd[AuDST].h_parent
17348 +#define dst_wh_dentry sd[AuDST].wh_dentry
17349 +#define dst_hdir sd[AuDST].hdir
17350 +#define dst_h_dir sd[AuDST].hdir->hi_inode
17351 +#define dst_dt sd[AuDST].dt
17352 +#define dst_bstart sd[AuDST].bstart
17354 + struct dentry *h_trap;
17355 + struct au_branch *br;
17356 + struct au_hinode *src_hinode;
17357 + struct path h_path;
17358 + struct au_nhash whlist;
17359 + aufs_bindex_t btgt, src_bwh, src_bdiropq;
17361 + unsigned int flags;
17363 + struct au_whtmp_rmdir *thargs;
17364 + struct dentry *h_dst;
17367 +/* ---------------------------------------------------------------------- */
17370 + * functions for reverting.
17371 + * when an error happened in a single rename systemcall, we should revert
17372 + * everything as if nothing happend.
17373 + * we don't need to revert the copied-up/down the parent dir since they are
17377 +#define RevertFailure(fmt, ...) do { \
17378 + AuIOErr("revert failure: " fmt " (%d, %d)\n", \
17379 + ##__VA_ARGS__, err, rerr); \
17383 +static void au_ren_rev_diropq(int err, struct au_ren_args *a)
17387 + au_hn_imtx_lock_nested(a->src_hinode, AuLsc_I_CHILD);
17388 + rerr = au_diropq_remove(a->src_dentry, a->btgt);
17389 + au_hn_imtx_unlock(a->src_hinode);
17390 + au_set_dbdiropq(a->src_dentry, a->src_bdiropq);
17392 + RevertFailure("remove diropq %.*s", AuDLNPair(a->src_dentry));
17395 +static void au_ren_rev_rename(int err, struct au_ren_args *a)
17399 + a->h_path.dentry = au_lkup_one(&a->src_dentry->d_name, a->src_h_parent,
17400 + a->br, /*nd*/NULL);
17401 + rerr = PTR_ERR(a->h_path.dentry);
17402 + if (IS_ERR(a->h_path.dentry)) {
17403 + RevertFailure("au_lkup_one %.*s", AuDLNPair(a->src_dentry));
17407 + rerr = vfsub_rename(a->dst_h_dir,
17408 + au_h_dptr(a->src_dentry, a->btgt),
17409 + a->src_h_dir, &a->h_path);
17410 + d_drop(a->h_path.dentry);
17411 + dput(a->h_path.dentry);
17412 + /* au_set_h_dptr(a->src_dentry, a->btgt, NULL); */
17414 + RevertFailure("rename %.*s", AuDLNPair(a->src_dentry));
17417 +static void au_ren_rev_cpup(int err, struct au_ren_args *a)
17421 + a->h_path.dentry = a->dst_h_dentry;
17422 + rerr = vfsub_unlink(a->dst_h_dir, &a->h_path, /*force*/0);
17423 + au_set_h_dptr(a->src_dentry, a->btgt, NULL);
17424 + au_set_dbstart(a->src_dentry, a->src_bstart);
17426 + RevertFailure("unlink %.*s", AuDLNPair(a->dst_h_dentry));
17429 +static void au_ren_rev_whtmp(int err, struct au_ren_args *a)
17433 + a->h_path.dentry = au_lkup_one(&a->dst_dentry->d_name, a->dst_h_parent,
17434 + a->br, /*nd*/NULL);
17435 + rerr = PTR_ERR(a->h_path.dentry);
17436 + if (IS_ERR(a->h_path.dentry)) {
17437 + RevertFailure("lookup %.*s", AuDLNPair(a->dst_dentry));
17440 + if (a->h_path.dentry->d_inode) {
17441 + d_drop(a->h_path.dentry);
17442 + dput(a->h_path.dentry);
17446 + rerr = vfsub_rename(a->dst_h_dir, a->h_dst, a->dst_h_dir, &a->h_path);
17447 + d_drop(a->h_path.dentry);
17448 + dput(a->h_path.dentry);
17450 + au_set_h_dptr(a->dst_dentry, a->btgt, dget(a->h_dst));
17452 + RevertFailure("rename %.*s", AuDLNPair(a->h_dst));
17455 +static void au_ren_rev_whsrc(int err, struct au_ren_args *a)
17459 + a->h_path.dentry = a->src_wh_dentry;
17460 + rerr = au_wh_unlink_dentry(a->src_h_dir, &a->h_path, a->src_dentry);
17461 + au_set_dbwh(a->src_dentry, a->src_bwh);
17463 + RevertFailure("unlink %.*s", AuDLNPair(a->src_wh_dentry));
17465 +#undef RevertFailure
17467 +/* ---------------------------------------------------------------------- */
17470 + * when we have to copyup the renaming entry, do it with the rename-target name
17471 + * in order to minimize the cost (the later actual rename is unnecessary).
17472 + * otherwise rename it on the target branch.
17474 +static int au_ren_or_cpup(struct au_ren_args *a)
17477 + struct dentry *d;
17479 + d = a->src_dentry;
17480 + if (au_dbstart(d) == a->btgt) {
17481 + a->h_path.dentry = a->dst_h_dentry;
17482 + if (au_ftest_ren(a->flags, DIROPQ)
17483 + && au_dbdiropq(d) == a->btgt)
17484 + au_fclr_ren(a->flags, DIROPQ);
17485 + AuDebugOn(au_dbstart(d) != a->btgt);
17486 + err = vfsub_rename(a->src_h_dir, au_h_dptr(d, a->btgt),
17487 + a->dst_h_dir, &a->h_path);
17489 + struct mutex *h_mtx = &a->src_h_dentry->d_inode->i_mutex;
17490 + struct file *h_file;
17492 + au_fset_ren(a->flags, CPUP);
17493 + mutex_lock_nested(h_mtx, AuLsc_I_CHILD);
17494 + au_set_dbstart(d, a->btgt);
17495 + au_set_h_dptr(d, a->btgt, dget(a->dst_h_dentry));
17496 + h_file = au_h_open_pre(d, a->src_bstart);
17497 + if (IS_ERR(h_file)) {
17498 + err = PTR_ERR(h_file);
17501 + err = au_sio_cpup_single(d, a->btgt, a->src_bstart, -1,
17502 + !AuCpup_DTIME, a->dst_parent);
17503 + mutex_unlock(h_mtx);
17504 + au_h_open_post(d, a->src_bstart, h_file);
17506 + d = a->dst_dentry;
17507 + au_set_h_dptr(d, a->btgt, NULL);
17508 + au_update_dbstart(d);
17510 + au_set_h_dptr(d, a->btgt, NULL);
17511 + au_set_dbstart(d, a->src_bstart);
17514 + if (!err && a->h_dst)
17515 + /* it will be set to dinfo later */
17521 +/* cf. aufs_rmdir() */
17522 +static int au_ren_del_whtmp(struct au_ren_args *a)
17525 + struct inode *dir;
17527 + dir = a->dst_dir;
17528 + SiMustAnyLock(dir->i_sb);
17529 + if (!au_nhash_test_longer_wh(&a->whlist, a->btgt,
17530 + au_sbi(dir->i_sb)->si_dirwh)
17531 + || au_test_fs_remote(a->h_dst->d_sb)) {
17532 + err = au_whtmp_rmdir(dir, a->btgt, a->h_dst, &a->whlist);
17533 + if (unlikely(err))
17534 + pr_warning("failed removing whtmp dir %.*s (%d), "
17535 + "ignored.\n", AuDLNPair(a->h_dst), err);
17537 + au_nhash_wh_free(&a->thargs->whlist);
17538 + a->thargs->whlist = a->whlist;
17539 + a->whlist.nh_num = 0;
17540 + au_whtmp_kick_rmdir(dir, a->btgt, a->h_dst, a->thargs);
17542 + a->thargs = NULL;
17548 +/* make it 'opaque' dir. */
17549 +static int au_ren_diropq(struct au_ren_args *a)
17552 + struct dentry *diropq;
17555 + a->src_bdiropq = au_dbdiropq(a->src_dentry);
17556 + a->src_hinode = au_hi(a->src_inode, a->btgt);
17557 + au_hn_imtx_lock_nested(a->src_hinode, AuLsc_I_CHILD);
17558 + diropq = au_diropq_create(a->src_dentry, a->btgt);
17559 + au_hn_imtx_unlock(a->src_hinode);
17560 + if (IS_ERR(diropq))
17561 + err = PTR_ERR(diropq);
17567 +static int do_rename(struct au_ren_args *a)
17570 + struct dentry *d, *h_d;
17572 + /* prepare workqueue args for asynchronous rmdir */
17573 + h_d = a->dst_h_dentry;
17574 + if (au_ftest_ren(a->flags, ISDIR) && h_d->d_inode) {
17576 + a->thargs = au_whtmp_rmdir_alloc(a->src_dentry->d_sb, GFP_NOFS);
17577 + if (unlikely(!a->thargs))
17579 + a->h_dst = dget(h_d);
17582 + /* create whiteout for src_dentry */
17583 + if (au_ftest_ren(a->flags, WHSRC)) {
17584 + a->src_bwh = au_dbwh(a->src_dentry);
17585 + AuDebugOn(a->src_bwh >= 0);
17587 + = au_wh_create(a->src_dentry, a->btgt, a->src_h_parent);
17588 + err = PTR_ERR(a->src_wh_dentry);
17589 + if (IS_ERR(a->src_wh_dentry))
17593 + /* lookup whiteout for dentry */
17594 + if (au_ftest_ren(a->flags, WHDST)) {
17595 + h_d = au_wh_lkup(a->dst_h_parent, &a->dst_dentry->d_name,
17597 + err = PTR_ERR(h_d);
17600 + if (!h_d->d_inode)
17603 + a->dst_wh_dentry = h_d;
17606 + /* rename dentry to tmpwh */
17608 + err = au_whtmp_ren(a->dst_h_dentry, a->br);
17609 + if (unlikely(err))
17612 + d = a->dst_dentry;
17613 + au_set_h_dptr(d, a->btgt, NULL);
17614 + err = au_lkup_neg(d, a->btgt);
17615 + if (unlikely(err))
17617 + a->dst_h_dentry = au_h_dptr(d, a->btgt);
17621 + if (a->dst_h_dentry->d_inode && a->src_bstart != a->btgt) {
17622 + struct mutex *h_mtx = &a->src_h_dentry->d_inode->i_mutex;
17623 + struct file *h_file;
17625 + mutex_lock_nested(h_mtx, AuLsc_I_CHILD);
17626 + AuDebugOn(au_dbstart(a->src_dentry) != a->src_bstart);
17627 + h_file = au_h_open_pre(a->src_dentry, a->src_bstart);
17628 + if (IS_ERR(h_file)) {
17629 + err = PTR_ERR(h_file);
17632 + err = au_sio_cpup_simple(a->src_dentry, a->btgt, -1,
17634 + mutex_unlock(h_mtx);
17635 + au_h_open_post(a->src_dentry, a->src_bstart, h_file);
17636 + if (unlikely(err))
17640 + /* rename by vfs_rename or cpup */
17641 + d = a->dst_dentry;
17642 + if (au_ftest_ren(a->flags, ISDIR)
17643 + && (a->dst_wh_dentry
17644 + || au_dbdiropq(d) == a->btgt
17645 + /* hide the lower to keep xino */
17646 + || a->btgt < au_dbend(d)
17647 + || au_opt_test(au_mntflags(d->d_sb), ALWAYS_DIROPQ)))
17648 + au_fset_ren(a->flags, DIROPQ);
17649 + err = au_ren_or_cpup(a);
17650 + if (unlikely(err))
17651 + /* leave the copied-up one */
17654 + /* make dir opaque */
17655 + if (au_ftest_ren(a->flags, DIROPQ)) {
17656 + err = au_ren_diropq(a);
17657 + if (unlikely(err))
17661 + /* update target timestamps */
17662 + AuDebugOn(au_dbstart(a->src_dentry) != a->btgt);
17663 + a->h_path.dentry = au_h_dptr(a->src_dentry, a->btgt);
17664 + vfsub_update_h_iattr(&a->h_path, /*did*/NULL); /*ignore*/
17665 + a->src_inode->i_ctime = a->h_path.dentry->d_inode->i_ctime;
17667 + /* remove whiteout for dentry */
17668 + if (a->dst_wh_dentry) {
17669 + a->h_path.dentry = a->dst_wh_dentry;
17670 + err = au_wh_unlink_dentry(a->dst_h_dir, &a->h_path,
17672 + if (unlikely(err))
17676 + /* remove whtmp */
17678 + au_ren_del_whtmp(a); /* ignore this error */
17681 + goto out_success;
17684 + if (au_ftest_ren(a->flags, DIROPQ))
17685 + au_ren_rev_diropq(err, a);
17687 + if (!au_ftest_ren(a->flags, CPUP))
17688 + au_ren_rev_rename(err, a);
17690 + au_ren_rev_cpup(err, a);
17694 + au_ren_rev_whtmp(err, a);
17696 + dput(a->dst_wh_dentry);
17697 + a->dst_wh_dentry = NULL;
17699 + if (a->src_wh_dentry)
17700 + au_ren_rev_whsrc(err, a);
17702 + dput(a->src_wh_dentry);
17703 + dput(a->dst_wh_dentry);
17707 + au_whtmp_rmdir_free(a->thargs);
17708 + a->thargs = NULL;
17714 +/* ---------------------------------------------------------------------- */
17717 + * test if @dentry dir can be rename destination or not.
17718 + * success means, it is a logically empty dir.
17720 +static int may_rename_dstdir(struct dentry *dentry, struct au_nhash *whlist)
17722 + return au_test_empty(dentry, whlist);
17726 + * test if @dentry dir can be rename source or not.
17727 + * if it can, return 0 and @children is filled.
17729 + * - it is a logically empty dir.
17730 + * - or, it exists on writable branch and has no children including whiteouts
17731 + * on the lower branch.
17733 +static int may_rename_srcdir(struct dentry *dentry, aufs_bindex_t btgt)
17736 + unsigned int rdhash;
17737 + aufs_bindex_t bstart;
17739 + bstart = au_dbstart(dentry);
17740 + if (bstart != btgt) {
17741 + struct au_nhash whlist;
17743 + SiMustAnyLock(dentry->d_sb);
17744 + rdhash = au_sbi(dentry->d_sb)->si_rdhash;
17746 + rdhash = au_rdhash_est(au_dir_size(/*file*/NULL,
17748 + err = au_nhash_alloc(&whlist, rdhash, GFP_NOFS);
17749 + if (unlikely(err))
17751 + err = au_test_empty(dentry, &whlist);
17752 + au_nhash_wh_free(&whlist);
17756 + if (bstart == au_dbtaildir(dentry))
17757 + return 0; /* success */
17759 + err = au_test_empty_lower(dentry);
17762 + if (err == -ENOTEMPTY) {
17763 + AuWarn1("renaming dir who has child(ren) on multiple branches,"
17764 + " is not supported\n");
17770 +/* side effect: sets whlist and h_dentry */
17771 +static int au_ren_may_dir(struct au_ren_args *a)
17774 + unsigned int rdhash;
17775 + struct dentry *d;
17777 + d = a->dst_dentry;
17778 + SiMustAnyLock(d->d_sb);
17781 + if (au_ftest_ren(a->flags, ISDIR) && a->dst_inode) {
17782 + rdhash = au_sbi(d->d_sb)->si_rdhash;
17784 + rdhash = au_rdhash_est(au_dir_size(/*file*/NULL, d));
17785 + err = au_nhash_alloc(&a->whlist, rdhash, GFP_NOFS);
17786 + if (unlikely(err))
17789 + au_set_dbstart(d, a->dst_bstart);
17790 + err = may_rename_dstdir(d, &a->whlist);
17791 + au_set_dbstart(d, a->btgt);
17793 + a->dst_h_dentry = au_h_dptr(d, au_dbstart(d));
17794 + if (unlikely(err))
17797 + d = a->src_dentry;
17798 + a->src_h_dentry = au_h_dptr(d, au_dbstart(d));
17799 + if (au_ftest_ren(a->flags, ISDIR)) {
17800 + err = may_rename_srcdir(d, a->btgt);
17801 + if (unlikely(err)) {
17802 + au_nhash_wh_free(&a->whlist);
17803 + a->whlist.nh_num = 0;
17810 +/* ---------------------------------------------------------------------- */
17813 + * simple tests for rename.
17814 + * following the checks in vfs, plus the parent-child relationship.
17816 +static int au_may_ren(struct au_ren_args *a)
17819 + struct inode *h_inode;
17821 + if (a->src_bstart == a->btgt) {
17822 + err = au_may_del(a->src_dentry, a->btgt, a->src_h_parent,
17823 + au_ftest_ren(a->flags, ISDIR));
17824 + if (unlikely(err))
17827 + if (unlikely(a->src_h_dentry == a->h_trap))
17832 + if (a->dst_bstart != a->btgt)
17835 + err = -ENOTEMPTY;
17836 + if (unlikely(a->dst_h_dentry == a->h_trap))
17840 + h_inode = a->dst_h_dentry->d_inode;
17841 + isdir = !!au_ftest_ren(a->flags, ISDIR);
17842 + if (!a->dst_dentry->d_inode) {
17843 + if (unlikely(h_inode))
17845 + err = au_may_add(a->dst_dentry, a->btgt, a->dst_h_parent,
17848 + if (unlikely(!h_inode || !h_inode->i_nlink))
17850 + err = au_may_del(a->dst_dentry, a->btgt, a->dst_h_parent,
17852 + if (unlikely(err))
17857 + if (unlikely(err == -ENOENT || err == -EEXIST))
17863 +/* ---------------------------------------------------------------------- */
17868 + * - src_dir and dir by lock_rename()
17869 + * - inode if exitsts
17872 + * + src_dentry and dentry by aufs_read_and_write_lock2() which calls,
17874 + * + di_write_lock2_child()
17875 + * + di_write_lock_child()
17876 + * + ii_write_lock_child()
17877 + * + di_write_lock_child2()
17878 + * + ii_write_lock_child2()
17879 + * + src_parent and parent
17880 + * + di_write_lock_parent()
17881 + * + ii_write_lock_parent()
17882 + * + di_write_lock_parent2()
17883 + * + ii_write_lock_parent2()
17884 + * + lower src_dir and dir by vfsub_lock_rename()
17885 + * + verify the every relationships between child and parent. if any
17886 + * of them failed, unlock all and return -EBUSY.
17888 +static void au_ren_unlock(struct au_ren_args *a)
17890 + struct super_block *sb;
17892 + sb = a->dst_dentry->d_sb;
17893 + if (au_ftest_ren(a->flags, MNT_WRITE))
17894 + mnt_drop_write(a->br->br_mnt);
17895 + vfsub_unlock_rename(a->src_h_parent, a->src_hdir,
17896 + a->dst_h_parent, a->dst_hdir);
17899 +static int au_ren_lock(struct au_ren_args *a)
17902 + unsigned int udba;
17905 + a->src_h_parent = au_h_dptr(a->src_parent, a->btgt);
17906 + a->src_hdir = au_hi(a->src_dir, a->btgt);
17907 + a->dst_h_parent = au_h_dptr(a->dst_parent, a->btgt);
17908 + a->dst_hdir = au_hi(a->dst_dir, a->btgt);
17909 + a->h_trap = vfsub_lock_rename(a->src_h_parent, a->src_hdir,
17910 + a->dst_h_parent, a->dst_hdir);
17911 + udba = au_opt_udba(a->src_dentry->d_sb);
17912 + if (unlikely(a->src_hdir->hi_inode != a->src_h_parent->d_inode
17913 + || a->dst_hdir->hi_inode != a->dst_h_parent->d_inode))
17914 + err = au_busy_or_stale();
17915 + if (!err && au_dbstart(a->src_dentry) == a->btgt)
17916 + err = au_h_verify(a->src_h_dentry, udba,
17917 + a->src_h_parent->d_inode, a->src_h_parent,
17919 + if (!err && au_dbstart(a->dst_dentry) == a->btgt)
17920 + err = au_h_verify(a->dst_h_dentry, udba,
17921 + a->dst_h_parent->d_inode, a->dst_h_parent,
17924 + err = mnt_want_write(a->br->br_mnt);
17925 + if (unlikely(err))
17927 + au_fset_ren(a->flags, MNT_WRITE);
17928 + goto out; /* success */
17931 + err = au_busy_or_stale();
17934 + au_ren_unlock(a);
17939 +/* ---------------------------------------------------------------------- */
17941 +static void au_ren_refresh_dir(struct au_ren_args *a)
17943 + struct inode *dir;
17945 + dir = a->dst_dir;
17946 + dir->i_version++;
17947 + if (au_ftest_ren(a->flags, ISDIR)) {
17948 + /* is this updating defined in POSIX? */
17949 + au_cpup_attr_timesizes(a->src_inode);
17950 + au_cpup_attr_nlink(dir, /*force*/1);
17953 + if (au_ibstart(dir) == a->btgt)
17954 + au_cpup_attr_timesizes(dir);
17956 + if (au_ftest_ren(a->flags, ISSAMEDIR))
17959 + dir = a->src_dir;
17960 + dir->i_version++;
17961 + if (au_ftest_ren(a->flags, ISDIR))
17962 + au_cpup_attr_nlink(dir, /*force*/1);
17963 + if (au_ibstart(dir) == a->btgt)
17964 + au_cpup_attr_timesizes(dir);
17967 +static void au_ren_refresh(struct au_ren_args *a)
17969 + aufs_bindex_t bend, bindex;
17970 + struct dentry *d, *h_d;
17971 + struct inode *i, *h_i;
17972 + struct super_block *sb;
17974 + d = a->dst_dentry;
17977 + /* already dget-ed by au_ren_or_cpup() */
17978 + au_set_h_dptr(d, a->btgt, a->h_dst);
17980 + i = a->dst_inode;
17982 + if (!au_ftest_ren(a->flags, ISDIR))
17983 + vfsub_drop_nlink(i);
17985 + vfsub_dead_dir(i);
17986 + au_cpup_attr_timesizes(i);
17988 + au_update_dbrange(d, /*do_put_zero*/1);
17991 + for (bindex = au_dbstart(d); bindex < bend; bindex++)
17992 + au_set_h_dptr(d, bindex, NULL);
17993 + bend = au_dbend(d);
17994 + for (bindex = a->btgt + 1; bindex <= bend; bindex++)
17995 + au_set_h_dptr(d, bindex, NULL);
17996 + au_update_dbrange(d, /*do_put_zero*/0);
17999 + d = a->src_dentry;
18000 + au_set_dbwh(d, -1);
18001 + bend = au_dbend(d);
18002 + for (bindex = a->btgt + 1; bindex <= bend; bindex++) {
18003 + h_d = au_h_dptr(d, bindex);
18005 + au_set_h_dptr(d, bindex, NULL);
18007 + au_set_dbend(d, a->btgt);
18010 + i = a->src_inode;
18011 + if (au_opt_test(au_mntflags(sb), PLINK) && au_plink_test(i))
18012 + return; /* success */
18014 + bend = au_ibend(i);
18015 + for (bindex = a->btgt + 1; bindex <= bend; bindex++) {
18016 + h_i = au_h_iptr(i, bindex);
18018 + au_xino_write(sb, bindex, h_i->i_ino, /*ino*/0);
18019 + /* ignore this error */
18020 + au_set_h_iptr(i, bindex, NULL, 0);
18023 + au_set_ibend(i, a->btgt);
18026 +/* ---------------------------------------------------------------------- */
18028 +/* mainly for link(2) and rename(2) */
18029 +int au_wbr(struct dentry *dentry, aufs_bindex_t btgt)
18031 + aufs_bindex_t bdiropq, bwh;
18032 + struct dentry *parent;
18033 + struct au_branch *br;
18035 + parent = dentry->d_parent;
18036 + IMustLock(parent->d_inode); /* dir is locked */
18038 + bdiropq = au_dbdiropq(parent);
18039 + bwh = au_dbwh(dentry);
18040 + br = au_sbr(dentry->d_sb, btgt);
18041 + if (au_br_rdonly(br)
18042 + || (0 <= bdiropq && bdiropq < btgt)
18043 + || (0 <= bwh && bwh < btgt))
18046 + AuDbg("btgt %d\n", btgt);
18050 +/* sets src_bstart, dst_bstart and btgt */
18051 +static int au_ren_wbr(struct au_ren_args *a)
18054 + struct au_wr_dir_args wr_dir_args = {
18055 + /* .force_btgt = -1, */
18056 + .flags = AuWrDir_ADD_ENTRY
18059 + a->src_bstart = au_dbstart(a->src_dentry);
18060 + a->dst_bstart = au_dbstart(a->dst_dentry);
18061 + if (au_ftest_ren(a->flags, ISDIR))
18062 + au_fset_wrdir(wr_dir_args.flags, ISDIR);
18063 + wr_dir_args.force_btgt = a->src_bstart;
18064 + if (a->dst_inode && a->dst_bstart < a->src_bstart)
18065 + wr_dir_args.force_btgt = a->dst_bstart;
18066 + wr_dir_args.force_btgt = au_wbr(a->dst_dentry, wr_dir_args.force_btgt);
18067 + err = au_wr_dir(a->dst_dentry, a->src_dentry, &wr_dir_args);
18073 +static void au_ren_dt(struct au_ren_args *a)
18075 + a->h_path.dentry = a->src_h_parent;
18076 + au_dtime_store(a->src_dt + AuPARENT, a->src_parent, &a->h_path);
18077 + if (!au_ftest_ren(a->flags, ISSAMEDIR)) {
18078 + a->h_path.dentry = a->dst_h_parent;
18079 + au_dtime_store(a->dst_dt + AuPARENT, a->dst_parent, &a->h_path);
18082 + au_fclr_ren(a->flags, DT_DSTDIR);
18083 + if (!au_ftest_ren(a->flags, ISDIR))
18086 + a->h_path.dentry = a->src_h_dentry;
18087 + au_dtime_store(a->src_dt + AuCHILD, a->src_dentry, &a->h_path);
18088 + if (a->dst_h_dentry->d_inode) {
18089 + au_fset_ren(a->flags, DT_DSTDIR);
18090 + a->h_path.dentry = a->dst_h_dentry;
18091 + au_dtime_store(a->dst_dt + AuCHILD, a->dst_dentry, &a->h_path);
18095 +static void au_ren_rev_dt(int err, struct au_ren_args *a)
18097 + struct dentry *h_d;
18098 + struct mutex *h_mtx;
18100 + au_dtime_revert(a->src_dt + AuPARENT);
18101 + if (!au_ftest_ren(a->flags, ISSAMEDIR))
18102 + au_dtime_revert(a->dst_dt + AuPARENT);
18104 + if (au_ftest_ren(a->flags, ISDIR) && err != -EIO) {
18105 + h_d = a->src_dt[AuCHILD].dt_h_path.dentry;
18106 + h_mtx = &h_d->d_inode->i_mutex;
18107 + mutex_lock_nested(h_mtx, AuLsc_I_CHILD);
18108 + au_dtime_revert(a->src_dt + AuCHILD);
18109 + mutex_unlock(h_mtx);
18111 + if (au_ftest_ren(a->flags, DT_DSTDIR)) {
18112 + h_d = a->dst_dt[AuCHILD].dt_h_path.dentry;
18113 + h_mtx = &h_d->d_inode->i_mutex;
18114 + mutex_lock_nested(h_mtx, AuLsc_I_CHILD);
18115 + au_dtime_revert(a->dst_dt + AuCHILD);
18116 + mutex_unlock(h_mtx);
18121 +/* ---------------------------------------------------------------------- */
18123 +int aufs_rename(struct inode *_src_dir, struct dentry *_src_dentry,
18124 + struct inode *_dst_dir, struct dentry *_dst_dentry)
18127 + /* reduce stack space */
18128 + struct au_ren_args *a;
18130 + AuDbg("%.*s, %.*s\n", AuDLNPair(_src_dentry), AuDLNPair(_dst_dentry));
18131 + IMustLock(_src_dir);
18132 + IMustLock(_dst_dir);
18135 + BUILD_BUG_ON(sizeof(*a) > PAGE_SIZE);
18136 + a = kzalloc(sizeof(*a), GFP_NOFS);
18137 + if (unlikely(!a))
18140 + a->src_dir = _src_dir;
18141 + a->src_dentry = _src_dentry;
18142 + a->src_inode = a->src_dentry->d_inode;
18143 + a->src_parent = a->src_dentry->d_parent; /* dir inode is locked */
18144 + a->dst_dir = _dst_dir;
18145 + a->dst_dentry = _dst_dentry;
18146 + a->dst_inode = a->dst_dentry->d_inode;
18147 + a->dst_parent = a->dst_dentry->d_parent; /* dir inode is locked */
18148 + if (a->dst_inode) {
18149 + IMustLock(a->dst_inode);
18150 + au_igrab(a->dst_inode);
18154 + flags = AuLock_FLUSH | AuLock_NOPLM | AuLock_GEN;
18155 + if (S_ISDIR(a->src_inode->i_mode)) {
18156 + au_fset_ren(a->flags, ISDIR);
18157 + if (unlikely(a->dst_inode && !S_ISDIR(a->dst_inode->i_mode)))
18159 + err = aufs_read_and_write_lock2(a->dst_dentry, a->src_dentry,
18160 + AuLock_DIR | flags);
18162 + err = aufs_read_and_write_lock2(a->dst_dentry, a->src_dentry,
18164 + if (unlikely(err))
18167 + err = au_d_hashed_positive(a->src_dentry);
18168 + if (unlikely(err))
18171 + if (a->dst_inode) {
18173 + * If it is a dir, VFS unhash dst_dentry before this
18174 + * function. It means we cannot rely upon d_unhashed().
18176 + if (unlikely(!a->dst_inode->i_nlink))
18178 + if (!S_ISDIR(a->dst_inode->i_mode)) {
18179 + err = au_d_hashed_positive(a->dst_dentry);
18180 + if (unlikely(err))
18182 + } else if (unlikely(IS_DEADDIR(a->dst_inode)))
18184 + } else if (unlikely(d_unhashed(a->dst_dentry)))
18187 + au_fset_ren(a->flags, ISSAMEDIR); /* temporary */
18188 + di_write_lock_parent(a->dst_parent);
18190 + /* which branch we process */
18191 + err = au_ren_wbr(a);
18192 + if (unlikely(err < 0))
18194 + a->br = au_sbr(a->dst_dentry->d_sb, a->btgt);
18195 + a->h_path.mnt = a->br->br_mnt;
18197 + /* are they available to be renamed */
18198 + err = au_ren_may_dir(a);
18199 + if (unlikely(err))
18200 + goto out_children;
18202 + /* prepare the writable parent dir on the same branch */
18203 + if (a->dst_bstart == a->btgt) {
18204 + au_fset_ren(a->flags, WHDST);
18206 + err = au_cpup_dirs(a->dst_dentry, a->btgt);
18207 + if (unlikely(err))
18208 + goto out_children;
18211 + if (a->src_dir != a->dst_dir) {
18213 + * this temporary unlock is safe,
18214 + * because both dir->i_mutex are locked.
18216 + di_write_unlock(a->dst_parent);
18217 + di_write_lock_parent(a->src_parent);
18218 + err = au_wr_dir_need_wh(a->src_dentry,
18219 + au_ftest_ren(a->flags, ISDIR),
18221 + di_write_unlock(a->src_parent);
18222 + di_write_lock2_parent(a->src_parent, a->dst_parent, /*isdir*/1);
18223 + au_fclr_ren(a->flags, ISSAMEDIR);
18225 + err = au_wr_dir_need_wh(a->src_dentry,
18226 + au_ftest_ren(a->flags, ISDIR),
18228 + if (unlikely(err < 0))
18229 + goto out_children;
18231 + au_fset_ren(a->flags, WHSRC);
18233 + /* lock them all */
18234 + err = au_ren_lock(a);
18235 + if (unlikely(err))
18236 + goto out_children;
18238 + if (!au_opt_test(au_mntflags(a->dst_dir->i_sb), UDBA_NONE))
18239 + err = au_may_ren(a);
18240 + else if (unlikely(a->dst_dentry->d_name.len > AUFS_MAX_NAMELEN))
18241 + err = -ENAMETOOLONG;
18242 + if (unlikely(err))
18245 + /* store timestamps to be revertible */
18249 + err = do_rename(a);
18250 + if (unlikely(err))
18253 + /* update dir attributes */
18254 + au_ren_refresh_dir(a);
18256 + /* dput/iput all lower dentries */
18257 + au_ren_refresh(a);
18259 + goto out_hdir; /* success */
18262 + au_ren_rev_dt(err, a);
18264 + au_ren_unlock(a);
18266 + au_nhash_wh_free(&a->whlist);
18267 + if (err && a->dst_inode && a->dst_bstart != a->btgt) {
18268 + AuDbg("bstart %d, btgt %d\n", a->dst_bstart, a->btgt);
18269 + au_set_h_dptr(a->dst_dentry, a->btgt, NULL);
18270 + au_set_dbstart(a->dst_dentry, a->dst_bstart);
18274 + d_move(a->src_dentry, a->dst_dentry);
18276 + au_update_dbstart(a->dst_dentry);
18277 + if (!a->dst_inode)
18278 + d_drop(a->dst_dentry);
18280 + if (au_ftest_ren(a->flags, ISSAMEDIR))
18281 + di_write_unlock(a->dst_parent);
18283 + di_write_unlock2(a->src_parent, a->dst_parent);
18285 + aufs_read_and_write_unlock2(a->dst_dentry, a->src_dentry);
18287 + iput(a->dst_inode);
18289 + au_whtmp_rmdir_free(a->thargs);
18295 diff -urN /usr/share/empty/fs/aufs/Kconfig linux/fs/aufs/Kconfig
18296 --- /usr/share/empty/fs/aufs/Kconfig 1970-01-01 01:00:00.000000000 +0100
18297 +++ linux/fs/aufs/Kconfig 2012-02-13 21:54:56.966438287 +0100
18300 + tristate "Aufs (Advanced multi layered unification filesystem) support"
18301 + depends on EXPERIMENTAL
18303 + Aufs is a stackable unification filesystem such as Unionfs,
18304 + which unifies several directories and provides a merged single
18306 + In the early days, aufs was entirely re-designed and
18307 + re-implemented Unionfs Version 1.x series. Introducing many
18308 + original ideas, approaches and improvements, it becomes totally
18309 + different from Unionfs while keeping the basic features.
18313 + prompt "Maximum number of branches"
18314 + default AUFS_BRANCH_MAX_127
18316 + Specifies the maximum number of branches (or member directories)
18317 + in a single aufs. The larger value consumes more system
18318 + resources and has a minor impact to performance.
18319 +config AUFS_BRANCH_MAX_127
18322 + Specifies the maximum number of branches (or member directories)
18323 + in a single aufs. The larger value consumes more system
18324 + resources and has a minor impact to performance.
18325 +config AUFS_BRANCH_MAX_511
18328 + Specifies the maximum number of branches (or member directories)
18329 + in a single aufs. The larger value consumes more system
18330 + resources and has a minor impact to performance.
18331 +config AUFS_BRANCH_MAX_1023
18334 + Specifies the maximum number of branches (or member directories)
18335 + in a single aufs. The larger value consumes more system
18336 + resources and has a minor impact to performance.
18337 +config AUFS_BRANCH_MAX_32767
18340 + Specifies the maximum number of branches (or member directories)
18341 + in a single aufs. The larger value consumes more system
18342 + resources and has a minor impact to performance.
18345 +config AUFS_SBILIST
18347 + depends on AUFS_MAGIC_SYSRQ || PROC_FS
18350 + Automatic configuration for internal use.
18351 + When aufs supports Magic SysRq or /proc, enabled automatically.
18353 +config AUFS_HNOTIFY
18354 + bool "Detect direct branch access (bypassing aufs)"
18356 + If you want to modify files on branches directly, eg. bypassing aufs,
18357 + and want aufs to detect the changes of them fully, then enable this
18358 + option and use 'udba=notify' mount option.
18359 + Currently there is only one available configuration, "fsnotify".
18360 + It will have a negative impact to the performance.
18361 + See detail in aufs.5.
18364 + prompt "method" if AUFS_HNOTIFY
18365 + default AUFS_HFSNOTIFY
18366 +config AUFS_HFSNOTIFY
18371 +config AUFS_EXPORT
18372 + bool "NFS-exportable aufs"
18373 + depends on EXPORTFS
18375 + If you want to export your mounted aufs via NFS, then enable this
18376 + option. There are several requirements for this configuration.
18377 + See detail in aufs.5.
18379 +config AUFS_INO_T_64
18381 + depends on AUFS_EXPORT
18382 + depends on 64BIT && !(ALPHA || S390)
18385 + Automatic configuration for internal use.
18386 + /* typedef unsigned long/int __kernel_ino_t */
18387 + /* alpha and s390x are int */
18390 + bool "Readdir in userspace"
18392 + Aufs has two methods to provide a merged view for a directory,
18393 + by a user-space library and by kernel-space natively. The latter
18394 + is always enabled but sometimes large and slow.
18395 + If you enable this option, install the library in aufs2-util
18396 + package, and set some environment variables for your readdir(3),
18397 + then the work will be handled in user-space which generally
18398 + shows better performance in most cases.
18399 + See detail in aufs.5.
18401 +config AUFS_PROC_MAP
18402 + bool "support for /proc/maps and lsof(1)"
18403 + depends on PROC_FS
18405 + When you issue mmap(2) in aufs, it is actually a direct mmap(2)
18406 + call to the file on the branch fs since the file in aufs is
18407 + purely virtual. And the file path printed in /proc/maps (and
18408 + others) will be the path on the branch fs. In most cases, it
18409 + does no harm. But some utilities like lsof(1) may confuse since
18410 + the utility or user may expect the file path in aufs to be
18412 + To address this issue, aufs provides a patch which introduces a
18413 + new member called vm_prfile into struct vm_are_struct. The patch
18414 + is meaningless without enabling this configuration since nobody
18415 + sets the new vm_prfile member.
18416 + If you don't apply the patch, then enabling this configuration
18417 + will cause a compile error.
18418 + This approach is fragile since if someone else make some changes
18419 + around vm_file, then vm_prfile may not work anymore. As a
18420 + workaround such case, aufs provides this configuration. If you
18421 + disable it, then lsof(1) may produce incorrect result but the
18422 + problem will be gone even if the aufs patch is applied (I hope).
18424 +config AUFS_SP_IATTR
18425 + bool "Respect the attributes (mtime/ctime mainly) of special files"
18427 + When you write something to a special file, some attributes of it
18428 + (mtime/ctime mainly) may be updated. Generally such updates are
18429 + less important (actually some device drivers and NFS ignore
18430 + it). But some applications (such like test program) requires
18431 + such updates. If you need these updates, then enable this
18432 + configuration which introduces some overhead.
18433 + Currently this configuration handles FIFO only.
18436 + bool "Show whiteouts"
18438 + If you want to make the whiteouts in aufs visible, then enable
18439 + this option and specify 'shwh' mount option. Although it may
18440 + sounds like philosophy or something, but in technically it
18441 + simply shows the name of whiteout with keeping its behaviour.
18443 +config AUFS_BR_RAMFS
18444 + bool "Ramfs (initramfs/rootfs) as an aufs branch"
18446 + If you want to use ramfs as an aufs branch fs, then enable this
18447 + option. Generally tmpfs is recommended.
18448 + Aufs prohibited them to be a branch fs by default, because
18449 + initramfs becomes unusable after switch_root or something
18450 + generally. If you sets initramfs as an aufs branch and boot your
18451 + system by switch_root, you will meet a problem easily since the
18452 + files in initramfs may be inaccessible.
18453 + Unless you are going to use ramfs as an aufs branch fs without
18454 + switch_root or something, leave it N.
18456 +config AUFS_BR_FUSE
18457 + bool "Fuse fs as an aufs branch"
18458 + depends on FUSE_FS
18461 + If you want to use fuse-based userspace filesystem as an aufs
18462 + branch fs, then enable this option.
18463 + It implements the internal poll(2) operation which is
18464 + implemented by fuse only (curretnly).
18469 + Automatic configuration for internal use.
18471 +config AUFS_BR_HFSPLUS
18472 + bool "Hfsplus as an aufs branch"
18473 + depends on HFSPLUS_FS
18476 + If you want to use hfsplus fs as an aufs branch fs, then enable
18477 + this option. This option introduces a small overhead at
18478 + copying-up a file on hfsplus.
18480 +config AUFS_BDEV_LOOP
18482 + depends on BLK_DEV_LOOP
18485 + Automatic configuration for internal use.
18486 + Convert =[ym] into =y.
18489 + bool "Debug aufs"
18491 + Enable this to compile aufs internal debug code.
18492 + It will have a negative impact to the performance.
18494 +config AUFS_MAGIC_SYSRQ
18496 + depends on AUFS_DEBUG && MAGIC_SYSRQ
18499 + Automatic configuration for internal use.
18500 + When aufs supports Magic SysRq, enabled automatically.
18502 diff -urN /usr/share/empty/fs/aufs/loop.c linux/fs/aufs/loop.c
18503 --- /usr/share/empty/fs/aufs/loop.c 1970-01-01 01:00:00.000000000 +0100
18504 +++ linux/fs/aufs/loop.c 2012-02-13 21:54:56.969771692 +0100
18507 + * Copyright (C) 2005-2012 Junjiro R. Okajima
18509 + * This program, aufs is free software; you can redistribute it and/or modify
18510 + * it under the terms of the GNU General Public License as published by
18511 + * the Free Software Foundation; either version 2 of the License, or
18512 + * (at your option) any later version.
18514 + * This program is distributed in the hope that it will be useful,
18515 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
18516 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
18517 + * GNU General Public License for more details.
18519 + * You should have received a copy of the GNU General Public License
18520 + * along with this program; if not, write to the Free Software
18521 + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
18525 + * support for loopback block device as a branch
18528 +#include <linux/loop.h>
18532 + * test if two lower dentries have overlapping branches.
18534 +int au_test_loopback_overlap(struct super_block *sb, struct dentry *h_adding)
18536 + struct super_block *h_sb;
18537 + struct loop_device *l;
18539 + h_sb = h_adding->d_sb;
18540 + if (MAJOR(h_sb->s_dev) != LOOP_MAJOR)
18543 + l = h_sb->s_bdev->bd_disk->private_data;
18544 + h_adding = l->lo_backing_file->f_dentry;
18546 + * h_adding can be local NFS.
18547 + * in this case aufs cannot detect the loop.
18549 + if (unlikely(h_adding->d_sb == sb))
18551 + return !!au_test_subdir(h_adding, sb->s_root);
18554 +/* true if a kernel thread named 'loop[0-9].*' accesses a file */
18555 +int au_test_loopback_kthread(void)
18558 + struct task_struct *tsk = current;
18561 + if (tsk->flags & PF_KTHREAD) {
18562 + const char c = tsk->comm[4];
18563 + ret = ('0' <= c && c <= '9'
18564 + && !strncmp(tsk->comm, "loop", 4));
18570 +/* ---------------------------------------------------------------------- */
18572 +#define au_warn_loopback_step 16
18573 +static int au_warn_loopback_nelem = au_warn_loopback_step;
18574 +static unsigned long *au_warn_loopback_array;
18576 +void au_warn_loopback(struct super_block *h_sb)
18578 + int i, new_nelem;
18579 + unsigned long *a, magic;
18580 + static DEFINE_SPINLOCK(spin);
18582 + magic = h_sb->s_magic;
18583 + spin_lock(&spin);
18584 + a = au_warn_loopback_array;
18585 + for (i = 0; i < au_warn_loopback_nelem && *a; i++)
18586 + if (a[i] == magic) {
18587 + spin_unlock(&spin);
18591 + /* h_sb is new to us, print it */
18592 + if (i < au_warn_loopback_nelem) {
18597 + /* expand the array */
18598 + new_nelem = au_warn_loopback_nelem + au_warn_loopback_step;
18599 + a = au_kzrealloc(au_warn_loopback_array,
18600 + au_warn_loopback_nelem * sizeof(unsigned long),
18601 + new_nelem * sizeof(unsigned long), GFP_ATOMIC);
18603 + au_warn_loopback_nelem = new_nelem;
18604 + au_warn_loopback_array = a;
18609 + spin_unlock(&spin);
18610 + AuWarn1("realloc failed, ignored\n");
18614 + spin_unlock(&spin);
18615 + pr_warning("you may want to try another patch for loopback file "
18616 + "on %s(0x%lx) branch\n", au_sbtype(h_sb), magic);
18619 +int au_loopback_init(void)
18622 + struct super_block *sb __maybe_unused;
18624 + AuDebugOn(sizeof(sb->s_magic) != sizeof(unsigned long));
18627 + au_warn_loopback_array = kcalloc(au_warn_loopback_step,
18628 + sizeof(unsigned long), GFP_NOFS);
18629 + if (unlikely(!au_warn_loopback_array))
18635 +void au_loopback_fin(void)
18637 + kfree(au_warn_loopback_array);
18639 diff -urN /usr/share/empty/fs/aufs/loop.h linux/fs/aufs/loop.h
18640 --- /usr/share/empty/fs/aufs/loop.h 1970-01-01 01:00:00.000000000 +0100
18641 +++ linux/fs/aufs/loop.h 2012-02-13 21:54:56.969771692 +0100
18644 + * Copyright (C) 2005-2012 Junjiro R. Okajima
18646 + * This program, aufs is free software; you can redistribute it and/or modify
18647 + * it under the terms of the GNU General Public License as published by
18648 + * the Free Software Foundation; either version 2 of the License, or
18649 + * (at your option) any later version.
18651 + * This program is distributed in the hope that it will be useful,
18652 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
18653 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
18654 + * GNU General Public License for more details.
18656 + * You should have received a copy of the GNU General Public License
18657 + * along with this program; if not, write to the Free Software
18658 + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
18662 + * support for loopback mount as a branch
18665 +#ifndef __AUFS_LOOP_H__
18666 +#define __AUFS_LOOP_H__
18671 +struct super_block;
18673 +#ifdef CONFIG_AUFS_BDEV_LOOP
18675 +int au_test_loopback_overlap(struct super_block *sb, struct dentry *h_adding);
18676 +int au_test_loopback_kthread(void);
18677 +void au_warn_loopback(struct super_block *h_sb);
18679 +int au_loopback_init(void);
18680 +void au_loopback_fin(void);
18682 +AuStubInt0(au_test_loopback_overlap, struct super_block *sb,
18683 + struct dentry *h_adding)
18684 +AuStubInt0(au_test_loopback_kthread, void)
18685 +AuStubVoid(au_warn_loopback, struct super_block *h_sb)
18687 +AuStubInt0(au_loopback_init, void)
18688 +AuStubVoid(au_loopback_fin, void)
18689 +#endif /* BLK_DEV_LOOP */
18691 +#endif /* __KERNEL__ */
18692 +#endif /* __AUFS_LOOP_H__ */
18693 diff -urN /usr/share/empty/fs/aufs/magic.mk linux/fs/aufs/magic.mk
18694 --- /usr/share/empty/fs/aufs/magic.mk 1970-01-01 01:00:00.000000000 +0100
18695 +++ linux/fs/aufs/magic.mk 2012-02-13 21:54:56.969771692 +0100
18698 +# defined in ${srctree}/fs/fuse/inode.c
18700 +ifdef CONFIG_FUSE_FS
18701 +ccflags-y += -DFUSE_SUPER_MAGIC=0x65735546
18704 +# defined in ${srctree}/fs/ocfs2/ocfs2_fs.h
18706 +ifdef CONFIG_OCFS2_FS
18707 +ccflags-y += -DOCFS2_SUPER_MAGIC=0x7461636f
18710 +# defined in ${srctree}/fs/ocfs2/dlm/userdlm.h
18712 +ifdef CONFIG_OCFS2_FS_O2CB
18713 +ccflags-y += -DDLMFS_MAGIC=0x76a9f425
18716 +# defined in ${srctree}/fs/cifs/cifsfs.c
18718 +ifdef CONFIG_CIFS_FS
18719 +ccflags-y += -DCIFS_MAGIC_NUMBER=0xFF534D42
18722 +# defined in ${srctree}/fs/xfs/xfs_sb.h
18724 +ifdef CONFIG_XFS_FS
18725 +ccflags-y += -DXFS_SB_MAGIC=0x58465342
18728 +# defined in ${srctree}/fs/configfs/mount.c
18730 +ifdef CONFIG_CONFIGFS_FS
18731 +ccflags-y += -DCONFIGFS_MAGIC=0x62656570
18734 +# defined in ${srctree}/fs/9p/v9fs.h
18736 +ifdef CONFIG_9P_FS
18737 +ccflags-y += -DV9FS_MAGIC=0x01021997
18740 +# defined in ${srctree}/fs/ubifs/ubifs.h
18742 +ifdef CONFIG_UBIFS_FS
18743 +ccflags-y += -DUBIFS_SUPER_MAGIC=0x24051905
18746 +# defined in ${srctree}/fs/hfsplus/hfsplus_raw.h
18748 +ifdef CONFIG_HFSPLUS_FS
18749 +ccflags-y += -DHFSPLUS_SUPER_MAGIC=0x482b
18751 diff -urN /usr/share/empty/fs/aufs/Makefile linux/fs/aufs/Makefile
18752 --- /usr/share/empty/fs/aufs/Makefile 1970-01-01 01:00:00.000000000 +0100
18753 +++ linux/fs/aufs/Makefile 2012-02-13 21:54:56.966438287 +0100
18756 +include ${src}/magic.mk
18757 +ifeq (${CONFIG_AUFS_FS},m)
18758 +include ${src}/conf.mk
18760 +-include ${src}/priv_def.mk
18762 +# cf. include/linux/kernel.h
18764 +ccflags-y += -DDEBUG
18765 +# sparse requires the full pathname
18767 +ccflags-y += -include ${M}/../../include/linux/aufs_type.h
18769 +ccflags-y += -include ${srctree}/include/linux/aufs_type.h
18772 +obj-$(CONFIG_AUFS_FS) += aufs.o
18773 +aufs-y := module.o sbinfo.o super.o branch.o xino.o sysaufs.o opts.o \
18774 + wkq.o vfsub.o dcsub.o \
18775 + cpup.o whout.o wbr_policy.o \
18776 + dinfo.o dentry.o \
18778 + finfo.o file.o f_op.o \
18780 + iinfo.o inode.o i_op.o i_op_add.o i_op_del.o i_op_ren.o \
18784 +aufs-$(CONFIG_PROC_FS) += procfs.o plink.o
18785 +aufs-$(CONFIG_SYSFS) += sysfs.o
18786 +aufs-$(CONFIG_DEBUG_FS) += dbgaufs.o
18787 +aufs-$(CONFIG_AUFS_BDEV_LOOP) += loop.o
18788 +aufs-$(CONFIG_AUFS_HNOTIFY) += hnotify.o
18789 +aufs-$(CONFIG_AUFS_HFSNOTIFY) += hfsnotify.o
18790 +aufs-$(CONFIG_AUFS_EXPORT) += export.o
18791 +aufs-$(CONFIG_AUFS_POLL) += poll.o
18792 +aufs-$(CONFIG_AUFS_RDU) += rdu.o
18793 +aufs-$(CONFIG_AUFS_SP_IATTR) += f_op_sp.o
18794 +aufs-$(CONFIG_AUFS_BR_HFSPLUS) += hfsplus.o
18795 +aufs-$(CONFIG_AUFS_DEBUG) += debug.o
18796 +aufs-$(CONFIG_AUFS_MAGIC_SYSRQ) += sysrq.o
18797 diff -urN /usr/share/empty/fs/aufs/module.c linux/fs/aufs/module.c
18798 --- /usr/share/empty/fs/aufs/module.c 1970-01-01 01:00:00.000000000 +0100
18799 +++ linux/fs/aufs/module.c 2012-02-13 21:54:56.969771692 +0100
18802 + * Copyright (C) 2005-2012 Junjiro R. Okajima
18804 + * This program, aufs is free software; you can redistribute it and/or modify
18805 + * it under the terms of the GNU General Public License as published by
18806 + * the Free Software Foundation; either version 2 of the License, or
18807 + * (at your option) any later version.
18809 + * This program is distributed in the hope that it will be useful,
18810 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
18811 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
18812 + * GNU General Public License for more details.
18814 + * You should have received a copy of the GNU General Public License
18815 + * along with this program; if not, write to the Free Software
18816 + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
18820 + * module global variables and operations
18823 +#include <linux/module.h>
18824 +#include <linux/seq_file.h>
18827 +void *au_kzrealloc(void *p, unsigned int nused, unsigned int new_sz, gfp_t gfp)
18829 + if (new_sz <= nused)
18832 + p = krealloc(p, new_sz, gfp);
18834 + memset(p + nused, 0, new_sz - nused);
18838 +/* ---------------------------------------------------------------------- */
18843 +struct kmem_cache *au_cachep[AuCache_Last];
18844 +static int __init au_cache_init(void)
18846 + au_cachep[AuCache_DINFO] = AuCacheCtor(au_dinfo, au_di_init_once);
18847 + if (au_cachep[AuCache_DINFO])
18848 + /* SLAB_DESTROY_BY_RCU */
18849 + au_cachep[AuCache_ICNTNR] = AuCacheCtor(au_icntnr,
18850 + au_icntnr_init_once);
18851 + if (au_cachep[AuCache_ICNTNR])
18852 + au_cachep[AuCache_FINFO] = AuCacheCtor(au_finfo,
18853 + au_fi_init_once);
18854 + if (au_cachep[AuCache_FINFO])
18855 + au_cachep[AuCache_VDIR] = AuCache(au_vdir);
18856 + if (au_cachep[AuCache_VDIR])
18857 + au_cachep[AuCache_DEHSTR] = AuCache(au_vdir_dehstr);
18858 + if (au_cachep[AuCache_DEHSTR])
18864 +static void au_cache_fin(void)
18868 + /* including AuCache_HNOTIFY */
18869 + for (i = 0; i < AuCache_Last; i++)
18870 + if (au_cachep[i]) {
18871 + kmem_cache_destroy(au_cachep[i]);
18872 + au_cachep[i] = NULL;
18876 +/* ---------------------------------------------------------------------- */
18878 +int au_dir_roflags;
18880 +#ifdef CONFIG_AUFS_SBILIST
18882 + * iterate_supers_type() doesn't protect us from
18883 + * remounting (branch management)
18885 +struct au_splhead au_sbilist;
18888 +struct lock_class_key au_lc_key[AuLcKey_Last];
18891 + * functions for module interface.
18893 +MODULE_LICENSE("GPL");
18894 +/* MODULE_LICENSE("GPL v2"); */
18895 +MODULE_AUTHOR("Junjiro R. Okajima <aufs-users@lists.sourceforge.net>");
18896 +MODULE_DESCRIPTION(AUFS_NAME
18897 + " -- Advanced multi layered unification filesystem");
18898 +MODULE_VERSION(AUFS_VERSION);
18900 +/* this module parameter has no meaning when SYSFS is disabled */
18901 +int sysaufs_brs = 1;
18902 +MODULE_PARM_DESC(brs, "use <sysfs>/fs/aufs/si_*/brN");
18903 +module_param_named(brs, sysaufs_brs, int, S_IRUGO);
18905 +/* ---------------------------------------------------------------------- */
18907 +static char au_esc_chars[0x20 + 3]; /* 0x01-0x20, backslash, del, and NULL */
18909 +int au_seq_path(struct seq_file *seq, struct path *path)
18911 + return seq_path(seq, path, au_esc_chars);
18914 +/* ---------------------------------------------------------------------- */
18916 +static int __init aufs_init(void)
18921 + p = au_esc_chars;
18922 + for (i = 1; i <= ' '; i++)
18928 + au_dir_roflags = au_file_roflags(O_DIRECTORY | O_LARGEFILE);
18930 + au_sbilist_init();
18931 + sysaufs_brs_init();
18934 + err = sysaufs_init();
18935 + if (unlikely(err))
18937 + err = au_procfs_init();
18938 + if (unlikely(err))
18939 + goto out_sysaufs;
18940 + err = au_wkq_init();
18941 + if (unlikely(err))
18943 + err = au_loopback_init();
18944 + if (unlikely(err))
18946 + err = au_hnotify_init();
18947 + if (unlikely(err))
18948 + goto out_loopback;
18949 + err = au_sysrq_init();
18950 + if (unlikely(err))
18952 + err = au_cache_init();
18953 + if (unlikely(err))
18955 + err = register_filesystem(&aufs_fs_type);
18956 + if (unlikely(err))
18958 + /* since we define pr_fmt, call printk directly */
18959 + printk(KERN_INFO AUFS_NAME " " AUFS_VERSION "\n");
18960 + goto out; /* success */
18967 + au_hnotify_fin();
18969 + au_loopback_fin();
18981 +static void __exit aufs_exit(void)
18983 + unregister_filesystem(&aufs_fs_type);
18986 + au_hnotify_fin();
18987 + au_loopback_fin();
18994 +module_init(aufs_init);
18995 +module_exit(aufs_exit);
18996 diff -urN /usr/share/empty/fs/aufs/module.h linux/fs/aufs/module.h
18997 --- /usr/share/empty/fs/aufs/module.h 1970-01-01 01:00:00.000000000 +0100
18998 +++ linux/fs/aufs/module.h 2012-02-13 21:54:56.969771692 +0100
19001 + * Copyright (C) 2005-2012 Junjiro R. Okajima
19003 + * This program, aufs is free software; you can redistribute it and/or modify
19004 + * it under the terms of the GNU General Public License as published by
19005 + * the Free Software Foundation; either version 2 of the License, or
19006 + * (at your option) any later version.
19008 + * This program is distributed in the hope that it will be useful,
19009 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
19010 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
19011 + * GNU General Public License for more details.
19013 + * You should have received a copy of the GNU General Public License
19014 + * along with this program; if not, write to the Free Software
19015 + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
19019 + * module initialization and module-global
19022 +#ifndef __AUFS_MODULE_H__
19023 +#define __AUFS_MODULE_H__
19027 +#include <linux/slab.h>
19032 +/* module parameters */
19033 +extern int sysaufs_brs;
19035 +/* ---------------------------------------------------------------------- */
19037 +extern int au_dir_roflags;
19040 + AuLcNonDir_FIINFO,
19041 + AuLcNonDir_DIINFO,
19042 + AuLcNonDir_IIINFO,
19048 + AuLcSymlink_DIINFO,
19049 + AuLcSymlink_IIINFO,
19053 +extern struct lock_class_key au_lc_key[AuLcKey_Last];
19055 +void *au_kzrealloc(void *p, unsigned int nused, unsigned int new_sz, gfp_t gfp);
19056 +int au_seq_path(struct seq_file *seq, struct path *path);
19058 +#ifdef CONFIG_PROC_FS
19060 +int __init au_procfs_init(void);
19061 +void au_procfs_fin(void);
19063 +AuStubInt0(au_procfs_init, void);
19064 +AuStubVoid(au_procfs_fin, void);
19067 +/* ---------------------------------------------------------------------- */
19076 +#ifdef CONFIG_AUFS_HNOTIFY
19082 +#define AuCacheFlags (SLAB_RECLAIM_ACCOUNT | SLAB_MEM_SPREAD)
19083 +#define AuCache(type) KMEM_CACHE(type, AuCacheFlags)
19084 +#define AuCacheCtor(type, ctor) \
19085 + kmem_cache_create(#type, sizeof(struct type), \
19086 + __alignof__(struct type), AuCacheFlags, ctor)
19088 +extern struct kmem_cache *au_cachep[];
19090 +#define AuCacheFuncs(name, index) \
19091 +static inline struct au_##name *au_cache_alloc_##name(void) \
19092 +{ return kmem_cache_alloc(au_cachep[AuCache_##index], GFP_NOFS); } \
19093 +static inline void au_cache_free_##name(struct au_##name *p) \
19094 +{ kmem_cache_free(au_cachep[AuCache_##index], p); }
19096 +AuCacheFuncs(dinfo, DINFO);
19097 +AuCacheFuncs(icntnr, ICNTNR);
19098 +AuCacheFuncs(finfo, FINFO);
19099 +AuCacheFuncs(vdir, VDIR);
19100 +AuCacheFuncs(vdir_dehstr, DEHSTR);
19101 +#ifdef CONFIG_AUFS_HNOTIFY
19102 +AuCacheFuncs(hnotify, HNOTIFY);
19105 +#endif /* __KERNEL__ */
19106 +#endif /* __AUFS_MODULE_H__ */
19107 diff -urN /usr/share/empty/fs/aufs/opts.c linux/fs/aufs/opts.c
19108 --- /usr/share/empty/fs/aufs/opts.c 1970-01-01 01:00:00.000000000 +0100
19109 +++ linux/fs/aufs/opts.c 2012-02-13 21:54:56.973105100 +0100
19112 + * Copyright (C) 2005-2012 Junjiro R. Okajima
19114 + * This program, aufs is free software; you can redistribute it and/or modify
19115 + * it under the terms of the GNU General Public License as published by
19116 + * the Free Software Foundation; either version 2 of the License, or
19117 + * (at your option) any later version.
19119 + * This program is distributed in the hope that it will be useful,
19120 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
19121 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
19122 + * GNU General Public License for more details.
19124 + * You should have received a copy of the GNU General Public License
19125 + * along with this program; if not, write to the Free Software
19126 + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
19130 + * mount options/flags
19133 +#include <linux/namei.h>
19134 +#include <linux/types.h> /* a distribution requires */
19135 +#include <linux/parser.h>
19138 +/* ---------------------------------------------------------------------- */
19142 + Opt_add, Opt_del, Opt_mod, Opt_reorder, Opt_append, Opt_prepend,
19143 + Opt_idel, Opt_imod, Opt_ireorder,
19144 + Opt_dirwh, Opt_rdcache, Opt_rdblk, Opt_rdhash, Opt_rendir,
19145 + Opt_rdblk_def, Opt_rdhash_def,
19146 + Opt_xino, Opt_zxino, Opt_noxino,
19147 + Opt_trunc_xino, Opt_trunc_xino_v, Opt_notrunc_xino,
19148 + Opt_trunc_xino_path, Opt_itrunc_xino,
19149 + Opt_trunc_xib, Opt_notrunc_xib,
19150 + Opt_shwh, Opt_noshwh,
19151 + Opt_plink, Opt_noplink, Opt_list_plink,
19153 + Opt_dio, Opt_nodio,
19154 + /* Opt_lock, Opt_unlock, */
19155 + Opt_cmd, Opt_cmd_args,
19156 + Opt_diropq_a, Opt_diropq_w,
19157 + Opt_warn_perm, Opt_nowarn_perm,
19158 + Opt_wbr_copyup, Opt_wbr_create,
19159 + Opt_refrof, Opt_norefrof,
19160 + Opt_verbose, Opt_noverbose,
19161 + Opt_sum, Opt_nosum, Opt_wsum,
19162 + Opt_tail, Opt_ignore, Opt_ignore_silent, Opt_err
19165 +static match_table_t options = {
19166 + {Opt_br, "br=%s"},
19167 + {Opt_br, "br:%s"},
19169 + {Opt_add, "add=%d:%s"},
19170 + {Opt_add, "add:%d:%s"},
19171 + {Opt_add, "ins=%d:%s"},
19172 + {Opt_add, "ins:%d:%s"},
19173 + {Opt_append, "append=%s"},
19174 + {Opt_append, "append:%s"},
19175 + {Opt_prepend, "prepend=%s"},
19176 + {Opt_prepend, "prepend:%s"},
19178 + {Opt_del, "del=%s"},
19179 + {Opt_del, "del:%s"},
19180 + /* {Opt_idel, "idel:%d"}, */
19181 + {Opt_mod, "mod=%s"},
19182 + {Opt_mod, "mod:%s"},
19183 + /* {Opt_imod, "imod:%d:%s"}, */
19185 + {Opt_dirwh, "dirwh=%d"},
19187 + {Opt_xino, "xino=%s"},
19188 + {Opt_noxino, "noxino"},
19189 + {Opt_trunc_xino, "trunc_xino"},
19190 + {Opt_trunc_xino_v, "trunc_xino_v=%d:%d"},
19191 + {Opt_notrunc_xino, "notrunc_xino"},
19192 + {Opt_trunc_xino_path, "trunc_xino=%s"},
19193 + {Opt_itrunc_xino, "itrunc_xino=%d"},
19194 + /* {Opt_zxino, "zxino=%s"}, */
19195 + {Opt_trunc_xib, "trunc_xib"},
19196 + {Opt_notrunc_xib, "notrunc_xib"},
19198 +#ifdef CONFIG_PROC_FS
19199 + {Opt_plink, "plink"},
19201 + {Opt_ignore_silent, "plink"},
19204 + {Opt_noplink, "noplink"},
19206 +#ifdef CONFIG_AUFS_DEBUG
19207 + {Opt_list_plink, "list_plink"},
19210 + {Opt_udba, "udba=%s"},
19212 + {Opt_dio, "dio"},
19213 + {Opt_nodio, "nodio"},
19215 + {Opt_diropq_a, "diropq=always"},
19216 + {Opt_diropq_a, "diropq=a"},
19217 + {Opt_diropq_w, "diropq=whiteouted"},
19218 + {Opt_diropq_w, "diropq=w"},
19220 + {Opt_warn_perm, "warn_perm"},
19221 + {Opt_nowarn_perm, "nowarn_perm"},
19223 + /* keep them temporary */
19224 + {Opt_ignore_silent, "coo=%s"},
19225 + {Opt_ignore_silent, "nodlgt"},
19226 + {Opt_ignore_silent, "nodirperm1"},
19227 + {Opt_ignore_silent, "clean_plink"},
19229 +#ifdef CONFIG_AUFS_SHWH
19230 + {Opt_shwh, "shwh"},
19232 + {Opt_noshwh, "noshwh"},
19234 + {Opt_rendir, "rendir=%d"},
19236 + {Opt_refrof, "refrof"},
19237 + {Opt_norefrof, "norefrof"},
19239 + {Opt_verbose, "verbose"},
19240 + {Opt_verbose, "v"},
19241 + {Opt_noverbose, "noverbose"},
19242 + {Opt_noverbose, "quiet"},
19243 + {Opt_noverbose, "q"},
19244 + {Opt_noverbose, "silent"},
19246 + {Opt_sum, "sum"},
19247 + {Opt_nosum, "nosum"},
19248 + {Opt_wsum, "wsum"},
19250 + {Opt_rdcache, "rdcache=%d"},
19251 + {Opt_rdblk, "rdblk=%d"},
19252 + {Opt_rdblk_def, "rdblk=def"},
19253 + {Opt_rdhash, "rdhash=%d"},
19254 + {Opt_rdhash_def, "rdhash=def"},
19256 + {Opt_wbr_create, "create=%s"},
19257 + {Opt_wbr_create, "create_policy=%s"},
19258 + {Opt_wbr_copyup, "cpup=%s"},
19259 + {Opt_wbr_copyup, "copyup=%s"},
19260 + {Opt_wbr_copyup, "copyup_policy=%s"},
19262 + /* internal use for the scripts */
19263 + {Opt_ignore_silent, "si=%s"},
19265 + {Opt_br, "dirs=%s"},
19266 + {Opt_ignore, "debug=%d"},
19267 + {Opt_ignore, "delete=whiteout"},
19268 + {Opt_ignore, "delete=all"},
19269 + {Opt_ignore, "imap=%s"},
19271 + /* temporary workaround, due to old mount(8)? */
19272 + {Opt_ignore_silent, "relatime"},
19277 +/* ---------------------------------------------------------------------- */
19279 +static const char *au_parser_pattern(int val, struct match_token *token)
19281 + while (token->pattern) {
19282 + if (token->token == val)
19283 + return token->pattern;
19290 +/* ---------------------------------------------------------------------- */
19292 +static match_table_t brperm = {
19293 + {AuBrPerm_RO, AUFS_BRPERM_RO},
19294 + {AuBrPerm_RR, AUFS_BRPERM_RR},
19295 + {AuBrPerm_RW, AUFS_BRPERM_RW},
19299 +static match_table_t brrattr = {
19300 + {AuBrRAttr_WH, AUFS_BRRATTR_WH},
19304 +static match_table_t brwattr = {
19305 + {AuBrWAttr_NoLinkWH, AUFS_BRWATTR_NLWH},
19309 +#define AuBrStr_LONGEST AUFS_BRPERM_RW "+" AUFS_BRWATTR_NLWH
19311 +static int br_attr_val(char *str, match_table_t table, substring_t args[])
19318 + p = strchr(str, '+');
19321 + v = match_token(str, table, args);
19327 + pr_warning("ignored branch attribute %s\n", str);
19337 +static int noinline_for_stack br_perm_val(char *perm)
19341 + substring_t args[MAX_OPT_ARGS];
19343 + p = strchr(perm, '+');
19346 + val = match_token(perm, brperm, args);
19350 + pr_warning("ignored branch permission %s\n", perm);
19351 + val = AuBrPerm_RO;
19358 + case AuBrPerm_RO:
19359 + case AuBrPerm_RR:
19360 + val |= br_attr_val(p + 1, brrattr, args);
19362 + case AuBrPerm_RW:
19363 + val |= br_attr_val(p + 1, brwattr, args);
19371 +/* Caller should free the return value */
19372 +char *au_optstr_br_perm(int brperm)
19374 + char *p, a[sizeof(AuBrStr_LONGEST)];
19377 +#define SetPerm(str) do { \
19378 + sz = sizeof(str); \
19379 + memcpy(a, str, sz); \
19380 + p = a + sz - 1; \
19383 +#define AppendAttr(flag, str) do { \
19384 + if (brperm & flag) { \
19385 + sz = sizeof(str); \
19387 + memcpy(p, str, sz); \
19392 + switch (brperm & AuBrPerm_Mask) {
19393 + case AuBrPerm_RO:
19394 + SetPerm(AUFS_BRPERM_RO);
19396 + case AuBrPerm_RR:
19397 + SetPerm(AUFS_BRPERM_RR);
19399 + case AuBrPerm_RW:
19400 + SetPerm(AUFS_BRPERM_RW);
19406 + AppendAttr(AuBrRAttr_WH, AUFS_BRRATTR_WH);
19407 + AppendAttr(AuBrWAttr_NoLinkWH, AUFS_BRWATTR_NLWH);
19409 + AuDebugOn(strlen(a) >= sizeof(a));
19410 + return kstrdup(a, GFP_NOFS);
19415 +/* ---------------------------------------------------------------------- */
19417 +static match_table_t udbalevel = {
19418 + {AuOpt_UDBA_REVAL, "reval"},
19419 + {AuOpt_UDBA_NONE, "none"},
19420 +#ifdef CONFIG_AUFS_HNOTIFY
19421 + {AuOpt_UDBA_HNOTIFY, "notify"}, /* abstraction */
19422 +#ifdef CONFIG_AUFS_HFSNOTIFY
19423 + {AuOpt_UDBA_HNOTIFY, "fsnotify"},
19429 +static int noinline_for_stack udba_val(char *str)
19431 + substring_t args[MAX_OPT_ARGS];
19433 + return match_token(str, udbalevel, args);
19436 +const char *au_optstr_udba(int udba)
19438 + return au_parser_pattern(udba, (void *)udbalevel);
19441 +/* ---------------------------------------------------------------------- */
19443 +static match_table_t au_wbr_create_policy = {
19444 + {AuWbrCreate_TDP, "tdp"},
19445 + {AuWbrCreate_TDP, "top-down-parent"},
19446 + {AuWbrCreate_RR, "rr"},
19447 + {AuWbrCreate_RR, "round-robin"},
19448 + {AuWbrCreate_MFS, "mfs"},
19449 + {AuWbrCreate_MFS, "most-free-space"},
19450 + {AuWbrCreate_MFSV, "mfs:%d"},
19451 + {AuWbrCreate_MFSV, "most-free-space:%d"},
19453 + {AuWbrCreate_MFSRR, "mfsrr:%d"},
19454 + {AuWbrCreate_MFSRRV, "mfsrr:%d:%d"},
19455 + {AuWbrCreate_PMFS, "pmfs"},
19456 + {AuWbrCreate_PMFSV, "pmfs:%d"},
19462 + * cf. linux/lib/parser.c and cmdline.c
19463 + * gave up calling memparse() since it uses simple_strtoull() instead of
19466 +static int noinline_for_stack
19467 +au_match_ull(substring_t *s, unsigned long long *result)
19470 + unsigned int len;
19474 + len = s->to - s->from;
19475 + if (len + 1 <= sizeof(a)) {
19476 + memcpy(a, s->from, len);
19478 + err = kstrtoull(a, 0, result);
19483 +static int au_wbr_mfs_wmark(substring_t *arg, char *str,
19484 + struct au_opt_wbr_create *create)
19487 + unsigned long long ull;
19490 + if (!au_match_ull(arg, &ull))
19491 + create->mfsrr_watermark = ull;
19493 + pr_err("bad integer in %s\n", str);
19500 +static int au_wbr_mfs_sec(substring_t *arg, char *str,
19501 + struct au_opt_wbr_create *create)
19506 + if (!match_int(arg, &n) && 0 <= n && n <= AUFS_MFS_MAX_SEC)
19507 + create->mfs_second = n;
19509 + pr_err("bad integer in %s\n", str);
19516 +static int noinline_for_stack
19517 +au_wbr_create_val(char *str, struct au_opt_wbr_create *create)
19520 + substring_t args[MAX_OPT_ARGS];
19522 + err = match_token(str, au_wbr_create_policy, args);
19523 + create->wbr_create = err;
19525 + case AuWbrCreate_MFSRRV:
19526 + e = au_wbr_mfs_wmark(&args[0], str, create);
19528 + e = au_wbr_mfs_sec(&args[1], str, create);
19532 + case AuWbrCreate_MFSRR:
19533 + e = au_wbr_mfs_wmark(&args[0], str, create);
19534 + if (unlikely(e)) {
19539 + case AuWbrCreate_MFS:
19540 + case AuWbrCreate_PMFS:
19541 + create->mfs_second = AUFS_MFS_DEF_SEC;
19543 + case AuWbrCreate_MFSV:
19544 + case AuWbrCreate_PMFSV:
19545 + e = au_wbr_mfs_sec(&args[0], str, create);
19554 +const char *au_optstr_wbr_create(int wbr_create)
19556 + return au_parser_pattern(wbr_create, (void *)au_wbr_create_policy);
19559 +static match_table_t au_wbr_copyup_policy = {
19560 + {AuWbrCopyup_TDP, "tdp"},
19561 + {AuWbrCopyup_TDP, "top-down-parent"},
19562 + {AuWbrCopyup_BUP, "bup"},
19563 + {AuWbrCopyup_BUP, "bottom-up-parent"},
19564 + {AuWbrCopyup_BU, "bu"},
19565 + {AuWbrCopyup_BU, "bottom-up"},
19569 +static int noinline_for_stack au_wbr_copyup_val(char *str)
19571 + substring_t args[MAX_OPT_ARGS];
19573 + return match_token(str, au_wbr_copyup_policy, args);
19576 +const char *au_optstr_wbr_copyup(int wbr_copyup)
19578 + return au_parser_pattern(wbr_copyup, (void *)au_wbr_copyup_policy);
19581 +/* ---------------------------------------------------------------------- */
19583 +static const int lkup_dirflags = LOOKUP_FOLLOW | LOOKUP_DIRECTORY;
19585 +static void dump_opts(struct au_opts *opts)
19587 +#ifdef CONFIG_AUFS_DEBUG
19588 + /* reduce stack space */
19590 + struct au_opt_add *add;
19591 + struct au_opt_del *del;
19592 + struct au_opt_mod *mod;
19593 + struct au_opt_xino *xino;
19594 + struct au_opt_xino_itrunc *xino_itrunc;
19595 + struct au_opt_wbr_create *create;
19597 + struct au_opt *opt;
19600 + while (opt->type != Opt_tail) {
19601 + switch (opt->type) {
19603 + u.add = &opt->add;
19604 + AuDbg("add {b%d, %s, 0x%x, %p}\n",
19605 + u.add->bindex, u.add->pathname, u.add->perm,
19606 + u.add->path.dentry);
19610 + u.del = &opt->del;
19611 + AuDbg("del {%s, %p}\n",
19612 + u.del->pathname, u.del->h_path.dentry);
19616 + u.mod = &opt->mod;
19617 + AuDbg("mod {%s, 0x%x, %p}\n",
19618 + u.mod->path, u.mod->perm, u.mod->h_root);
19621 + u.add = &opt->add;
19622 + AuDbg("append {b%d, %s, 0x%x, %p}\n",
19623 + u.add->bindex, u.add->pathname, u.add->perm,
19624 + u.add->path.dentry);
19626 + case Opt_prepend:
19627 + u.add = &opt->add;
19628 + AuDbg("prepend {b%d, %s, 0x%x, %p}\n",
19629 + u.add->bindex, u.add->pathname, u.add->perm,
19630 + u.add->path.dentry);
19633 + AuDbg("dirwh %d\n", opt->dirwh);
19635 + case Opt_rdcache:
19636 + AuDbg("rdcache %d\n", opt->rdcache);
19639 + AuDbg("rdblk %u\n", opt->rdblk);
19641 + case Opt_rdblk_def:
19642 + AuDbg("rdblk_def\n");
19645 + AuDbg("rdhash %u\n", opt->rdhash);
19647 + case Opt_rdhash_def:
19648 + AuDbg("rdhash_def\n");
19651 + u.xino = &opt->xino;
19652 + AuDbg("xino {%s %.*s}\n",
19654 + AuDLNPair(u.xino->file->f_dentry));
19656 + case Opt_trunc_xino:
19657 + AuLabel(trunc_xino);
19659 + case Opt_notrunc_xino:
19660 + AuLabel(notrunc_xino);
19662 + case Opt_trunc_xino_path:
19663 + case Opt_itrunc_xino:
19664 + u.xino_itrunc = &opt->xino_itrunc;
19665 + AuDbg("trunc_xino %d\n", u.xino_itrunc->bindex);
19671 + case Opt_trunc_xib:
19672 + AuLabel(trunc_xib);
19674 + case Opt_notrunc_xib:
19675 + AuLabel(notrunc_xib);
19686 + case Opt_noplink:
19687 + AuLabel(noplink);
19689 + case Opt_list_plink:
19690 + AuLabel(list_plink);
19693 + AuDbg("udba %d, %s\n",
19694 + opt->udba, au_optstr_udba(opt->udba));
19702 + case Opt_diropq_a:
19703 + AuLabel(diropq_a);
19705 + case Opt_diropq_w:
19706 + AuLabel(diropq_w);
19708 + case Opt_warn_perm:
19709 + AuLabel(warn_perm);
19711 + case Opt_nowarn_perm:
19712 + AuLabel(nowarn_perm);
19717 + case Opt_norefrof:
19718 + AuLabel(norefrof);
19720 + case Opt_verbose:
19721 + AuLabel(verbose);
19723 + case Opt_noverbose:
19724 + AuLabel(noverbose);
19735 + case Opt_wbr_create:
19736 + u.create = &opt->wbr_create;
19737 + AuDbg("create %d, %s\n", u.create->wbr_create,
19738 + au_optstr_wbr_create(u.create->wbr_create));
19739 + switch (u.create->wbr_create) {
19740 + case AuWbrCreate_MFSV:
19741 + case AuWbrCreate_PMFSV:
19742 + AuDbg("%d sec\n", u.create->mfs_second);
19744 + case AuWbrCreate_MFSRR:
19745 + AuDbg("%llu watermark\n",
19746 + u.create->mfsrr_watermark);
19748 + case AuWbrCreate_MFSRRV:
19749 + AuDbg("%llu watermark, %d sec\n",
19750 + u.create->mfsrr_watermark,
19751 + u.create->mfs_second);
19755 + case Opt_wbr_copyup:
19756 + AuDbg("copyup %d, %s\n", opt->wbr_copyup,
19757 + au_optstr_wbr_copyup(opt->wbr_copyup));
19767 +void au_opts_free(struct au_opts *opts)
19769 + struct au_opt *opt;
19772 + while (opt->type != Opt_tail) {
19773 + switch (opt->type) {
19776 + case Opt_prepend:
19777 + path_put(&opt->add.path);
19781 + path_put(&opt->del.h_path);
19785 + dput(opt->mod.h_root);
19788 + fput(opt->xino.file);
19795 +static int opt_add(struct au_opt *opt, char *opt_str, unsigned long sb_flags,
19796 + aufs_bindex_t bindex)
19799 + struct au_opt_add *add = &opt->add;
19802 + add->bindex = bindex;
19803 + add->perm = AuBrPerm_RO;
19804 + add->pathname = opt_str;
19805 + p = strchr(opt_str, '=');
19809 + add->perm = br_perm_val(p);
19812 + err = vfsub_kern_path(add->pathname, lkup_dirflags, &add->path);
19815 + add->perm = AuBrPerm_RO;
19816 + if (au_test_fs_rr(add->path.dentry->d_sb))
19817 + add->perm = AuBrPerm_RR;
19818 + else if (!bindex && !(sb_flags & MS_RDONLY))
19819 + add->perm = AuBrPerm_RW;
19821 + opt->type = Opt_add;
19824 + pr_err("lookup failed %s (%d)\n", add->pathname, err);
19831 +static int au_opts_parse_del(struct au_opt_del *del, substring_t args[])
19835 + del->pathname = args[0].from;
19836 + AuDbg("del path %s\n", del->pathname);
19838 + err = vfsub_kern_path(del->pathname, lkup_dirflags, &del->h_path);
19839 + if (unlikely(err))
19840 + pr_err("lookup failed %s (%d)\n", del->pathname, err);
19845 +#if 0 /* reserved for future use */
19846 +static int au_opts_parse_idel(struct super_block *sb, aufs_bindex_t bindex,
19847 + struct au_opt_del *del, substring_t args[])
19850 + struct dentry *root;
19853 + root = sb->s_root;
19854 + aufs_read_lock(root, AuLock_FLUSH);
19855 + if (bindex < 0 || au_sbend(sb) < bindex) {
19856 + pr_err("out of bounds, %d\n", bindex);
19861 + del->h_path.dentry = dget(au_h_dptr(root, bindex));
19862 + del->h_path.mnt = mntget(au_sbr_mnt(sb, bindex));
19865 + aufs_read_unlock(root, !AuLock_IR);
19870 +static int noinline_for_stack
19871 +au_opts_parse_mod(struct au_opt_mod *mod, substring_t args[])
19874 + struct path path;
19878 + mod->path = args[0].from;
19879 + p = strchr(mod->path, '=');
19880 + if (unlikely(!p)) {
19881 + pr_err("no permssion %s\n", args[0].from);
19886 + err = vfsub_kern_path(mod->path, lkup_dirflags, &path);
19887 + if (unlikely(err)) {
19888 + pr_err("lookup failed %s (%d)\n", mod->path, err);
19892 + mod->perm = br_perm_val(p);
19893 + AuDbg("mod path %s, perm 0x%x, %s\n", mod->path, mod->perm, p);
19894 + mod->h_root = dget(path.dentry);
19901 +#if 0 /* reserved for future use */
19902 +static int au_opts_parse_imod(struct super_block *sb, aufs_bindex_t bindex,
19903 + struct au_opt_mod *mod, substring_t args[])
19906 + struct dentry *root;
19909 + root = sb->s_root;
19910 + aufs_read_lock(root, AuLock_FLUSH);
19911 + if (bindex < 0 || au_sbend(sb) < bindex) {
19912 + pr_err("out of bounds, %d\n", bindex);
19917 + mod->perm = br_perm_val(args[1].from);
19918 + AuDbg("mod path %s, perm 0x%x, %s\n",
19919 + mod->path, mod->perm, args[1].from);
19920 + mod->h_root = dget(au_h_dptr(root, bindex));
19923 + aufs_read_unlock(root, !AuLock_IR);
19928 +static int au_opts_parse_xino(struct super_block *sb, struct au_opt_xino *xino,
19929 + substring_t args[])
19932 + struct file *file;
19934 + file = au_xino_create(sb, args[0].from, /*silent*/0);
19935 + err = PTR_ERR(file);
19936 + if (IS_ERR(file))
19940 + if (unlikely(file->f_dentry->d_sb == sb)) {
19942 + pr_err("%s must be outside\n", args[0].from);
19947 + xino->file = file;
19948 + xino->path = args[0].from;
19954 +static int noinline_for_stack
19955 +au_opts_parse_xino_itrunc_path(struct super_block *sb,
19956 + struct au_opt_xino_itrunc *xino_itrunc,
19957 + substring_t args[])
19960 + aufs_bindex_t bend, bindex;
19961 + struct path path;
19962 + struct dentry *root;
19964 + err = vfsub_kern_path(args[0].from, lkup_dirflags, &path);
19965 + if (unlikely(err)) {
19966 + pr_err("lookup failed %s (%d)\n", args[0].from, err);
19970 + xino_itrunc->bindex = -1;
19971 + root = sb->s_root;
19972 + aufs_read_lock(root, AuLock_FLUSH);
19973 + bend = au_sbend(sb);
19974 + for (bindex = 0; bindex <= bend; bindex++) {
19975 + if (au_h_dptr(root, bindex) == path.dentry) {
19976 + xino_itrunc->bindex = bindex;
19980 + aufs_read_unlock(root, !AuLock_IR);
19983 + if (unlikely(xino_itrunc->bindex < 0)) {
19984 + pr_err("no such branch %s\n", args[0].from);
19992 +/* called without aufs lock */
19993 +int au_opts_parse(struct super_block *sb, char *str, struct au_opts *opts)
19995 + int err, n, token;
19996 + aufs_bindex_t bindex;
19997 + unsigned char skipped;
19998 + struct dentry *root;
19999 + struct au_opt *opt, *opt_tail;
20001 + /* reduce the stack space */
20003 + struct au_opt_xino_itrunc *xino_itrunc;
20004 + struct au_opt_wbr_create *create;
20007 + substring_t args[MAX_OPT_ARGS];
20011 + a = kmalloc(sizeof(*a), GFP_NOFS);
20012 + if (unlikely(!a))
20015 + root = sb->s_root;
20019 + opt_tail = opt + opts->max_opt - 1;
20020 + opt->type = Opt_tail;
20021 + while (!err && (opt_str = strsep(&str, ",")) && *opt_str) {
20024 + token = match_token(opt_str, options, a->args);
20028 + while (!err && (opt_str = strsep(&a->args[0].from, ":"))
20030 + err = opt_add(opt, opt_str, opts->sb_flags,
20032 + if (unlikely(!err && ++opt > opt_tail)) {
20036 + opt->type = Opt_tail;
20041 + if (unlikely(match_int(&a->args[0], &n))) {
20042 + pr_err("bad integer in %s\n", opt_str);
20046 + err = opt_add(opt, a->args[1].from, opts->sb_flags,
20049 + opt->type = token;
20052 + err = opt_add(opt, a->args[0].from, opts->sb_flags,
20053 + /*dummy bindex*/1);
20055 + opt->type = token;
20057 + case Opt_prepend:
20058 + err = opt_add(opt, a->args[0].from, opts->sb_flags,
20061 + opt->type = token;
20064 + err = au_opts_parse_del(&opt->del, a->args);
20066 + opt->type = token;
20068 +#if 0 /* reserved for future use */
20070 + del->pathname = "(indexed)";
20071 + if (unlikely(match_int(&args[0], &n))) {
20072 + pr_err("bad integer in %s\n", opt_str);
20075 + err = au_opts_parse_idel(sb, n, &opt->del, a->args);
20077 + opt->type = token;
20081 + err = au_opts_parse_mod(&opt->mod, a->args);
20083 + opt->type = token;
20085 +#ifdef IMOD /* reserved for future use */
20087 + u.mod->path = "(indexed)";
20088 + if (unlikely(match_int(&a->args[0], &n))) {
20089 + pr_err("bad integer in %s\n", opt_str);
20092 + err = au_opts_parse_imod(sb, n, &opt->mod, a->args);
20094 + opt->type = token;
20098 + err = au_opts_parse_xino(sb, &opt->xino, a->args);
20100 + opt->type = token;
20103 + case Opt_trunc_xino_path:
20104 + err = au_opts_parse_xino_itrunc_path
20105 + (sb, &opt->xino_itrunc, a->args);
20107 + opt->type = token;
20110 + case Opt_itrunc_xino:
20111 + u.xino_itrunc = &opt->xino_itrunc;
20112 + if (unlikely(match_int(&a->args[0], &n))) {
20113 + pr_err("bad integer in %s\n", opt_str);
20116 + u.xino_itrunc->bindex = n;
20117 + aufs_read_lock(root, AuLock_FLUSH);
20118 + if (n < 0 || au_sbend(sb) < n) {
20119 + pr_err("out of bounds, %d\n", n);
20120 + aufs_read_unlock(root, !AuLock_IR);
20123 + aufs_read_unlock(root, !AuLock_IR);
20125 + opt->type = token;
20129 + if (unlikely(match_int(&a->args[0], &opt->dirwh)))
20132 + opt->type = token;
20135 + case Opt_rdcache:
20136 + if (unlikely(match_int(&a->args[0], &n))) {
20137 + pr_err("bad integer in %s\n", opt_str);
20140 + if (unlikely(n > AUFS_RDCACHE_MAX)) {
20141 + pr_err("rdcache must be smaller than %d\n",
20142 + AUFS_RDCACHE_MAX);
20145 + opt->rdcache = n;
20147 + opt->type = token;
20150 + if (unlikely(match_int(&a->args[0], &n)
20152 + || n > KMALLOC_MAX_SIZE)) {
20153 + pr_err("bad integer in %s\n", opt_str);
20156 + if (unlikely(n && n < NAME_MAX)) {
20157 + pr_err("rdblk must be larger than %d\n",
20163 + opt->type = token;
20166 + if (unlikely(match_int(&a->args[0], &n)
20168 + || n * sizeof(struct hlist_head)
20169 + > KMALLOC_MAX_SIZE)) {
20170 + pr_err("bad integer in %s\n", opt_str);
20175 + opt->type = token;
20178 + case Opt_trunc_xino:
20179 + case Opt_notrunc_xino:
20181 + case Opt_trunc_xib:
20182 + case Opt_notrunc_xib:
20186 + case Opt_noplink:
20187 + case Opt_list_plink:
20190 + case Opt_diropq_a:
20191 + case Opt_diropq_w:
20192 + case Opt_warn_perm:
20193 + case Opt_nowarn_perm:
20195 + case Opt_norefrof:
20196 + case Opt_verbose:
20197 + case Opt_noverbose:
20201 + case Opt_rdblk_def:
20202 + case Opt_rdhash_def:
20204 + opt->type = token;
20208 + opt->udba = udba_val(a->args[0].from);
20209 + if (opt->udba >= 0) {
20211 + opt->type = token;
20213 + pr_err("wrong value, %s\n", opt_str);
20216 + case Opt_wbr_create:
20217 + u.create = &opt->wbr_create;
20218 + u.create->wbr_create
20219 + = au_wbr_create_val(a->args[0].from, u.create);
20220 + if (u.create->wbr_create >= 0) {
20222 + opt->type = token;
20224 + pr_err("wrong value, %s\n", opt_str);
20226 + case Opt_wbr_copyup:
20227 + opt->wbr_copyup = au_wbr_copyup_val(a->args[0].from);
20228 + if (opt->wbr_copyup >= 0) {
20230 + opt->type = token;
20232 + pr_err("wrong value, %s\n", opt_str);
20236 + pr_warning("ignored %s\n", opt_str);
20238 + case Opt_ignore_silent:
20243 + pr_err("unknown option %s\n", opt_str);
20247 + if (!err && !skipped) {
20248 + if (unlikely(++opt > opt_tail)) {
20251 + opt->type = Opt_tail;
20254 + opt->type = Opt_tail;
20260 + if (unlikely(err))
20261 + au_opts_free(opts);
20267 +static int au_opt_wbr_create(struct super_block *sb,
20268 + struct au_opt_wbr_create *create)
20271 + struct au_sbinfo *sbinfo;
20273 + SiMustWriteLock(sb);
20275 + err = 1; /* handled */
20276 + sbinfo = au_sbi(sb);
20277 + if (sbinfo->si_wbr_create_ops->fin) {
20278 + err = sbinfo->si_wbr_create_ops->fin(sb);
20283 + sbinfo->si_wbr_create = create->wbr_create;
20284 + sbinfo->si_wbr_create_ops = au_wbr_create_ops + create->wbr_create;
20285 + switch (create->wbr_create) {
20286 + case AuWbrCreate_MFSRRV:
20287 + case AuWbrCreate_MFSRR:
20288 + sbinfo->si_wbr_mfs.mfsrr_watermark = create->mfsrr_watermark;
20290 + case AuWbrCreate_MFS:
20291 + case AuWbrCreate_MFSV:
20292 + case AuWbrCreate_PMFS:
20293 + case AuWbrCreate_PMFSV:
20294 + sbinfo->si_wbr_mfs.mfs_expire
20295 + = msecs_to_jiffies(create->mfs_second * MSEC_PER_SEC);
20299 + if (sbinfo->si_wbr_create_ops->init)
20300 + sbinfo->si_wbr_create_ops->init(sb); /* ignore */
20307 + * plus: processed without an error
20308 + * zero: unprocessed
20310 +static int au_opt_simple(struct super_block *sb, struct au_opt *opt,
20311 + struct au_opts *opts)
20314 + struct au_sbinfo *sbinfo;
20316 + SiMustWriteLock(sb);
20318 + err = 1; /* handled */
20319 + sbinfo = au_sbi(sb);
20320 + switch (opt->type) {
20322 + sbinfo->si_mntflags &= ~AuOptMask_UDBA;
20323 + sbinfo->si_mntflags |= opt->udba;
20324 + opts->given_udba |= opt->udba;
20328 + au_opt_set(sbinfo->si_mntflags, PLINK);
20330 + case Opt_noplink:
20331 + if (au_opt_test(sbinfo->si_mntflags, PLINK))
20332 + au_plink_put(sb, /*verbose*/1);
20333 + au_opt_clr(sbinfo->si_mntflags, PLINK);
20335 + case Opt_list_plink:
20336 + if (au_opt_test(sbinfo->si_mntflags, PLINK))
20337 + au_plink_list(sb);
20341 + au_opt_set(sbinfo->si_mntflags, DIO);
20342 + au_fset_opts(opts->flags, REFRESH_DYAOP);
20345 + au_opt_clr(sbinfo->si_mntflags, DIO);
20346 + au_fset_opts(opts->flags, REFRESH_DYAOP);
20349 + case Opt_diropq_a:
20350 + au_opt_set(sbinfo->si_mntflags, ALWAYS_DIROPQ);
20352 + case Opt_diropq_w:
20353 + au_opt_clr(sbinfo->si_mntflags, ALWAYS_DIROPQ);
20356 + case Opt_warn_perm:
20357 + au_opt_set(sbinfo->si_mntflags, WARN_PERM);
20359 + case Opt_nowarn_perm:
20360 + au_opt_clr(sbinfo->si_mntflags, WARN_PERM);
20364 + au_opt_set(sbinfo->si_mntflags, REFROF);
20366 + case Opt_norefrof:
20367 + au_opt_clr(sbinfo->si_mntflags, REFROF);
20370 + case Opt_verbose:
20371 + au_opt_set(sbinfo->si_mntflags, VERBOSE);
20373 + case Opt_noverbose:
20374 + au_opt_clr(sbinfo->si_mntflags, VERBOSE);
20378 + au_opt_set(sbinfo->si_mntflags, SUM);
20381 + au_opt_clr(sbinfo->si_mntflags, SUM);
20382 + au_opt_set(sbinfo->si_mntflags, SUM_W);
20384 + au_opt_clr(sbinfo->si_mntflags, SUM);
20385 + au_opt_clr(sbinfo->si_mntflags, SUM_W);
20388 + case Opt_wbr_create:
20389 + err = au_opt_wbr_create(sb, &opt->wbr_create);
20391 + case Opt_wbr_copyup:
20392 + sbinfo->si_wbr_copyup = opt->wbr_copyup;
20393 + sbinfo->si_wbr_copyup_ops = au_wbr_copyup_ops + opt->wbr_copyup;
20397 + sbinfo->si_dirwh = opt->dirwh;
20400 + case Opt_rdcache:
20401 + sbinfo->si_rdcache
20402 + = msecs_to_jiffies(opt->rdcache * MSEC_PER_SEC);
20405 + sbinfo->si_rdblk = opt->rdblk;
20407 + case Opt_rdblk_def:
20408 + sbinfo->si_rdblk = AUFS_RDBLK_DEF;
20411 + sbinfo->si_rdhash = opt->rdhash;
20413 + case Opt_rdhash_def:
20414 + sbinfo->si_rdhash = AUFS_RDHASH_DEF;
20418 + au_opt_set(sbinfo->si_mntflags, SHWH);
20421 + au_opt_clr(sbinfo->si_mntflags, SHWH);
20424 + case Opt_trunc_xino:
20425 + au_opt_set(sbinfo->si_mntflags, TRUNC_XINO);
20427 + case Opt_notrunc_xino:
20428 + au_opt_clr(sbinfo->si_mntflags, TRUNC_XINO);
20431 + case Opt_trunc_xino_path:
20432 + case Opt_itrunc_xino:
20433 + err = au_xino_trunc(sb, opt->xino_itrunc.bindex);
20438 + case Opt_trunc_xib:
20439 + au_fset_opts(opts->flags, TRUNC_XIB);
20441 + case Opt_notrunc_xib:
20442 + au_fclr_opts(opts->flags, TRUNC_XIB);
20454 + * returns tri-state.
20455 + * plus: processed without an error
20456 + * zero: unprocessed
20459 +static int au_opt_br(struct super_block *sb, struct au_opt *opt,
20460 + struct au_opts *opts)
20462 + int err, do_refresh;
20465 + switch (opt->type) {
20467 + opt->add.bindex = au_sbend(sb) + 1;
20468 + if (opt->add.bindex < 0)
20469 + opt->add.bindex = 0;
20471 + case Opt_prepend:
20472 + opt->add.bindex = 0;
20475 + err = au_br_add(sb, &opt->add,
20476 + au_ftest_opts(opts->flags, REMOUNT));
20479 + au_fset_opts(opts->flags, REFRESH);
20485 + err = au_br_del(sb, &opt->del,
20486 + au_ftest_opts(opts->flags, REMOUNT));
20489 + au_fset_opts(opts->flags, TRUNC_XIB);
20490 + au_fset_opts(opts->flags, REFRESH);
20496 + err = au_br_mod(sb, &opt->mod,
20497 + au_ftest_opts(opts->flags, REMOUNT),
20502 + au_fset_opts(opts->flags, REFRESH);
20510 +static int au_opt_xino(struct super_block *sb, struct au_opt *opt,
20511 + struct au_opt_xino **opt_xino,
20512 + struct au_opts *opts)
20515 + aufs_bindex_t bend, bindex;
20516 + struct dentry *root, *parent, *h_root;
20519 + switch (opt->type) {
20521 + err = au_xino_set(sb, &opt->xino,
20522 + !!au_ftest_opts(opts->flags, REMOUNT));
20523 + if (unlikely(err))
20526 + *opt_xino = &opt->xino;
20527 + au_xino_brid_set(sb, -1);
20529 + /* safe d_parent access */
20530 + parent = opt->xino.file->f_dentry->d_parent;
20531 + root = sb->s_root;
20532 + bend = au_sbend(sb);
20533 + for (bindex = 0; bindex <= bend; bindex++) {
20534 + h_root = au_h_dptr(root, bindex);
20535 + if (h_root == parent) {
20536 + au_xino_brid_set(sb, au_sbr_id(sb, bindex));
20544 + au_xino_brid_set(sb, -1);
20545 + *opt_xino = (void *)-1;
20552 +int au_opts_verify(struct super_block *sb, unsigned long sb_flags,
20553 + unsigned int pending)
20556 + aufs_bindex_t bindex, bend;
20557 + unsigned char do_plink, skip, do_free;
20558 + struct au_branch *br;
20559 + struct au_wbr *wbr;
20560 + struct dentry *root;
20561 + struct inode *dir, *h_dir;
20562 + struct au_sbinfo *sbinfo;
20563 + struct au_hinode *hdir;
20565 + SiMustAnyLock(sb);
20567 + sbinfo = au_sbi(sb);
20568 + AuDebugOn(!(sbinfo->si_mntflags & AuOptMask_UDBA));
20570 + if (!(sb_flags & MS_RDONLY)) {
20571 + if (unlikely(!au_br_writable(au_sbr_perm(sb, 0))))
20572 + pr_warning("first branch should be rw\n");
20573 + if (unlikely(au_opt_test(sbinfo->si_mntflags, SHWH)))
20574 + pr_warning("shwh should be used with ro\n");
20577 + if (au_opt_test((sbinfo->si_mntflags | pending), UDBA_HNOTIFY)
20578 + && !au_opt_test(sbinfo->si_mntflags, XINO))
20579 + pr_warning("udba=*notify requires xino\n");
20582 + root = sb->s_root;
20583 + dir = root->d_inode;
20584 + do_plink = !!au_opt_test(sbinfo->si_mntflags, PLINK);
20585 + bend = au_sbend(sb);
20586 + for (bindex = 0; !err && bindex <= bend; bindex++) {
20588 + h_dir = au_h_iptr(dir, bindex);
20589 + br = au_sbr(sb, bindex);
20592 + wbr = br->br_wbr;
20594 + wbr_wh_read_lock(wbr);
20596 + if (!au_br_writable(br->br_perm)) {
20599 + || (!wbr->wbr_whbase
20600 + && !wbr->wbr_plink
20601 + && !wbr->wbr_orph));
20602 + } else if (!au_br_wh_linkable(br->br_perm)) {
20603 + /* skip = (!br->br_whbase && !br->br_orph); */
20604 + skip = (!wbr || !wbr->wbr_whbase);
20605 + if (skip && wbr) {
20607 + skip = !!wbr->wbr_plink;
20609 + skip = !wbr->wbr_plink;
20612 + /* skip = (br->br_whbase && br->br_ohph); */
20613 + skip = (wbr && wbr->wbr_whbase);
20616 + skip = !!wbr->wbr_plink;
20618 + skip = !wbr->wbr_plink;
20622 + wbr_wh_read_unlock(wbr);
20627 + hdir = au_hi(dir, bindex);
20628 + au_hn_imtx_lock_nested(hdir, AuLsc_I_PARENT);
20630 + wbr_wh_write_lock(wbr);
20631 + err = au_wh_init(au_h_dptr(root, bindex), br, sb);
20633 + wbr_wh_write_unlock(wbr);
20634 + au_hn_imtx_unlock(hdir);
20636 + if (!err && do_free) {
20638 + br->br_wbr = NULL;
20645 +int au_opts_mount(struct super_block *sb, struct au_opts *opts)
20648 + unsigned int tmp;
20649 + aufs_bindex_t bindex, bend;
20650 + struct au_opt *opt;
20651 + struct au_opt_xino *opt_xino, xino;
20652 + struct au_sbinfo *sbinfo;
20653 + struct au_branch *br;
20655 + SiMustWriteLock(sb);
20660 + while (err >= 0 && opt->type != Opt_tail)
20661 + err = au_opt_simple(sb, opt++, opts);
20664 + else if (unlikely(err < 0))
20667 + /* disable xino and udba temporary */
20668 + sbinfo = au_sbi(sb);
20669 + tmp = sbinfo->si_mntflags;
20670 + au_opt_clr(sbinfo->si_mntflags, XINO);
20671 + au_opt_set_udba(sbinfo->si_mntflags, UDBA_REVAL);
20674 + while (err >= 0 && opt->type != Opt_tail)
20675 + err = au_opt_br(sb, opt++, opts);
20678 + else if (unlikely(err < 0))
20681 + bend = au_sbend(sb);
20682 + if (unlikely(bend < 0)) {
20684 + pr_err("no branches\n");
20688 + if (au_opt_test(tmp, XINO))
20689 + au_opt_set(sbinfo->si_mntflags, XINO);
20691 + while (!err && opt->type != Opt_tail)
20692 + err = au_opt_xino(sb, opt++, &opt_xino, opts);
20693 + if (unlikely(err))
20696 + err = au_opts_verify(sb, sb->s_flags, tmp);
20697 + if (unlikely(err))
20700 + /* restore xino */
20701 + if (au_opt_test(tmp, XINO) && !opt_xino) {
20702 + xino.file = au_xino_def(sb);
20703 + err = PTR_ERR(xino.file);
20704 + if (IS_ERR(xino.file))
20707 + err = au_xino_set(sb, &xino, /*remount*/0);
20709 + if (unlikely(err))
20713 + /* restore udba */
20714 + tmp &= AuOptMask_UDBA;
20715 + sbinfo->si_mntflags &= ~AuOptMask_UDBA;
20716 + sbinfo->si_mntflags |= tmp;
20717 + bend = au_sbend(sb);
20718 + for (bindex = 0; bindex <= bend; bindex++) {
20719 + br = au_sbr(sb, bindex);
20720 + err = au_hnotify_reset_br(tmp, br, br->br_perm);
20721 + if (unlikely(err))
20722 + AuIOErr("hnotify failed on br %d, %d, ignored\n",
20724 + /* go on even if err */
20726 + if (au_opt_test(tmp, UDBA_HNOTIFY)) {
20727 + struct inode *dir = sb->s_root->d_inode;
20728 + au_hn_reset(dir, au_hi_flags(dir, /*isdir*/1) & ~AuHi_XINO);
20735 +int au_opts_remount(struct super_block *sb, struct au_opts *opts)
20738 + struct inode *dir;
20739 + struct au_opt_xino *opt_xino;
20740 + struct au_opt *opt;
20741 + struct au_sbinfo *sbinfo;
20743 + SiMustWriteLock(sb);
20745 + dir = sb->s_root->d_inode;
20746 + sbinfo = au_sbi(sb);
20750 + while (err >= 0 && opt->type != Opt_tail) {
20751 + err = au_opt_simple(sb, opt, opts);
20753 + err = au_opt_br(sb, opt, opts);
20755 + err = au_opt_xino(sb, opt, &opt_xino, opts);
20761 + /* go on even err */
20763 + rerr = au_opts_verify(sb, opts->sb_flags, /*pending*/0);
20764 + if (unlikely(rerr && !err))
20767 + if (au_ftest_opts(opts->flags, TRUNC_XIB)) {
20768 + rerr = au_xib_trunc(sb);
20769 + if (unlikely(rerr && !err))
20773 + /* will be handled by the caller */
20774 + if (!au_ftest_opts(opts->flags, REFRESH)
20775 + && (opts->given_udba || au_opt_test(sbinfo->si_mntflags, XINO)))
20776 + au_fset_opts(opts->flags, REFRESH);
20778 + AuDbg("status 0x%x\n", opts->flags);
20782 +/* ---------------------------------------------------------------------- */
20784 +unsigned int au_opt_udba(struct super_block *sb)
20786 + return au_mntflags(sb) & AuOptMask_UDBA;
20788 diff -urN /usr/share/empty/fs/aufs/opts.h linux/fs/aufs/opts.h
20789 --- /usr/share/empty/fs/aufs/opts.h 1970-01-01 01:00:00.000000000 +0100
20790 +++ linux/fs/aufs/opts.h 2012-02-13 21:54:56.973105100 +0100
20793 + * Copyright (C) 2005-2012 Junjiro R. Okajima
20795 + * This program, aufs is free software; you can redistribute it and/or modify
20796 + * it under the terms of the GNU General Public License as published by
20797 + * the Free Software Foundation; either version 2 of the License, or
20798 + * (at your option) any later version.
20800 + * This program is distributed in the hope that it will be useful,
20801 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
20802 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
20803 + * GNU General Public License for more details.
20805 + * You should have received a copy of the GNU General Public License
20806 + * along with this program; if not, write to the Free Software
20807 + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
20811 + * mount options/flags
20814 +#ifndef __AUFS_OPTS_H__
20815 +#define __AUFS_OPTS_H__
20819 +#include <linux/path.h>
20822 +struct super_block;
20824 +/* ---------------------------------------------------------------------- */
20827 +#define AuOpt_XINO 1 /* external inode number bitmap
20828 + and translation table */
20829 +#define AuOpt_TRUNC_XINO (1 << 1) /* truncate xino files */
20830 +#define AuOpt_UDBA_NONE (1 << 2) /* users direct branch access */
20831 +#define AuOpt_UDBA_REVAL (1 << 3)
20832 +#define AuOpt_UDBA_HNOTIFY (1 << 4)
20833 +#define AuOpt_SHWH (1 << 5) /* show whiteout */
20834 +#define AuOpt_PLINK (1 << 6) /* pseudo-link */
20835 +#define AuOpt_DIRPERM1 (1 << 7) /* unimplemented */
20836 +#define AuOpt_REFROF (1 << 8) /* unimplemented */
20837 +#define AuOpt_ALWAYS_DIROPQ (1 << 9) /* policy to creating diropq */
20838 +#define AuOpt_SUM (1 << 10) /* summation for statfs(2) */
20839 +#define AuOpt_SUM_W (1 << 11) /* unimplemented */
20840 +#define AuOpt_WARN_PERM (1 << 12) /* warn when add-branch */
20841 +#define AuOpt_VERBOSE (1 << 13) /* busy inode when del-branch */
20842 +#define AuOpt_DIO (1 << 14) /* direct io */
20844 +#ifndef CONFIG_AUFS_HNOTIFY
20845 +#undef AuOpt_UDBA_HNOTIFY
20846 +#define AuOpt_UDBA_HNOTIFY 0
20848 +#ifndef CONFIG_AUFS_SHWH
20850 +#define AuOpt_SHWH 0
20853 +#define AuOpt_Def (AuOpt_XINO \
20854 + | AuOpt_UDBA_REVAL \
20856 + /* | AuOpt_DIRPERM1 */ \
20857 + | AuOpt_WARN_PERM)
20858 +#define AuOptMask_UDBA (AuOpt_UDBA_NONE \
20859 + | AuOpt_UDBA_REVAL \
20860 + | AuOpt_UDBA_HNOTIFY)
20862 +#define au_opt_test(flags, name) (flags & AuOpt_##name)
20863 +#define au_opt_set(flags, name) do { \
20864 + BUILD_BUG_ON(AuOpt_##name & AuOptMask_UDBA); \
20865 + ((flags) |= AuOpt_##name); \
20867 +#define au_opt_set_udba(flags, name) do { \
20868 + (flags) &= ~AuOptMask_UDBA; \
20869 + ((flags) |= AuOpt_##name); \
20871 +#define au_opt_clr(flags, name) do { \
20872 + ((flags) &= ~AuOpt_##name); \
20875 +static inline unsigned int au_opts_plink(unsigned int mntflags)
20877 +#ifdef CONFIG_PROC_FS
20880 + return mntflags & ~AuOpt_PLINK;
20884 +/* ---------------------------------------------------------------------- */
20886 +/* policies to select one among multiple writable branches */
20888 + AuWbrCreate_TDP, /* top down parent */
20889 + AuWbrCreate_RR, /* round robin */
20890 + AuWbrCreate_MFS, /* most free space */
20891 + AuWbrCreate_MFSV, /* mfs with seconds */
20892 + AuWbrCreate_MFSRR, /* mfs then rr */
20893 + AuWbrCreate_MFSRRV, /* mfs then rr with seconds */
20894 + AuWbrCreate_PMFS, /* parent and mfs */
20895 + AuWbrCreate_PMFSV, /* parent and mfs with seconds */
20897 + AuWbrCreate_Def = AuWbrCreate_TDP
20901 + AuWbrCopyup_TDP, /* top down parent */
20902 + AuWbrCopyup_BUP, /* bottom up parent */
20903 + AuWbrCopyup_BU, /* bottom up */
20905 + AuWbrCopyup_Def = AuWbrCopyup_TDP
20908 +/* ---------------------------------------------------------------------- */
20910 +struct au_opt_add {
20911 + aufs_bindex_t bindex;
20914 + struct path path;
20917 +struct au_opt_del {
20919 + struct path h_path;
20922 +struct au_opt_mod {
20925 + struct dentry *h_root;
20928 +struct au_opt_xino {
20930 + struct file *file;
20933 +struct au_opt_xino_itrunc {
20934 + aufs_bindex_t bindex;
20937 +struct au_opt_wbr_create {
20940 + unsigned long long mfsrr_watermark;
20946 + struct au_opt_xino xino;
20947 + struct au_opt_xino_itrunc xino_itrunc;
20948 + struct au_opt_add add;
20949 + struct au_opt_del del;
20950 + struct au_opt_mod mod;
20953 + unsigned int rdblk;
20954 + unsigned int rdhash;
20956 + struct au_opt_wbr_create wbr_create;
20962 +#define AuOpts_REMOUNT 1
20963 +#define AuOpts_REFRESH (1 << 1)
20964 +#define AuOpts_TRUNC_XIB (1 << 2)
20965 +#define AuOpts_REFRESH_DYAOP (1 << 3)
20966 +#define au_ftest_opts(flags, name) ((flags) & AuOpts_##name)
20967 +#define au_fset_opts(flags, name) \
20968 + do { (flags) |= AuOpts_##name; } while (0)
20969 +#define au_fclr_opts(flags, name) \
20970 + do { (flags) &= ~AuOpts_##name; } while (0)
20973 + struct au_opt *opt;
20976 + unsigned int given_udba;
20977 + unsigned int flags;
20978 + unsigned long sb_flags;
20981 +/* ---------------------------------------------------------------------- */
20983 +char *au_optstr_br_perm(int brperm);
20984 +const char *au_optstr_udba(int udba);
20985 +const char *au_optstr_wbr_copyup(int wbr_copyup);
20986 +const char *au_optstr_wbr_create(int wbr_create);
20988 +void au_opts_free(struct au_opts *opts);
20989 +int au_opts_parse(struct super_block *sb, char *str, struct au_opts *opts);
20990 +int au_opts_verify(struct super_block *sb, unsigned long sb_flags,
20991 + unsigned int pending);
20992 +int au_opts_mount(struct super_block *sb, struct au_opts *opts);
20993 +int au_opts_remount(struct super_block *sb, struct au_opts *opts);
20995 +unsigned int au_opt_udba(struct super_block *sb);
20997 +/* ---------------------------------------------------------------------- */
20999 +#endif /* __KERNEL__ */
21000 +#endif /* __AUFS_OPTS_H__ */
21001 diff -urN /usr/share/empty/fs/aufs/plink.c linux/fs/aufs/plink.c
21002 --- /usr/share/empty/fs/aufs/plink.c 1970-01-01 01:00:00.000000000 +0100
21003 +++ linux/fs/aufs/plink.c 2012-02-13 21:54:56.973105100 +0100
21006 + * Copyright (C) 2005-2012 Junjiro R. Okajima
21008 + * This program, aufs is free software; you can redistribute it and/or modify
21009 + * it under the terms of the GNU General Public License as published by
21010 + * the Free Software Foundation; either version 2 of the License, or
21011 + * (at your option) any later version.
21013 + * This program is distributed in the hope that it will be useful,
21014 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
21015 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
21016 + * GNU General Public License for more details.
21018 + * You should have received a copy of the GNU General Public License
21019 + * along with this program; if not, write to the Free Software
21020 + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
21030 + * the pseudo-link maintenance mode.
21031 + * during a user process maintains the pseudo-links,
21032 + * prohibit adding a new plink and branch manipulation.
21036 + * For entry functions which will handle plink, and i_mutex is already held
21038 + * They cannot wait and should return an error at once.
21039 + * Callers has to check the error.
21041 + * For entry functions which will handle plink, but i_mutex is not held
21043 + * They can wait the plink maintenance mode to finish.
21045 + * They behave like F_SETLK and F_SETLKW.
21046 + * If the caller never handle plink, then both flags are unnecessary.
21049 +int au_plink_maint(struct super_block *sb, int flags)
21053 + struct au_sbinfo *sbi;
21055 + SiMustAnyLock(sb);
21058 + if (!au_opt_test(au_mntflags(sb), PLINK))
21061 + sbi = au_sbi(sb);
21062 + pid = sbi->si_plink_maint_pid;
21063 + if (!pid || pid == current->pid)
21066 + /* todo: it highly depends upon /sbin/mount.aufs */
21068 + ppid = task_pid_vnr(rcu_dereference(current->real_parent));
21069 + rcu_read_unlock();
21073 + if (au_ftest_lock(flags, NOPLMW)) {
21074 + /* if there is no i_mutex lock in VFS, we don't need to wait */
21075 + /* AuDebugOn(!lockdep_depth(current)); */
21076 + while (sbi->si_plink_maint_pid) {
21077 + si_read_unlock(sb);
21078 + /* gave up wake_up_bit() */
21079 + wait_event(sbi->si_plink_wq, !sbi->si_plink_maint_pid);
21081 + if (au_ftest_lock(flags, FLUSH))
21082 + au_nwt_flush(&sbi->si_nowait);
21083 + si_noflush_read_lock(sb);
21085 + } else if (au_ftest_lock(flags, NOPLM)) {
21086 + AuDbg("ppid %d, pid %d\n", ppid, pid);
21094 +void au_plink_maint_leave(struct au_sbinfo *sbinfo)
21096 + spin_lock(&sbinfo->si_plink_maint_lock);
21097 + sbinfo->si_plink_maint_pid = 0;
21098 + spin_unlock(&sbinfo->si_plink_maint_lock);
21099 + wake_up_all(&sbinfo->si_plink_wq);
21102 +int au_plink_maint_enter(struct super_block *sb)
21105 + struct au_sbinfo *sbinfo;
21108 + sbinfo = au_sbi(sb);
21109 + /* make sure i am the only one in this fs */
21110 + si_write_lock(sb, AuLock_FLUSH);
21111 + if (au_opt_test(au_mntflags(sb), PLINK)) {
21112 + spin_lock(&sbinfo->si_plink_maint_lock);
21113 + if (!sbinfo->si_plink_maint_pid)
21114 + sbinfo->si_plink_maint_pid = current->pid;
21117 + spin_unlock(&sbinfo->si_plink_maint_lock);
21119 + si_write_unlock(sb);
21124 +/* ---------------------------------------------------------------------- */
21126 +struct pseudo_link {
21128 + struct list_head list;
21129 + struct rcu_head rcu;
21131 + struct inode *inode;
21134 +#ifdef CONFIG_AUFS_DEBUG
21135 +void au_plink_list(struct super_block *sb)
21137 + struct au_sbinfo *sbinfo;
21138 + struct list_head *plink_list;
21139 + struct pseudo_link *plink;
21141 + SiMustAnyLock(sb);
21143 + sbinfo = au_sbi(sb);
21144 + AuDebugOn(!au_opt_test(au_mntflags(sb), PLINK));
21145 + AuDebugOn(au_plink_maint(sb, AuLock_NOPLM));
21147 + plink_list = &sbinfo->si_plink.head;
21149 + list_for_each_entry_rcu(plink, plink_list, list)
21150 + AuDbg("%lu\n", plink->inode->i_ino);
21151 + rcu_read_unlock();
21155 +/* is the inode pseudo-linked? */
21156 +int au_plink_test(struct inode *inode)
21159 + struct au_sbinfo *sbinfo;
21160 + struct list_head *plink_list;
21161 + struct pseudo_link *plink;
21163 + sbinfo = au_sbi(inode->i_sb);
21164 + AuRwMustAnyLock(&sbinfo->si_rwsem);
21165 + AuDebugOn(!au_opt_test(au_mntflags(inode->i_sb), PLINK));
21166 + AuDebugOn(au_plink_maint(inode->i_sb, AuLock_NOPLM));
21169 + plink_list = &sbinfo->si_plink.head;
21171 + list_for_each_entry_rcu(plink, plink_list, list)
21172 + if (plink->inode == inode) {
21176 + rcu_read_unlock();
21180 +/* ---------------------------------------------------------------------- */
21183 + * generate a name for plink.
21184 + * the file will be stored under AUFS_WH_PLINKDIR.
21186 +/* 20 is max digits length of ulong 64 */
21187 +#define PLINK_NAME_LEN ((20 + 1) * 2)
21189 +static int plink_name(char *name, int len, struct inode *inode,
21190 + aufs_bindex_t bindex)
21193 + struct inode *h_inode;
21195 + h_inode = au_h_iptr(inode, bindex);
21196 + rlen = snprintf(name, len, "%lu.%lu", inode->i_ino, h_inode->i_ino);
21200 +struct au_do_plink_lkup_args {
21201 + struct dentry **errp;
21202 + struct qstr *tgtname;
21203 + struct dentry *h_parent;
21204 + struct au_branch *br;
21207 +static struct dentry *au_do_plink_lkup(struct qstr *tgtname,
21208 + struct dentry *h_parent,
21209 + struct au_branch *br)
21211 + struct dentry *h_dentry;
21212 + struct mutex *h_mtx;
21214 + h_mtx = &h_parent->d_inode->i_mutex;
21215 + mutex_lock_nested(h_mtx, AuLsc_I_CHILD2);
21216 + h_dentry = au_lkup_one(tgtname, h_parent, br, /*nd*/NULL);
21217 + mutex_unlock(h_mtx);
21221 +static void au_call_do_plink_lkup(void *args)
21223 + struct au_do_plink_lkup_args *a = args;
21224 + *a->errp = au_do_plink_lkup(a->tgtname, a->h_parent, a->br);
21227 +/* lookup the plink-ed @inode under the branch at @bindex */
21228 +struct dentry *au_plink_lkup(struct inode *inode, aufs_bindex_t bindex)
21230 + struct dentry *h_dentry, *h_parent;
21231 + struct au_branch *br;
21232 + struct inode *h_dir;
21234 + char a[PLINK_NAME_LEN];
21235 + struct qstr tgtname = {
21239 + AuDebugOn(au_plink_maint(inode->i_sb, AuLock_NOPLM));
21241 + br = au_sbr(inode->i_sb, bindex);
21242 + h_parent = br->br_wbr->wbr_plink;
21243 + h_dir = h_parent->d_inode;
21244 + tgtname.len = plink_name(a, sizeof(a), inode, bindex);
21246 + if (current_fsuid()) {
21247 + struct au_do_plink_lkup_args args = {
21248 + .errp = &h_dentry,
21249 + .tgtname = &tgtname,
21250 + .h_parent = h_parent,
21254 + wkq_err = au_wkq_wait(au_call_do_plink_lkup, &args);
21255 + if (unlikely(wkq_err))
21256 + h_dentry = ERR_PTR(wkq_err);
21258 + h_dentry = au_do_plink_lkup(&tgtname, h_parent, br);
21263 +/* create a pseudo-link */
21264 +static int do_whplink(struct qstr *tgt, struct dentry *h_parent,
21265 + struct dentry *h_dentry, struct au_branch *br)
21268 + struct path h_path = {
21269 + .mnt = br->br_mnt
21271 + struct inode *h_dir;
21273 + h_dir = h_parent->d_inode;
21274 + mutex_lock_nested(&h_dir->i_mutex, AuLsc_I_CHILD2);
21276 + h_path.dentry = au_lkup_one(tgt, h_parent, br, /*nd*/NULL);
21277 + err = PTR_ERR(h_path.dentry);
21278 + if (IS_ERR(h_path.dentry))
21282 + /* wh.plink dir is not monitored */
21283 + /* todo: is it really safe? */
21284 + if (h_path.dentry->d_inode
21285 + && h_path.dentry->d_inode != h_dentry->d_inode) {
21286 + err = vfsub_unlink(h_dir, &h_path, /*force*/0);
21287 + dput(h_path.dentry);
21288 + h_path.dentry = NULL;
21292 + if (!err && !h_path.dentry->d_inode)
21293 + err = vfsub_link(h_dentry, h_dir, &h_path);
21294 + dput(h_path.dentry);
21297 + mutex_unlock(&h_dir->i_mutex);
21301 +struct do_whplink_args {
21303 + struct qstr *tgt;
21304 + struct dentry *h_parent;
21305 + struct dentry *h_dentry;
21306 + struct au_branch *br;
21309 +static void call_do_whplink(void *args)
21311 + struct do_whplink_args *a = args;
21312 + *a->errp = do_whplink(a->tgt, a->h_parent, a->h_dentry, a->br);
21315 +static int whplink(struct dentry *h_dentry, struct inode *inode,
21316 + aufs_bindex_t bindex, struct au_branch *br)
21318 + int err, wkq_err;
21319 + struct au_wbr *wbr;
21320 + struct dentry *h_parent;
21321 + struct inode *h_dir;
21322 + char a[PLINK_NAME_LEN];
21323 + struct qstr tgtname = {
21327 + wbr = au_sbr(inode->i_sb, bindex)->br_wbr;
21328 + h_parent = wbr->wbr_plink;
21329 + h_dir = h_parent->d_inode;
21330 + tgtname.len = plink_name(a, sizeof(a), inode, bindex);
21332 + /* always superio. */
21333 + if (current_fsuid()) {
21334 + struct do_whplink_args args = {
21337 + .h_parent = h_parent,
21338 + .h_dentry = h_dentry,
21341 + wkq_err = au_wkq_wait(call_do_whplink, &args);
21342 + if (unlikely(wkq_err))
21345 + err = do_whplink(&tgtname, h_parent, h_dentry, br);
21350 +/* free a single plink */
21351 +static void do_put_plink(struct pseudo_link *plink, int do_del)
21354 + list_del(&plink->list);
21355 + iput(plink->inode);
21359 +static void do_put_plink_rcu(struct rcu_head *rcu)
21361 + struct pseudo_link *plink;
21363 + plink = container_of(rcu, struct pseudo_link, rcu);
21364 + iput(plink->inode);
21369 + * create a new pseudo-link for @h_dentry on @bindex.
21370 + * the linked inode is held in aufs @inode.
21372 +void au_plink_append(struct inode *inode, aufs_bindex_t bindex,
21373 + struct dentry *h_dentry)
21375 + struct super_block *sb;
21376 + struct au_sbinfo *sbinfo;
21377 + struct list_head *plink_list;
21378 + struct pseudo_link *plink, *tmp;
21379 + int found, err, cnt;
21381 + sb = inode->i_sb;
21382 + sbinfo = au_sbi(sb);
21383 + AuDebugOn(!au_opt_test(au_mntflags(sb), PLINK));
21384 + AuDebugOn(au_plink_maint(sb, AuLock_NOPLM));
21388 + plink_list = &sbinfo->si_plink.head;
21390 + list_for_each_entry_rcu(plink, plink_list, list) {
21392 + if (plink->inode == inode) {
21397 + rcu_read_unlock();
21401 + tmp = kmalloc(sizeof(*plink), GFP_NOFS);
21403 + tmp->inode = au_igrab(inode);
21409 + spin_lock(&sbinfo->si_plink.spin);
21410 + list_for_each_entry(plink, plink_list, list) {
21411 + if (plink->inode == inode) {
21417 + list_add_rcu(&tmp->list, plink_list);
21418 + spin_unlock(&sbinfo->si_plink.spin);
21421 + WARN_ONCE(cnt > AUFS_PLINK_WARN,
21422 + "unexpectedly many pseudo links, %d\n", cnt);
21423 + err = whplink(h_dentry, inode, bindex, au_sbr(sb, bindex));
21425 + do_put_plink(tmp, 0);
21430 + if (unlikely(err)) {
21431 + pr_warning("err %d, damaged pseudo link.\n", err);
21433 + au_spl_del_rcu(&tmp->list, &sbinfo->si_plink);
21434 + call_rcu(&tmp->rcu, do_put_plink_rcu);
21439 +/* free all plinks */
21440 +void au_plink_put(struct super_block *sb, int verbose)
21442 + struct au_sbinfo *sbinfo;
21443 + struct list_head *plink_list;
21444 + struct pseudo_link *plink, *tmp;
21446 + SiMustWriteLock(sb);
21448 + sbinfo = au_sbi(sb);
21449 + AuDebugOn(!au_opt_test(au_mntflags(sb), PLINK));
21450 + AuDebugOn(au_plink_maint(sb, AuLock_NOPLM));
21452 + plink_list = &sbinfo->si_plink.head;
21453 + /* no spin_lock since sbinfo is write-locked */
21454 + WARN(verbose && !list_empty(plink_list), "pseudo-link is not flushed");
21455 + list_for_each_entry_safe(plink, tmp, plink_list, list)
21456 + do_put_plink(plink, 0);
21457 + INIT_LIST_HEAD(plink_list);
21460 +void au_plink_clean(struct super_block *sb, int verbose)
21462 + struct dentry *root;
21464 + root = sb->s_root;
21465 + aufs_write_lock(root);
21466 + if (au_opt_test(au_mntflags(sb), PLINK))
21467 + au_plink_put(sb, verbose);
21468 + aufs_write_unlock(root);
21471 +/* free the plinks on a branch specified by @br_id */
21472 +void au_plink_half_refresh(struct super_block *sb, aufs_bindex_t br_id)
21474 + struct au_sbinfo *sbinfo;
21475 + struct list_head *plink_list;
21476 + struct pseudo_link *plink, *tmp;
21477 + struct inode *inode;
21478 + aufs_bindex_t bstart, bend, bindex;
21479 + unsigned char do_put;
21481 + SiMustWriteLock(sb);
21483 + sbinfo = au_sbi(sb);
21484 + AuDebugOn(!au_opt_test(au_mntflags(sb), PLINK));
21485 + AuDebugOn(au_plink_maint(sb, AuLock_NOPLM));
21487 + plink_list = &sbinfo->si_plink.head;
21488 + /* no spin_lock since sbinfo is write-locked */
21489 + list_for_each_entry_safe(plink, tmp, plink_list, list) {
21491 + inode = au_igrab(plink->inode);
21492 + ii_write_lock_child(inode);
21493 + bstart = au_ibstart(inode);
21494 + bend = au_ibend(inode);
21495 + if (bstart >= 0) {
21496 + for (bindex = bstart; bindex <= bend; bindex++) {
21497 + if (!au_h_iptr(inode, bindex)
21498 + || au_ii_br_id(inode, bindex) != br_id)
21500 + au_set_h_iptr(inode, bindex, NULL, 0);
21505 + do_put_plink(plink, 1);
21508 + for (bindex = bstart; bindex <= bend; bindex++)
21509 + if (au_h_iptr(inode, bindex)) {
21514 + do_put_plink(plink, 1);
21516 + ii_write_unlock(inode);
21520 diff -urN /usr/share/empty/fs/aufs/poll.c linux/fs/aufs/poll.c
21521 --- /usr/share/empty/fs/aufs/poll.c 1970-01-01 01:00:00.000000000 +0100
21522 +++ linux/fs/aufs/poll.c 2012-02-13 21:54:56.973105100 +0100
21525 + * Copyright (C) 2005-2012 Junjiro R. Okajima
21527 + * This program, aufs is free software; you can redistribute it and/or modify
21528 + * it under the terms of the GNU General Public License as published by
21529 + * the Free Software Foundation; either version 2 of the License, or
21530 + * (at your option) any later version.
21532 + * This program is distributed in the hope that it will be useful,
21533 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
21534 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
21535 + * GNU General Public License for more details.
21537 + * You should have received a copy of the GNU General Public License
21538 + * along with this program; if not, write to the Free Software
21539 + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
21544 + * There is only one filesystem which implements ->poll operation, currently.
21549 +unsigned int aufs_poll(struct file *file, poll_table *wait)
21551 + unsigned int mask;
21553 + struct file *h_file;
21554 + struct dentry *dentry;
21555 + struct super_block *sb;
21557 + /* We should pretend an error happened. */
21558 + mask = POLLERR /* | POLLIN | POLLOUT */;
21559 + dentry = file->f_dentry;
21560 + sb = dentry->d_sb;
21561 + si_read_lock(sb, AuLock_FLUSH | AuLock_NOPLMW);
21562 + err = au_reval_and_lock_fdi(file, au_reopen_nondir, /*wlock*/0);
21563 + if (unlikely(err))
21566 + /* it is not an error if h_file has no operation */
21567 + mask = DEFAULT_POLLMASK;
21568 + h_file = au_hf_top(file);
21569 + if (h_file->f_op && h_file->f_op->poll)
21570 + mask = h_file->f_op->poll(h_file, wait);
21572 + di_read_unlock(dentry, AuLock_IR);
21573 + fi_read_unlock(file);
21576 + si_read_unlock(sb);
21577 + AuTraceErr((int)mask);
21580 diff -urN /usr/share/empty/fs/aufs/procfs.c linux/fs/aufs/procfs.c
21581 --- /usr/share/empty/fs/aufs/procfs.c 1970-01-01 01:00:00.000000000 +0100
21582 +++ linux/fs/aufs/procfs.c 2012-02-13 21:54:56.973105100 +0100
21585 + * Copyright (C) 2010-2012 Junjiro R. Okajima
21587 + * This program, aufs is free software; you can redistribute it and/or modify
21588 + * it under the terms of the GNU General Public License as published by
21589 + * the Free Software Foundation; either version 2 of the License, or
21590 + * (at your option) any later version.
21592 + * This program is distributed in the hope that it will be useful,
21593 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
21594 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
21595 + * GNU General Public License for more details.
21597 + * You should have received a copy of the GNU General Public License
21598 + * along with this program; if not, write to the Free Software
21599 + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
21603 + * procfs interfaces
21606 +#include <linux/proc_fs.h>
21609 +static int au_procfs_plm_release(struct inode *inode, struct file *file)
21611 + struct au_sbinfo *sbinfo;
21613 + sbinfo = file->private_data;
21615 + au_plink_maint_leave(sbinfo);
21616 + kobject_put(&sbinfo->si_kobj);
21622 +static void au_procfs_plm_write_clean(struct file *file)
21624 + struct au_sbinfo *sbinfo;
21626 + sbinfo = file->private_data;
21628 + au_plink_clean(sbinfo->si_sb, /*verbose*/0);
21631 +static int au_procfs_plm_write_si(struct file *file, unsigned long id)
21634 + struct super_block *sb;
21635 + struct au_sbinfo *sbinfo;
21638 + if (unlikely(file->private_data))
21642 + /* don't use au_sbilist_lock() here */
21643 + spin_lock(&au_sbilist.spin);
21644 + list_for_each_entry(sbinfo, &au_sbilist.head, si_list)
21645 + if (id == sysaufs_si_id(sbinfo)) {
21646 + kobject_get(&sbinfo->si_kobj);
21647 + sb = sbinfo->si_sb;
21650 + spin_unlock(&au_sbilist.spin);
21653 + if (unlikely(!sb))
21656 + err = au_plink_maint_enter(sb);
21658 + /* keep kobject_get() */
21659 + file->private_data = sbinfo;
21661 + kobject_put(&sbinfo->si_kobj);
21667 + * Accept a valid "si=xxxx" only.
21668 + * Once it is accepted successfully, accept "clean" too.
21670 +static ssize_t au_procfs_plm_write(struct file *file, const char __user *ubuf,
21671 + size_t count, loff_t *ppos)
21674 + unsigned long id;
21675 + /* last newline is allowed */
21676 + char buf[3 + sizeof(unsigned long) * 2 + 1];
21679 + if (unlikely(!capable(CAP_SYS_ADMIN)))
21683 + if (unlikely(count > sizeof(buf)))
21686 + err = copy_from_user(buf, ubuf, count);
21687 + if (unlikely(err)) {
21694 + if (!strcmp("clean", buf)) {
21695 + au_procfs_plm_write_clean(file);
21696 + goto out_success;
21697 + } else if (unlikely(strncmp("si=", buf, 3)))
21700 + err = kstrtoul(buf + 3, 16, &id);
21701 + if (unlikely(err))
21704 + err = au_procfs_plm_write_si(file, id);
21705 + if (unlikely(err))
21709 + err = count; /* success */
21714 +static const struct file_operations au_procfs_plm_fop = {
21715 + .write = au_procfs_plm_write,
21716 + .release = au_procfs_plm_release,
21717 + .owner = THIS_MODULE
21720 +/* ---------------------------------------------------------------------- */
21722 +static struct proc_dir_entry *au_procfs_dir;
21724 +void au_procfs_fin(void)
21726 + remove_proc_entry(AUFS_PLINK_MAINT_NAME, au_procfs_dir);
21727 + remove_proc_entry(AUFS_PLINK_MAINT_DIR, NULL);
21730 +int __init au_procfs_init(void)
21733 + struct proc_dir_entry *entry;
21736 + au_procfs_dir = proc_mkdir(AUFS_PLINK_MAINT_DIR, NULL);
21737 + if (unlikely(!au_procfs_dir))
21740 + entry = proc_create(AUFS_PLINK_MAINT_NAME, S_IFREG | S_IWUSR,
21741 + au_procfs_dir, &au_procfs_plm_fop);
21742 + if (unlikely(!entry))
21746 + goto out; /* success */
21750 + remove_proc_entry(AUFS_PLINK_MAINT_DIR, NULL);
21754 diff -urN /usr/share/empty/fs/aufs/rdu.c linux/fs/aufs/rdu.c
21755 --- /usr/share/empty/fs/aufs/rdu.c 1970-01-01 01:00:00.000000000 +0100
21756 +++ linux/fs/aufs/rdu.c 2012-02-13 21:54:56.973105100 +0100
21759 + * Copyright (C) 2005-2012 Junjiro R. Okajima
21761 + * This program, aufs is free software; you can redistribute it and/or modify
21762 + * it under the terms of the GNU General Public License as published by
21763 + * the Free Software Foundation; either version 2 of the License, or
21764 + * (at your option) any later version.
21766 + * This program is distributed in the hope that it will be useful,
21767 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
21768 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
21769 + * GNU General Public License for more details.
21771 + * You should have received a copy of the GNU General Public License
21772 + * along with this program; if not, write to the Free Software
21773 + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
21777 + * readdir in userspace.
21780 +#include <linux/compat.h>
21781 +#include <linux/fs_stack.h>
21782 +#include <linux/security.h>
21785 +/* bits for struct aufs_rdu.flags */
21786 +#define AuRdu_CALLED 1
21787 +#define AuRdu_CONT (1 << 1)
21788 +#define AuRdu_FULL (1 << 2)
21789 +#define au_ftest_rdu(flags, name) ((flags) & AuRdu_##name)
21790 +#define au_fset_rdu(flags, name) \
21791 + do { (flags) |= AuRdu_##name; } while (0)
21792 +#define au_fclr_rdu(flags, name) \
21793 + do { (flags) &= ~AuRdu_##name; } while (0)
21795 +struct au_rdu_arg {
21796 + struct aufs_rdu *rdu;
21797 + union au_rdu_ent_ul ent;
21798 + unsigned long end;
21800 + struct super_block *sb;
21804 +static int au_rdu_fill(void *__arg, const char *name, int nlen,
21805 + loff_t offset, u64 h_ino, unsigned int d_type)
21808 + struct au_rdu_arg *arg = __arg;
21809 + struct aufs_rdu *rdu = arg->rdu;
21810 + struct au_rdu_ent ent;
21814 + au_fset_rdu(rdu->cookie.flags, CALLED);
21815 + len = au_rdu_len(nlen);
21816 + if (arg->ent.ul + len < arg->end) {
21818 + ent.bindex = rdu->cookie.bindex;
21819 + ent.type = d_type;
21821 + if (unlikely(nlen > AUFS_MAX_NAMELEN))
21822 + ent.type = DT_UNKNOWN;
21824 + /* unnecessary to support mmap_sem since this is a dir */
21826 + if (copy_to_user(arg->ent.e, &ent, sizeof(ent)))
21828 + if (copy_to_user(arg->ent.e->name, name, nlen))
21830 + /* the terminating NULL */
21831 + if (__put_user(0, arg->ent.e->name + nlen))
21834 + /* AuDbg("%p, %.*s\n", arg->ent.p, nlen, name); */
21835 + arg->ent.ul += len;
21839 + au_fset_rdu(rdu->cookie.flags, FULL);
21841 + rdu->tail = arg->ent;
21845 + /* AuTraceErr(err); */
21849 +static int au_rdu_do(struct file *h_file, struct au_rdu_arg *arg)
21853 + struct au_rdu_cookie *cookie = &arg->rdu->cookie;
21855 + offset = vfsub_llseek(h_file, cookie->h_pos, SEEK_SET);
21857 + if (unlikely(offset != cookie->h_pos))
21863 + au_fclr_rdu(cookie->flags, CALLED);
21865 + err = vfsub_readdir(h_file, au_rdu_fill, arg);
21869 + && au_ftest_rdu(cookie->flags, CALLED)
21870 + && !au_ftest_rdu(cookie->flags, FULL));
21871 + cookie->h_pos = h_file->f_pos;
21878 +static int au_rdu(struct file *file, struct aufs_rdu *rdu)
21881 + aufs_bindex_t bend;
21882 + struct au_rdu_arg arg;
21883 + struct dentry *dentry;
21884 + struct inode *inode;
21885 + struct file *h_file;
21886 + struct au_rdu_cookie *cookie = &rdu->cookie;
21888 + err = !access_ok(VERIFY_WRITE, rdu->ent.e, rdu->sz);
21889 + if (unlikely(err)) {
21895 + rdu->tail = rdu->ent;
21898 + arg.ent = rdu->ent;
21899 + arg.end = arg.ent.ul;
21900 + arg.end += rdu->sz;
21903 + if (unlikely(!file->f_op || !file->f_op->readdir))
21906 + err = security_file_permission(file, MAY_READ);
21908 + if (unlikely(err))
21911 + dentry = file->f_dentry;
21912 + inode = dentry->d_inode;
21914 + mutex_lock(&inode->i_mutex);
21916 + err = mutex_lock_killable(&inode->i_mutex);
21918 + if (unlikely(err))
21922 + arg.sb = inode->i_sb;
21923 + err = si_read_lock(arg.sb, AuLock_FLUSH | AuLock_NOPLM);
21924 + if (unlikely(err))
21926 + err = au_alive_dir(dentry);
21927 + if (unlikely(err))
21929 + /* todo: reval? */
21930 + fi_read_lock(file);
21933 + if (unlikely(au_ftest_rdu(cookie->flags, CONT)
21934 + && cookie->generation != au_figen(file)))
21939 + rdu->blk = au_sbi(arg.sb)->si_rdblk;
21941 + rdu->blk = au_dir_size(file, /*dentry*/NULL);
21943 + bend = au_fbstart(file);
21944 + if (cookie->bindex < bend)
21945 + cookie->bindex = bend;
21946 + bend = au_fbend_dir(file);
21947 + /* AuDbg("b%d, b%d\n", cookie->bindex, bend); */
21948 + for (; !err && cookie->bindex <= bend;
21949 + cookie->bindex++, cookie->h_pos = 0) {
21950 + h_file = au_hf_dir(file, cookie->bindex);
21954 + au_fclr_rdu(cookie->flags, FULL);
21955 + err = au_rdu_do(h_file, &arg);
21957 + if (unlikely(au_ftest_rdu(cookie->flags, FULL) || err))
21960 + AuDbg("rent %llu\n", rdu->rent);
21962 + if (!err && !au_ftest_rdu(cookie->flags, CONT)) {
21963 + rdu->shwh = !!au_opt_test(au_sbi(arg.sb)->si_mntflags, SHWH);
21964 + au_fset_rdu(cookie->flags, CONT);
21965 + cookie->generation = au_figen(file);
21968 + ii_read_lock_child(inode);
21969 + fsstack_copy_attr_atime(inode, au_h_iptr(inode, au_ibstart(inode)));
21970 + ii_read_unlock(inode);
21973 + fi_read_unlock(file);
21975 + si_read_unlock(arg.sb);
21977 + mutex_unlock(&inode->i_mutex);
21983 +static int au_rdu_ino(struct file *file, struct aufs_rdu *rdu)
21987 + unsigned long long nent;
21988 + union au_rdu_ent_ul *u;
21989 + struct au_rdu_ent ent;
21990 + struct super_block *sb;
21993 + nent = rdu->nent;
21995 + sb = file->f_dentry->d_sb;
21996 + si_read_lock(sb, AuLock_FLUSH);
21997 + while (nent-- > 0) {
21998 + /* unnecessary to support mmap_sem since this is a dir */
21999 + err = copy_from_user(&ent, u->e, sizeof(ent));
22001 + err = !access_ok(VERIFY_WRITE, &u->e->ino, sizeof(ino));
22002 + if (unlikely(err)) {
22008 + /* AuDbg("b%d, i%llu\n", ent.bindex, ent.ino); */
22010 + err = au_ino(sb, ent.bindex, ent.ino, ent.type, &ino);
22012 + err = au_wh_ino(sb, ent.bindex, ent.ino, ent.type,
22014 + if (unlikely(err)) {
22019 + err = __put_user(ino, &u->e->ino);
22020 + if (unlikely(err)) {
22025 + u->ul += au_rdu_len(ent.nlen);
22027 + si_read_unlock(sb);
22032 +/* ---------------------------------------------------------------------- */
22034 +static int au_rdu_verify(struct aufs_rdu *rdu)
22036 + AuDbg("rdu{%llu, %p, %u | %u | %llu, %u, %u | "
22037 + "%llu, b%d, 0x%x, g%u}\n",
22038 + rdu->sz, rdu->ent.e, rdu->verify[AufsCtlRduV_SZ],
22040 + rdu->rent, rdu->shwh, rdu->full,
22041 + rdu->cookie.h_pos, rdu->cookie.bindex, rdu->cookie.flags,
22042 + rdu->cookie.generation);
22044 + if (rdu->verify[AufsCtlRduV_SZ] == sizeof(*rdu))
22048 + rdu->verify[AufsCtlRduV_SZ], (unsigned int)sizeof(*rdu));
22052 +long au_rdu_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
22055 + struct aufs_rdu rdu;
22056 + void __user *p = (void __user *)arg;
22058 + err = copy_from_user(&rdu, p, sizeof(rdu));
22059 + if (unlikely(err)) {
22064 + err = au_rdu_verify(&rdu);
22065 + if (unlikely(err))
22069 + case AUFS_CTL_RDU:
22070 + err = au_rdu(file, &rdu);
22071 + if (unlikely(err))
22074 + e = copy_to_user(p, &rdu, sizeof(rdu));
22075 + if (unlikely(e)) {
22080 + case AUFS_CTL_RDU_INO:
22081 + err = au_rdu_ino(file, &rdu);
22085 + /* err = -ENOTTY; */
22094 +#ifdef CONFIG_COMPAT
22095 +long au_rdu_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
22098 + struct aufs_rdu rdu;
22099 + void __user *p = compat_ptr(arg);
22101 + /* todo: get_user()? */
22102 + err = copy_from_user(&rdu, p, sizeof(rdu));
22103 + if (unlikely(err)) {
22108 + rdu.ent.e = compat_ptr(rdu.ent.ul);
22109 + err = au_rdu_verify(&rdu);
22110 + if (unlikely(err))
22114 + case AUFS_CTL_RDU:
22115 + err = au_rdu(file, &rdu);
22116 + if (unlikely(err))
22119 + rdu.ent.ul = ptr_to_compat(rdu.ent.e);
22120 + rdu.tail.ul = ptr_to_compat(rdu.tail.e);
22121 + e = copy_to_user(p, &rdu, sizeof(rdu));
22122 + if (unlikely(e)) {
22127 + case AUFS_CTL_RDU_INO:
22128 + err = au_rdu_ino(file, &rdu);
22132 + /* err = -ENOTTY; */
22141 diff -urN /usr/share/empty/fs/aufs/rwsem.h linux/fs/aufs/rwsem.h
22142 --- /usr/share/empty/fs/aufs/rwsem.h 1970-01-01 01:00:00.000000000 +0100
22143 +++ linux/fs/aufs/rwsem.h 2012-02-13 21:54:56.973105100 +0100
22146 + * Copyright (C) 2005-2012 Junjiro R. Okajima
22148 + * This program, aufs is free software; you can redistribute it and/or modify
22149 + * it under the terms of the GNU General Public License as published by
22150 + * the Free Software Foundation; either version 2 of the License, or
22151 + * (at your option) any later version.
22153 + * This program is distributed in the hope that it will be useful,
22154 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
22155 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
22156 + * GNU General Public License for more details.
22158 + * You should have received a copy of the GNU General Public License
22159 + * along with this program; if not, write to the Free Software
22160 + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
22164 + * simple read-write semaphore wrappers
22167 +#ifndef __AUFS_RWSEM_H__
22168 +#define __AUFS_RWSEM_H__
22172 +#include "debug.h"
22175 + struct rw_semaphore rwsem;
22176 +#ifdef CONFIG_AUFS_DEBUG
22177 + /* just for debugging, not almighty counter */
22178 + atomic_t rcnt, wcnt;
22182 +#ifdef CONFIG_AUFS_DEBUG
22183 +#define AuDbgCntInit(rw) do { \
22184 + atomic_set(&(rw)->rcnt, 0); \
22185 + atomic_set(&(rw)->wcnt, 0); \
22186 + smp_mb(); /* atomic set */ \
22189 +#define AuDbgRcntInc(rw) atomic_inc(&(rw)->rcnt)
22190 +#define AuDbgRcntDec(rw) WARN_ON(atomic_dec_return(&(rw)->rcnt) < 0)
22191 +#define AuDbgWcntInc(rw) atomic_inc(&(rw)->wcnt)
22192 +#define AuDbgWcntDec(rw) WARN_ON(atomic_dec_return(&(rw)->wcnt) < 0)
22194 +#define AuDbgCntInit(rw) do {} while (0)
22195 +#define AuDbgRcntInc(rw) do {} while (0)
22196 +#define AuDbgRcntDec(rw) do {} while (0)
22197 +#define AuDbgWcntInc(rw) do {} while (0)
22198 +#define AuDbgWcntDec(rw) do {} while (0)
22199 +#endif /* CONFIG_AUFS_DEBUG */
22201 +/* to debug easier, do not make them inlined functions */
22202 +#define AuRwMustNoWaiters(rw) AuDebugOn(!list_empty(&(rw)->rwsem.wait_list))
22203 +/* rwsem_is_locked() is unusable */
22204 +#define AuRwMustReadLock(rw) AuDebugOn(atomic_read(&(rw)->rcnt) <= 0)
22205 +#define AuRwMustWriteLock(rw) AuDebugOn(atomic_read(&(rw)->wcnt) <= 0)
22206 +#define AuRwMustAnyLock(rw) AuDebugOn(atomic_read(&(rw)->rcnt) <= 0 \
22207 + && atomic_read(&(rw)->wcnt) <= 0)
22208 +#define AuRwDestroy(rw) AuDebugOn(atomic_read(&(rw)->rcnt) \
22209 + || atomic_read(&(rw)->wcnt))
22211 +#define au_rw_class(rw, key) lockdep_set_class(&(rw)->rwsem, key)
22213 +static inline void au_rw_init(struct au_rwsem *rw)
22215 + AuDbgCntInit(rw);
22216 + init_rwsem(&rw->rwsem);
22219 +static inline void au_rw_init_wlock(struct au_rwsem *rw)
22222 + down_write(&rw->rwsem);
22223 + AuDbgWcntInc(rw);
22226 +static inline void au_rw_init_wlock_nested(struct au_rwsem *rw,
22227 + unsigned int lsc)
22230 + down_write_nested(&rw->rwsem, lsc);
22231 + AuDbgWcntInc(rw);
22234 +static inline void au_rw_read_lock(struct au_rwsem *rw)
22236 + down_read(&rw->rwsem);
22237 + AuDbgRcntInc(rw);
22240 +static inline void au_rw_read_lock_nested(struct au_rwsem *rw, unsigned int lsc)
22242 + down_read_nested(&rw->rwsem, lsc);
22243 + AuDbgRcntInc(rw);
22246 +static inline void au_rw_read_unlock(struct au_rwsem *rw)
22248 + AuRwMustReadLock(rw);
22249 + AuDbgRcntDec(rw);
22250 + up_read(&rw->rwsem);
22253 +static inline void au_rw_dgrade_lock(struct au_rwsem *rw)
22255 + AuRwMustWriteLock(rw);
22256 + AuDbgRcntInc(rw);
22257 + AuDbgWcntDec(rw);
22258 + downgrade_write(&rw->rwsem);
22261 +static inline void au_rw_write_lock(struct au_rwsem *rw)
22263 + down_write(&rw->rwsem);
22264 + AuDbgWcntInc(rw);
22267 +static inline void au_rw_write_lock_nested(struct au_rwsem *rw,
22268 + unsigned int lsc)
22270 + down_write_nested(&rw->rwsem, lsc);
22271 + AuDbgWcntInc(rw);
22274 +static inline void au_rw_write_unlock(struct au_rwsem *rw)
22276 + AuRwMustWriteLock(rw);
22277 + AuDbgWcntDec(rw);
22278 + up_write(&rw->rwsem);
22281 +/* why is not _nested version defined */
22282 +static inline int au_rw_read_trylock(struct au_rwsem *rw)
22284 + int ret = down_read_trylock(&rw->rwsem);
22286 + AuDbgRcntInc(rw);
22290 +static inline int au_rw_write_trylock(struct au_rwsem *rw)
22292 + int ret = down_write_trylock(&rw->rwsem);
22294 + AuDbgWcntInc(rw);
22298 +#undef AuDbgCntInit
22299 +#undef AuDbgRcntInc
22300 +#undef AuDbgRcntDec
22301 +#undef AuDbgWcntInc
22302 +#undef AuDbgWcntDec
22304 +#define AuSimpleLockRwsemFuncs(prefix, param, rwsem) \
22305 +static inline void prefix##_read_lock(param) \
22306 +{ au_rw_read_lock(rwsem); } \
22307 +static inline void prefix##_write_lock(param) \
22308 +{ au_rw_write_lock(rwsem); } \
22309 +static inline int prefix##_read_trylock(param) \
22310 +{ return au_rw_read_trylock(rwsem); } \
22311 +static inline int prefix##_write_trylock(param) \
22312 +{ return au_rw_write_trylock(rwsem); }
22313 +/* why is not _nested version defined */
22314 +/* static inline void prefix##_read_trylock_nested(param, lsc)
22315 +{ au_rw_read_trylock_nested(rwsem, lsc)); }
22316 +static inline void prefix##_write_trylock_nestd(param, lsc)
22317 +{ au_rw_write_trylock_nested(rwsem, lsc); } */
22319 +#define AuSimpleUnlockRwsemFuncs(prefix, param, rwsem) \
22320 +static inline void prefix##_read_unlock(param) \
22321 +{ au_rw_read_unlock(rwsem); } \
22322 +static inline void prefix##_write_unlock(param) \
22323 +{ au_rw_write_unlock(rwsem); } \
22324 +static inline void prefix##_downgrade_lock(param) \
22325 +{ au_rw_dgrade_lock(rwsem); }
22327 +#define AuSimpleRwsemFuncs(prefix, param, rwsem) \
22328 + AuSimpleLockRwsemFuncs(prefix, param, rwsem) \
22329 + AuSimpleUnlockRwsemFuncs(prefix, param, rwsem)
22331 +#endif /* __KERNEL__ */
22332 +#endif /* __AUFS_RWSEM_H__ */
22333 diff -urN /usr/share/empty/fs/aufs/sbinfo.c linux/fs/aufs/sbinfo.c
22334 --- /usr/share/empty/fs/aufs/sbinfo.c 1970-01-01 01:00:00.000000000 +0100
22335 +++ linux/fs/aufs/sbinfo.c 2012-02-13 21:54:56.973105100 +0100
22338 + * Copyright (C) 2005-2012 Junjiro R. Okajima
22340 + * This program, aufs is free software; you can redistribute it and/or modify
22341 + * it under the terms of the GNU General Public License as published by
22342 + * the Free Software Foundation; either version 2 of the License, or
22343 + * (at your option) any later version.
22345 + * This program is distributed in the hope that it will be useful,
22346 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
22347 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
22348 + * GNU General Public License for more details.
22350 + * You should have received a copy of the GNU General Public License
22351 + * along with this program; if not, write to the Free Software
22352 + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
22356 + * superblock private data
22362 + * they are necessary regardless sysfs is disabled.
22364 +void au_si_free(struct kobject *kobj)
22366 + struct au_sbinfo *sbinfo;
22367 + char *locked __maybe_unused; /* debug only */
22369 + sbinfo = container_of(kobj, struct au_sbinfo, si_kobj);
22370 + AuDebugOn(!list_empty(&sbinfo->si_plink.head));
22371 + AuDebugOn(atomic_read(&sbinfo->si_nowait.nw_len));
22373 + au_rw_write_lock(&sbinfo->si_rwsem);
22374 + au_br_free(sbinfo);
22375 + au_rw_write_unlock(&sbinfo->si_rwsem);
22377 + AuDebugOn(radix_tree_gang_lookup
22378 + (&sbinfo->au_si_pid.tree, (void **)&locked,
22379 + /*first_index*/PID_MAX_DEFAULT - 1,
22380 + /*max_items*/sizeof(locked)/sizeof(*locked)));
22382 + kfree(sbinfo->si_branch);
22383 + kfree(sbinfo->au_si_pid.bitmap);
22384 + mutex_destroy(&sbinfo->si_xib_mtx);
22385 + AuRwDestroy(&sbinfo->si_rwsem);
22390 +int au_si_alloc(struct super_block *sb)
22393 + struct au_sbinfo *sbinfo;
22394 + static struct lock_class_key aufs_si;
22397 + sbinfo = kzalloc(sizeof(*sbinfo), GFP_NOFS);
22398 + if (unlikely(!sbinfo))
22401 + BUILD_BUG_ON(sizeof(unsigned long) !=
22402 + sizeof(*sbinfo->au_si_pid.bitmap));
22403 + sbinfo->au_si_pid.bitmap = kcalloc(BITS_TO_LONGS(PID_MAX_DEFAULT),
22404 + sizeof(*sbinfo->au_si_pid.bitmap),
22406 + if (unlikely(!sbinfo->au_si_pid.bitmap))
22409 + /* will be reallocated separately */
22410 + sbinfo->si_branch = kzalloc(sizeof(*sbinfo->si_branch), GFP_NOFS);
22411 + if (unlikely(!sbinfo->si_branch))
22414 + err = sysaufs_si_init(sbinfo);
22415 + if (unlikely(err))
22418 + au_nwt_init(&sbinfo->si_nowait);
22419 + au_rw_init_wlock(&sbinfo->si_rwsem);
22420 + au_rw_class(&sbinfo->si_rwsem, &aufs_si);
22421 + spin_lock_init(&sbinfo->au_si_pid.tree_lock);
22422 + INIT_RADIX_TREE(&sbinfo->au_si_pid.tree, GFP_ATOMIC | __GFP_NOFAIL);
22424 + atomic_long_set(&sbinfo->si_ninodes, 0);
22425 + atomic_long_set(&sbinfo->si_nfiles, 0);
22427 + sbinfo->si_bend = -1;
22429 + sbinfo->si_wbr_copyup = AuWbrCopyup_Def;
22430 + sbinfo->si_wbr_create = AuWbrCreate_Def;
22431 + sbinfo->si_wbr_copyup_ops = au_wbr_copyup_ops + sbinfo->si_wbr_copyup;
22432 + sbinfo->si_wbr_create_ops = au_wbr_create_ops + sbinfo->si_wbr_create;
22434 + sbinfo->si_mntflags = au_opts_plink(AuOpt_Def);
22436 + mutex_init(&sbinfo->si_xib_mtx);
22437 + sbinfo->si_xino_brid = -1;
22438 + /* leave si_xib_last_pindex and si_xib_next_bit */
22440 + sbinfo->si_rdcache = msecs_to_jiffies(AUFS_RDCACHE_DEF * MSEC_PER_SEC);
22441 + sbinfo->si_rdblk = AUFS_RDBLK_DEF;
22442 + sbinfo->si_rdhash = AUFS_RDHASH_DEF;
22443 + sbinfo->si_dirwh = AUFS_DIRWH_DEF;
22445 + au_spl_init(&sbinfo->si_plink);
22446 + init_waitqueue_head(&sbinfo->si_plink_wq);
22447 + spin_lock_init(&sbinfo->si_plink_maint_lock);
22449 + /* leave other members for sysaufs and si_mnt. */
22450 + sbinfo->si_sb = sb;
22451 + sb->s_fs_info = sbinfo;
22453 + au_debug_sbinfo_init(sbinfo);
22454 + return 0; /* success */
22457 + kfree(sbinfo->si_branch);
22459 + kfree(sbinfo->au_si_pid.bitmap);
22466 +int au_sbr_realloc(struct au_sbinfo *sbinfo, int nbr)
22469 + struct au_branch **brp;
22471 + AuRwMustWriteLock(&sbinfo->si_rwsem);
22474 + sz = sizeof(*brp) * (sbinfo->si_bend + 1);
22475 + if (unlikely(!sz))
22476 + sz = sizeof(*brp);
22477 + brp = au_kzrealloc(sbinfo->si_branch, sz, sizeof(*brp) * nbr, GFP_NOFS);
22479 + sbinfo->si_branch = brp;
22486 +/* ---------------------------------------------------------------------- */
22488 +unsigned int au_sigen_inc(struct super_block *sb)
22490 + unsigned int gen;
22492 + SiMustWriteLock(sb);
22494 + gen = ++au_sbi(sb)->si_generation;
22495 + au_update_digen(sb->s_root);
22496 + au_update_iigen(sb->s_root->d_inode);
22497 + sb->s_root->d_inode->i_version++;
22501 +aufs_bindex_t au_new_br_id(struct super_block *sb)
22503 + aufs_bindex_t br_id;
22505 + struct au_sbinfo *sbinfo;
22507 + SiMustWriteLock(sb);
22509 + sbinfo = au_sbi(sb);
22510 + for (i = 0; i <= AUFS_BRANCH_MAX; i++) {
22511 + br_id = ++sbinfo->si_last_br_id;
22512 + AuDebugOn(br_id < 0);
22513 + if (br_id && au_br_index(sb, br_id) < 0)
22520 +/* ---------------------------------------------------------------------- */
22522 +/* it is ok that new 'nwt' tasks are appended while we are sleeping */
22523 +int si_read_lock(struct super_block *sb, int flags)
22528 + if (au_ftest_lock(flags, FLUSH))
22529 + au_nwt_flush(&au_sbi(sb)->si_nowait);
22531 + si_noflush_read_lock(sb);
22532 + err = au_plink_maint(sb, flags);
22533 + if (unlikely(err))
22534 + si_read_unlock(sb);
22539 +int si_write_lock(struct super_block *sb, int flags)
22543 + if (au_ftest_lock(flags, FLUSH))
22544 + au_nwt_flush(&au_sbi(sb)->si_nowait);
22546 + si_noflush_write_lock(sb);
22547 + err = au_plink_maint(sb, flags);
22548 + if (unlikely(err))
22549 + si_write_unlock(sb);
22554 +/* dentry and super_block lock. call at entry point */
22555 +int aufs_read_lock(struct dentry *dentry, int flags)
22558 + struct super_block *sb;
22560 + sb = dentry->d_sb;
22561 + err = si_read_lock(sb, flags);
22562 + if (unlikely(err))
22565 + if (au_ftest_lock(flags, DW))
22566 + di_write_lock_child(dentry);
22568 + di_read_lock_child(dentry, flags);
22570 + if (au_ftest_lock(flags, GEN)) {
22571 + err = au_digen_test(dentry, au_sigen(sb));
22572 + AuDebugOn(!err && au_dbrange_test(dentry));
22573 + if (unlikely(err))
22574 + aufs_read_unlock(dentry, flags);
22581 +void aufs_read_unlock(struct dentry *dentry, int flags)
22583 + if (au_ftest_lock(flags, DW))
22584 + di_write_unlock(dentry);
22586 + di_read_unlock(dentry, flags);
22587 + si_read_unlock(dentry->d_sb);
22590 +void aufs_write_lock(struct dentry *dentry)
22592 + si_write_lock(dentry->d_sb, AuLock_FLUSH | AuLock_NOPLMW);
22593 + di_write_lock_child(dentry);
22596 +void aufs_write_unlock(struct dentry *dentry)
22598 + di_write_unlock(dentry);
22599 + si_write_unlock(dentry->d_sb);
22602 +int aufs_read_and_write_lock2(struct dentry *d1, struct dentry *d2, int flags)
22605 + unsigned int sigen;
22606 + struct super_block *sb;
22609 + err = si_read_lock(sb, flags);
22610 + if (unlikely(err))
22613 + di_write_lock2_child(d1, d2, au_ftest_lock(flags, DIR));
22615 + if (au_ftest_lock(flags, GEN)) {
22616 + sigen = au_sigen(sb);
22617 + err = au_digen_test(d1, sigen);
22618 + AuDebugOn(!err && au_dbrange_test(d1));
22620 + err = au_digen_test(d2, sigen);
22621 + AuDebugOn(!err && au_dbrange_test(d2));
22623 + if (unlikely(err))
22624 + aufs_read_and_write_unlock2(d1, d2);
22631 +void aufs_read_and_write_unlock2(struct dentry *d1, struct dentry *d2)
22633 + di_write_unlock2(d1, d2);
22634 + si_read_unlock(d1->d_sb);
22637 +/* ---------------------------------------------------------------------- */
22639 +int si_pid_test_slow(struct super_block *sb)
22644 + p = radix_tree_lookup(&au_sbi(sb)->au_si_pid.tree, current->pid);
22645 + rcu_read_unlock();
22647 + return (long)!!p;
22650 +void si_pid_set_slow(struct super_block *sb)
22653 + struct au_sbinfo *sbinfo;
22655 + AuDebugOn(si_pid_test_slow(sb));
22657 + sbinfo = au_sbi(sb);
22658 + err = radix_tree_preload(GFP_NOFS | __GFP_NOFAIL);
22660 + spin_lock(&sbinfo->au_si_pid.tree_lock);
22661 + err = radix_tree_insert(&sbinfo->au_si_pid.tree, current->pid,
22662 + /*any valid ptr*/sb);
22663 + spin_unlock(&sbinfo->au_si_pid.tree_lock);
22665 + radix_tree_preload_end();
22668 +void si_pid_clr_slow(struct super_block *sb)
22671 + struct au_sbinfo *sbinfo;
22673 + AuDebugOn(!si_pid_test_slow(sb));
22675 + sbinfo = au_sbi(sb);
22676 + spin_lock(&sbinfo->au_si_pid.tree_lock);
22677 + p = radix_tree_delete(&sbinfo->au_si_pid.tree, current->pid);
22678 + spin_unlock(&sbinfo->au_si_pid.tree_lock);
22680 diff -urN /usr/share/empty/fs/aufs/spl.h linux/fs/aufs/spl.h
22681 --- /usr/share/empty/fs/aufs/spl.h 1970-01-01 01:00:00.000000000 +0100
22682 +++ linux/fs/aufs/spl.h 2012-02-13 21:54:56.973105100 +0100
22685 + * Copyright (C) 2005-2012 Junjiro R. Okajima
22687 + * This program, aufs is free software; you can redistribute it and/or modify
22688 + * it under the terms of the GNU General Public License as published by
22689 + * the Free Software Foundation; either version 2 of the License, or
22690 + * (at your option) any later version.
22692 + * This program is distributed in the hope that it will be useful,
22693 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
22694 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
22695 + * GNU General Public License for more details.
22697 + * You should have received a copy of the GNU General Public License
22698 + * along with this program; if not, write to the Free Software
22699 + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
22703 + * simple list protected by a spinlock
22706 +#ifndef __AUFS_SPL_H__
22707 +#define __AUFS_SPL_H__
22711 +struct au_splhead {
22713 + struct list_head head;
22716 +static inline void au_spl_init(struct au_splhead *spl)
22718 + spin_lock_init(&spl->spin);
22719 + INIT_LIST_HEAD(&spl->head);
22722 +static inline void au_spl_add(struct list_head *list, struct au_splhead *spl)
22724 + spin_lock(&spl->spin);
22725 + list_add(list, &spl->head);
22726 + spin_unlock(&spl->spin);
22729 +static inline void au_spl_del(struct list_head *list, struct au_splhead *spl)
22731 + spin_lock(&spl->spin);
22733 + spin_unlock(&spl->spin);
22736 +static inline void au_spl_del_rcu(struct list_head *list,
22737 + struct au_splhead *spl)
22739 + spin_lock(&spl->spin);
22740 + list_del_rcu(list);
22741 + spin_unlock(&spl->spin);
22744 +#endif /* __KERNEL__ */
22745 +#endif /* __AUFS_SPL_H__ */
22746 diff -urN /usr/share/empty/fs/aufs/super.c linux/fs/aufs/super.c
22747 --- /usr/share/empty/fs/aufs/super.c 1970-01-01 01:00:00.000000000 +0100
22748 +++ linux/fs/aufs/super.c 2012-02-13 21:54:56.973105100 +0100
22751 + * Copyright (C) 2005-2012 Junjiro R. Okajima
22753 + * This program, aufs is free software; you can redistribute it and/or modify
22754 + * it under the terms of the GNU General Public License as published by
22755 + * the Free Software Foundation; either version 2 of the License, or
22756 + * (at your option) any later version.
22758 + * This program is distributed in the hope that it will be useful,
22759 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
22760 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
22761 + * GNU General Public License for more details.
22763 + * You should have received a copy of the GNU General Public License
22764 + * along with this program; if not, write to the Free Software
22765 + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
22769 + * mount and super_block operations
22772 +#include <linux/mm.h>
22773 +#include <linux/module.h>
22774 +#include <linux/seq_file.h>
22775 +#include <linux/statfs.h>
22776 +#include <linux/vmalloc.h>
22777 +#include <linux/writeback.h>
22781 + * super_operations
22783 +static struct inode *aufs_alloc_inode(struct super_block *sb __maybe_unused)
22785 + struct au_icntnr *c;
22787 + c = au_cache_alloc_icntnr();
22789 + au_icntnr_init(c);
22790 + c->vfs_inode.i_version = 1; /* sigen(sb); */
22791 + c->iinfo.ii_hinode = NULL;
22792 + return &c->vfs_inode;
22797 +static void aufs_destroy_inode_cb(struct rcu_head *head)
22799 + struct inode *inode = container_of(head, struct inode, i_rcu);
22801 + INIT_LIST_HEAD(&inode->i_dentry);
22802 + au_cache_free_icntnr(container_of(inode, struct au_icntnr, vfs_inode));
22805 +static void aufs_destroy_inode(struct inode *inode)
22807 + au_iinfo_fin(inode);
22808 + call_rcu(&inode->i_rcu, aufs_destroy_inode_cb);
22811 +struct inode *au_iget_locked(struct super_block *sb, ino_t ino)
22813 + struct inode *inode;
22816 + inode = iget_locked(sb, ino);
22817 + if (unlikely(!inode)) {
22818 + inode = ERR_PTR(-ENOMEM);
22821 + if (!(inode->i_state & I_NEW))
22824 + err = au_xigen_new(inode);
22826 + err = au_iinfo_init(inode);
22828 + inode->i_version++;
22830 + iget_failed(inode);
22831 + inode = ERR_PTR(err);
22835 + /* never return NULL */
22836 + AuDebugOn(!inode);
22837 + AuTraceErrPtr(inode);
22841 +/* lock free root dinfo */
22842 +static int au_show_brs(struct seq_file *seq, struct super_block *sb)
22845 + aufs_bindex_t bindex, bend;
22846 + struct path path;
22847 + struct au_hdentry *hdp;
22848 + struct au_branch *br;
22852 + bend = au_sbend(sb);
22853 + hdp = au_di(sb->s_root)->di_hdentry;
22854 + for (bindex = 0; !err && bindex <= bend; bindex++) {
22855 + br = au_sbr(sb, bindex);
22856 + path.mnt = br->br_mnt;
22857 + path.dentry = hdp[bindex].hd_dentry;
22858 + err = au_seq_path(seq, &path);
22860 + perm = au_optstr_br_perm(br->br_perm);
22862 + err = seq_printf(seq, "=%s", perm);
22869 + if (!err && bindex != bend)
22870 + err = seq_putc(seq, ':');
22876 +static void au_show_wbr_create(struct seq_file *m, int v,
22877 + struct au_sbinfo *sbinfo)
22881 + AuRwMustAnyLock(&sbinfo->si_rwsem);
22883 + seq_printf(m, ",create=");
22884 + pat = au_optstr_wbr_create(v);
22886 + case AuWbrCreate_TDP:
22887 + case AuWbrCreate_RR:
22888 + case AuWbrCreate_MFS:
22889 + case AuWbrCreate_PMFS:
22890 + seq_printf(m, pat);
22892 + case AuWbrCreate_MFSV:
22893 + seq_printf(m, /*pat*/"mfs:%lu",
22894 + jiffies_to_msecs(sbinfo->si_wbr_mfs.mfs_expire)
22897 + case AuWbrCreate_PMFSV:
22898 + seq_printf(m, /*pat*/"pmfs:%lu",
22899 + jiffies_to_msecs(sbinfo->si_wbr_mfs.mfs_expire)
22902 + case AuWbrCreate_MFSRR:
22903 + seq_printf(m, /*pat*/"mfsrr:%llu",
22904 + sbinfo->si_wbr_mfs.mfsrr_watermark);
22906 + case AuWbrCreate_MFSRRV:
22907 + seq_printf(m, /*pat*/"mfsrr:%llu:%lu",
22908 + sbinfo->si_wbr_mfs.mfsrr_watermark,
22909 + jiffies_to_msecs(sbinfo->si_wbr_mfs.mfs_expire)
22915 +static int au_show_xino(struct seq_file *seq, struct vfsmount *mnt)
22917 +#ifdef CONFIG_SYSFS
22921 + const int len = sizeof(AUFS_XINO_FNAME) - 1;
22922 + aufs_bindex_t bindex, brid;
22923 + struct super_block *sb;
22924 + struct qstr *name;
22926 + struct dentry *d, *h_root;
22927 + struct au_hdentry *hdp;
22929 + AuRwMustAnyLock(&sbinfo->si_rwsem);
22932 + sb = mnt->mnt_sb;
22933 + f = au_sbi(sb)->si_xib;
22937 + /* stop printing the default xino path on the first writable branch */
22939 + brid = au_xino_brid(sb);
22941 + bindex = au_br_index(sb, brid);
22942 + hdp = au_di(sb->s_root)->di_hdentry;
22943 + h_root = hdp[0 + bindex].hd_dentry;
22946 + name = &d->d_name;
22947 + /* safe ->d_parent because the file is unlinked */
22948 + if (d->d_parent == h_root
22949 + && name->len == len
22950 + && !memcmp(name->name, AUFS_XINO_FNAME, len))
22953 + seq_puts(seq, ",xino=");
22954 + err = au_xino_path(seq, f);
22961 +/* seq_file will re-call me in case of too long string */
22962 +static int aufs_show_options(struct seq_file *m, struct vfsmount *mnt)
22965 + unsigned int mnt_flags, v;
22966 + struct super_block *sb;
22967 + struct au_sbinfo *sbinfo;
22969 +#define AuBool(name, str) do { \
22970 + v = au_opt_test(mnt_flags, name); \
22971 + if (v != au_opt_test(AuOpt_Def, name)) \
22972 + seq_printf(m, ",%s" #str, v ? "" : "no"); \
22975 +#define AuStr(name, str) do { \
22976 + v = mnt_flags & AuOptMask_##name; \
22977 + if (v != (AuOpt_Def & AuOptMask_##name)) \
22978 + seq_printf(m, "," #str "=%s", au_optstr_##str(v)); \
22981 +#define AuUInt(name, str, val) do { \
22982 + if (val != AUFS_##name##_DEF) \
22983 + seq_printf(m, "," #str "=%u", val); \
22986 + /* lock free root dinfo */
22987 + sb = mnt->mnt_sb;
22988 + si_noflush_read_lock(sb);
22989 + sbinfo = au_sbi(sb);
22990 + seq_printf(m, ",si=%lx", sysaufs_si_id(sbinfo));
22992 + mnt_flags = au_mntflags(sb);
22993 + if (au_opt_test(mnt_flags, XINO)) {
22994 + err = au_show_xino(m, mnt);
22995 + if (unlikely(err))
22998 + seq_puts(m, ",noxino");
23000 + AuBool(TRUNC_XINO, trunc_xino);
23001 + AuStr(UDBA, udba);
23002 + AuBool(SHWH, shwh);
23003 + AuBool(PLINK, plink);
23004 + AuBool(DIO, dio);
23005 + /* AuBool(DIRPERM1, dirperm1); */
23006 + /* AuBool(REFROF, refrof); */
23008 + v = sbinfo->si_wbr_create;
23009 + if (v != AuWbrCreate_Def)
23010 + au_show_wbr_create(m, v, sbinfo);
23012 + v = sbinfo->si_wbr_copyup;
23013 + if (v != AuWbrCopyup_Def)
23014 + seq_printf(m, ",cpup=%s", au_optstr_wbr_copyup(v));
23016 + v = au_opt_test(mnt_flags, ALWAYS_DIROPQ);
23017 + if (v != au_opt_test(AuOpt_Def, ALWAYS_DIROPQ))
23018 + seq_printf(m, ",diropq=%c", v ? 'a' : 'w');
23020 + AuUInt(DIRWH, dirwh, sbinfo->si_dirwh);
23022 + v = jiffies_to_msecs(sbinfo->si_rdcache) / MSEC_PER_SEC;
23023 + AuUInt(RDCACHE, rdcache, v);
23025 + AuUInt(RDBLK, rdblk, sbinfo->si_rdblk);
23026 + AuUInt(RDHASH, rdhash, sbinfo->si_rdhash);
23028 + AuBool(SUM, sum);
23029 + /* AuBool(SUM_W, wsum); */
23030 + AuBool(WARN_PERM, warn_perm);
23031 + AuBool(VERBOSE, verbose);
23034 + /* be sure to print "br:" last */
23035 + if (!sysaufs_brs) {
23036 + seq_puts(m, ",br:");
23037 + au_show_brs(m, sb);
23039 + si_read_unlock(sb);
23047 +/* ---------------------------------------------------------------------- */
23049 +/* sum mode which returns the summation for statfs(2) */
23051 +static u64 au_add_till_max(u64 a, u64 b)
23059 + return ULLONG_MAX;
23062 +static int au_statfs_sum(struct super_block *sb, struct kstatfs *buf)
23065 + u64 blocks, bfree, bavail, files, ffree;
23066 + aufs_bindex_t bend, bindex, i;
23067 + unsigned char shared;
23068 + struct path h_path;
23069 + struct super_block *h_sb;
23078 + bend = au_sbend(sb);
23079 + for (bindex = bend; bindex >= 0; bindex--) {
23080 + h_path.mnt = au_sbr_mnt(sb, bindex);
23081 + h_sb = h_path.mnt->mnt_sb;
23083 + for (i = bindex + 1; !shared && i <= bend; i++)
23084 + shared = (au_sbr_sb(sb, i) == h_sb);
23088 + /* sb->s_root for NFS is unreliable */
23089 + h_path.dentry = h_path.mnt->mnt_root;
23090 + err = vfs_statfs(&h_path, buf);
23091 + if (unlikely(err))
23094 + blocks = au_add_till_max(blocks, buf->f_blocks);
23095 + bfree = au_add_till_max(bfree, buf->f_bfree);
23096 + bavail = au_add_till_max(bavail, buf->f_bavail);
23097 + files = au_add_till_max(files, buf->f_files);
23098 + ffree = au_add_till_max(ffree, buf->f_ffree);
23101 + buf->f_blocks = blocks;
23102 + buf->f_bfree = bfree;
23103 + buf->f_bavail = bavail;
23104 + buf->f_files = files;
23105 + buf->f_ffree = ffree;
23111 +static int aufs_statfs(struct dentry *dentry, struct kstatfs *buf)
23114 + struct path h_path;
23115 + struct super_block *sb;
23117 + /* lock free root dinfo */
23118 + sb = dentry->d_sb;
23119 + si_noflush_read_lock(sb);
23120 + if (!au_opt_test(au_mntflags(sb), SUM)) {
23121 + /* sb->s_root for NFS is unreliable */
23122 + h_path.mnt = au_sbr_mnt(sb, 0);
23123 + h_path.dentry = h_path.mnt->mnt_root;
23124 + err = vfs_statfs(&h_path, buf);
23126 + err = au_statfs_sum(sb, buf);
23127 + si_read_unlock(sb);
23130 + buf->f_type = AUFS_SUPER_MAGIC;
23131 + buf->f_namelen = AUFS_MAX_NAMELEN;
23132 + memset(&buf->f_fsid, 0, sizeof(buf->f_fsid));
23134 + /* buf->f_bsize = buf->f_blocks = buf->f_bfree = buf->f_bavail = -1; */
23139 +/* ---------------------------------------------------------------------- */
23141 +/* final actions when unmounting a file system */
23142 +static void aufs_put_super(struct super_block *sb)
23144 + struct au_sbinfo *sbinfo;
23146 + sbinfo = au_sbi(sb);
23150 + dbgaufs_si_fin(sbinfo);
23151 + kobject_put(&sbinfo->si_kobj);
23154 +/* ---------------------------------------------------------------------- */
23156 +void au_array_free(void *array)
23159 + if (!is_vmalloc_addr(array))
23166 +void *au_array_alloc(unsigned long long *hint, au_arraycb_t cb, void *arg)
23169 + unsigned long long n;
23176 + if (*hint > ULLONG_MAX / sizeof(array)) {
23177 + array = ERR_PTR(-EMFILE);
23178 + pr_err("hint %llu\n", *hint);
23182 + array = kmalloc(sizeof(array) * *hint, GFP_NOFS);
23183 + if (unlikely(!array))
23184 + array = vmalloc(sizeof(array) * *hint);
23185 + if (unlikely(!array)) {
23186 + array = ERR_PTR(-ENOMEM);
23190 + n = cb(array, *hint, arg);
23191 + AuDebugOn(n > *hint);
23198 +static unsigned long long au_iarray_cb(void *a,
23199 + unsigned long long max __maybe_unused,
23202 + unsigned long long n;
23203 + struct inode **p, *inode;
23204 + struct list_head *head;
23209 + spin_lock(&inode_sb_list_lock);
23210 + list_for_each_entry(inode, head, i_sb_list) {
23211 + if (!is_bad_inode(inode)
23212 + && au_ii(inode)->ii_bstart >= 0) {
23213 + spin_lock(&inode->i_lock);
23214 + if (atomic_read(&inode->i_count)) {
23218 + AuDebugOn(n > max);
23220 + spin_unlock(&inode->i_lock);
23223 + spin_unlock(&inode_sb_list_lock);
23228 +struct inode **au_iarray_alloc(struct super_block *sb, unsigned long long *max)
23230 + *max = atomic_long_read(&au_sbi(sb)->si_ninodes);
23231 + return au_array_alloc(max, au_iarray_cb, &sb->s_inodes);
23234 +void au_iarray_free(struct inode **a, unsigned long long max)
23236 + unsigned long long ull;
23238 + for (ull = 0; ull < max; ull++)
23240 + au_array_free(a);
23243 +/* ---------------------------------------------------------------------- */
23246 + * refresh dentry and inode at remount time.
23248 +/* todo: consolidate with simple_reval_dpath() and au_reval_for_attr() */
23249 +static int au_do_refresh(struct dentry *dentry, unsigned int dir_flags,
23250 + struct dentry *parent)
23254 + di_write_lock_child(dentry);
23255 + di_read_lock_parent(parent, AuLock_IR);
23256 + err = au_refresh_dentry(dentry, parent);
23257 + if (!err && dir_flags)
23258 + au_hn_reset(dentry->d_inode, dir_flags);
23259 + di_read_unlock(parent, AuLock_IR);
23260 + di_write_unlock(dentry);
23265 +static int au_do_refresh_d(struct dentry *dentry, unsigned int sigen,
23266 + struct au_sbinfo *sbinfo,
23267 + const unsigned int dir_flags)
23270 + struct dentry *parent;
23271 + struct inode *inode;
23274 + parent = dget_parent(dentry);
23275 + if (!au_digen_test(parent, sigen) && au_digen_test(dentry, sigen)) {
23276 + inode = dentry->d_inode;
23278 + if (!S_ISDIR(inode->i_mode))
23279 + err = au_do_refresh(dentry, /*dir_flags*/0,
23282 + err = au_do_refresh(dentry, dir_flags, parent);
23283 + if (unlikely(err))
23284 + au_fset_si(sbinfo, FAILED_REFRESH_DIR);
23287 + err = au_do_refresh(dentry, /*dir_flags*/0, parent);
23288 + AuDbgDentry(dentry);
23296 +static int au_refresh_d(struct super_block *sb)
23298 + int err, i, j, ndentry, e;
23299 + unsigned int sigen;
23300 + struct au_dcsub_pages dpages;
23301 + struct au_dpage *dpage;
23302 + struct dentry **dentries, *d;
23303 + struct au_sbinfo *sbinfo;
23304 + struct dentry *root = sb->s_root;
23305 + const unsigned int dir_flags = au_hi_flags(root->d_inode, /*isdir*/1);
23307 + err = au_dpages_init(&dpages, GFP_NOFS);
23308 + if (unlikely(err))
23310 + err = au_dcsub_pages(&dpages, root, NULL, NULL);
23311 + if (unlikely(err))
23314 + sigen = au_sigen(sb);
23315 + sbinfo = au_sbi(sb);
23316 + for (i = 0; i < dpages.ndpage; i++) {
23317 + dpage = dpages.dpages + i;
23318 + dentries = dpage->dentries;
23319 + ndentry = dpage->ndentry;
23320 + for (j = 0; j < ndentry; j++) {
23322 + e = au_do_refresh_d(d, sigen, sbinfo, dir_flags);
23323 + if (unlikely(e && !err))
23325 + /* go on even err */
23330 + au_dpages_free(&dpages);
23335 +static int au_refresh_i(struct super_block *sb)
23338 + unsigned int sigen;
23339 + unsigned long long max, ull;
23340 + struct inode *inode, **array;
23342 + array = au_iarray_alloc(sb, &max);
23343 + err = PTR_ERR(array);
23344 + if (IS_ERR(array))
23348 + sigen = au_sigen(sb);
23349 + for (ull = 0; ull < max; ull++) {
23350 + inode = array[ull];
23351 + if (au_iigen(inode) != sigen) {
23352 + ii_write_lock_child(inode);
23353 + e = au_refresh_hinode_self(inode);
23354 + ii_write_unlock(inode);
23355 + if (unlikely(e)) {
23356 + pr_err("error %d, i%lu\n", e, inode->i_ino);
23359 + /* go on even if err */
23364 + au_iarray_free(array, max);
23370 +static void au_remount_refresh(struct super_block *sb)
23373 + unsigned int udba;
23374 + aufs_bindex_t bindex, bend;
23375 + struct dentry *root;
23376 + struct inode *inode;
23377 + struct au_branch *br;
23379 + au_sigen_inc(sb);
23380 + au_fclr_si(au_sbi(sb), FAILED_REFRESH_DIR);
23382 + root = sb->s_root;
23383 + DiMustNoWaiters(root);
23384 + inode = root->d_inode;
23385 + IiMustNoWaiters(inode);
23387 + udba = au_opt_udba(sb);
23388 + bend = au_sbend(sb);
23389 + for (bindex = 0; bindex <= bend; bindex++) {
23390 + br = au_sbr(sb, bindex);
23391 + err = au_hnotify_reset_br(udba, br, br->br_perm);
23392 + if (unlikely(err))
23393 + AuIOErr("hnotify failed on br %d, %d, ignored\n",
23395 + /* go on even if err */
23397 + au_hn_reset(inode, au_hi_flags(inode, /*isdir*/1));
23399 + di_write_unlock(root);
23400 + err = au_refresh_d(sb);
23401 + e = au_refresh_i(sb);
23402 + if (unlikely(e && !err))
23404 + /* aufs_write_lock() calls ..._child() */
23405 + di_write_lock_child(root);
23407 + au_cpup_attr_all(inode, /*force*/1);
23409 + if (unlikely(err))
23410 + AuIOErr("refresh failed, ignored, %d\n", err);
23413 +/* stop extra interpretation of errno in mount(8), and strange error messages */
23414 +static int cvt_err(int err)
23428 +static int aufs_remount_fs(struct super_block *sb, int *flags, char *data)
23431 + unsigned int mntflags;
23432 + struct au_opts opts;
23433 + struct dentry *root;
23434 + struct inode *inode;
23435 + struct au_sbinfo *sbinfo;
23438 + root = sb->s_root;
23439 + if (!data || !*data) {
23440 + err = si_write_lock(sb, AuLock_FLUSH | AuLock_NOPLM);
23442 + di_write_lock_child(root);
23443 + err = au_opts_verify(sb, *flags, /*pending*/0);
23444 + aufs_write_unlock(root);
23450 + memset(&opts, 0, sizeof(opts));
23451 + opts.opt = (void *)__get_free_page(GFP_NOFS);
23452 + if (unlikely(!opts.opt))
23454 + opts.max_opt = PAGE_SIZE / sizeof(*opts.opt);
23455 + opts.flags = AuOpts_REMOUNT;
23456 + opts.sb_flags = *flags;
23458 + /* parse it before aufs lock */
23459 + err = au_opts_parse(sb, data, &opts);
23460 + if (unlikely(err))
23463 + sbinfo = au_sbi(sb);
23464 + inode = root->d_inode;
23465 + mutex_lock(&inode->i_mutex);
23466 + err = si_write_lock(sb, AuLock_FLUSH | AuLock_NOPLM);
23467 + if (unlikely(err))
23469 + di_write_lock_child(root);
23471 + /* au_opts_remount() may return an error */
23472 + err = au_opts_remount(sb, &opts);
23473 + au_opts_free(&opts);
23475 + if (au_ftest_opts(opts.flags, REFRESH))
23476 + au_remount_refresh(sb);
23478 + if (au_ftest_opts(opts.flags, REFRESH_DYAOP)) {
23479 + mntflags = au_mntflags(sb);
23480 + do_dx = !!au_opt_test(mntflags, DIO);
23481 + au_dy_arefresh(do_dx);
23484 + aufs_write_unlock(root);
23487 + mutex_unlock(&inode->i_mutex);
23489 + free_page((unsigned long)opts.opt);
23491 + err = cvt_err(err);
23496 +static const struct super_operations aufs_sop = {
23497 + .alloc_inode = aufs_alloc_inode,
23498 + .destroy_inode = aufs_destroy_inode,
23499 + /* always deleting, no clearing */
23500 + .drop_inode = generic_delete_inode,
23501 + .show_options = aufs_show_options,
23502 + .statfs = aufs_statfs,
23503 + .put_super = aufs_put_super,
23504 + .remount_fs = aufs_remount_fs
23507 +/* ---------------------------------------------------------------------- */
23509 +static int alloc_root(struct super_block *sb)
23512 + struct inode *inode;
23513 + struct dentry *root;
23516 + inode = au_iget_locked(sb, AUFS_ROOT_INO);
23517 + err = PTR_ERR(inode);
23518 + if (IS_ERR(inode))
23521 + inode->i_op = &aufs_dir_iop;
23522 + inode->i_fop = &aufs_dir_fop;
23523 + inode->i_mode = S_IFDIR;
23524 + set_nlink(inode, 2);
23525 + unlock_new_inode(inode);
23527 + root = d_alloc_root(inode);
23528 + if (unlikely(!root))
23530 + err = PTR_ERR(root);
23531 + if (IS_ERR(root))
23534 + err = au_di_init(root);
23536 + sb->s_root = root;
23537 + return 0; /* success */
23540 + goto out; /* do not iput */
23543 + iget_failed(inode);
23549 +static int aufs_fill_super(struct super_block *sb, void *raw_data,
23550 + int silent __maybe_unused)
23553 + struct au_opts opts;
23554 + struct dentry *root;
23555 + struct inode *inode;
23556 + char *arg = raw_data;
23558 + if (unlikely(!arg || !*arg)) {
23560 + pr_err("no arg\n");
23565 + memset(&opts, 0, sizeof(opts));
23566 + opts.opt = (void *)__get_free_page(GFP_NOFS);
23567 + if (unlikely(!opts.opt))
23569 + opts.max_opt = PAGE_SIZE / sizeof(*opts.opt);
23570 + opts.sb_flags = sb->s_flags;
23572 + err = au_si_alloc(sb);
23573 + if (unlikely(err))
23576 + /* all timestamps always follow the ones on the branch */
23577 + sb->s_flags |= MS_NOATIME | MS_NODIRATIME;
23578 + sb->s_op = &aufs_sop;
23579 + sb->s_d_op = &aufs_dop;
23580 + sb->s_magic = AUFS_SUPER_MAGIC;
23581 + sb->s_maxbytes = 0;
23582 + au_export_init(sb);
23584 + err = alloc_root(sb);
23585 + if (unlikely(err)) {
23586 + si_write_unlock(sb);
23589 + root = sb->s_root;
23590 + inode = root->d_inode;
23593 + * actually we can parse options regardless aufs lock here.
23594 + * but at remount time, parsing must be done before aufs lock.
23595 + * so we follow the same rule.
23597 + ii_write_lock_parent(inode);
23598 + aufs_write_unlock(root);
23599 + err = au_opts_parse(sb, arg, &opts);
23600 + if (unlikely(err))
23603 + /* lock vfs_inode first, then aufs. */
23604 + mutex_lock(&inode->i_mutex);
23605 + aufs_write_lock(root);
23606 + err = au_opts_mount(sb, &opts);
23607 + au_opts_free(&opts);
23608 + aufs_write_unlock(root);
23609 + mutex_unlock(&inode->i_mutex);
23611 + goto out_opts; /* success */
23615 + sb->s_root = NULL;
23617 + dbgaufs_si_fin(au_sbi(sb));
23618 + kobject_put(&au_sbi(sb)->si_kobj);
23619 + sb->s_fs_info = NULL;
23621 + free_page((unsigned long)opts.opt);
23624 + err = cvt_err(err);
23629 +/* ---------------------------------------------------------------------- */
23631 +static struct dentry *aufs_mount(struct file_system_type *fs_type, int flags,
23632 + const char *dev_name __maybe_unused,
23635 + struct dentry *root;
23636 + struct super_block *sb;
23638 + /* all timestamps always follow the ones on the branch */
23639 + /* mnt->mnt_flags |= MNT_NOATIME | MNT_NODIRATIME; */
23640 + root = mount_nodev(fs_type, flags, raw_data, aufs_fill_super);
23641 + if (IS_ERR(root))
23645 + si_write_lock(sb, !AuLock_FLUSH);
23646 + sysaufs_brs_add(sb, 0);
23647 + si_write_unlock(sb);
23648 + au_sbilist_add(sb);
23654 +static void aufs_kill_sb(struct super_block *sb)
23656 + struct au_sbinfo *sbinfo;
23658 + sbinfo = au_sbi(sb);
23660 + au_sbilist_del(sb);
23661 + aufs_write_lock(sb->s_root);
23662 + if (sbinfo->si_wbr_create_ops->fin)
23663 + sbinfo->si_wbr_create_ops->fin(sb);
23664 + if (au_opt_test(sbinfo->si_mntflags, UDBA_HNOTIFY)) {
23665 + au_opt_set_udba(sbinfo->si_mntflags, UDBA_NONE);
23666 + au_remount_refresh(sb);
23668 + if (au_opt_test(sbinfo->si_mntflags, PLINK))
23669 + au_plink_put(sb, /*verbose*/1);
23671 + sbinfo->si_sb = NULL;
23672 + aufs_write_unlock(sb->s_root);
23673 + au_nwt_flush(&sbinfo->si_nowait);
23675 + generic_shutdown_super(sb);
23678 +struct file_system_type aufs_fs_type = {
23679 + .name = AUFS_FSTYPE,
23681 + FS_RENAME_DOES_D_MOVE /* a race between rename and others */
23682 + | FS_REVAL_DOT, /* for NFS branch and udba */
23683 + .mount = aufs_mount,
23684 + .kill_sb = aufs_kill_sb,
23685 + /* no need to __module_get() and module_put(). */
23686 + .owner = THIS_MODULE,
23688 diff -urN /usr/share/empty/fs/aufs/super.h linux/fs/aufs/super.h
23689 --- /usr/share/empty/fs/aufs/super.h 1970-01-01 01:00:00.000000000 +0100
23690 +++ linux/fs/aufs/super.h 2012-02-13 21:54:56.973105100 +0100
23693 + * Copyright (C) 2005-2012 Junjiro R. Okajima
23695 + * This program, aufs is free software; you can redistribute it and/or modify
23696 + * it under the terms of the GNU General Public License as published by
23697 + * the Free Software Foundation; either version 2 of the License, or
23698 + * (at your option) any later version.
23700 + * This program is distributed in the hope that it will be useful,
23701 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
23702 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
23703 + * GNU General Public License for more details.
23705 + * You should have received a copy of the GNU General Public License
23706 + * along with this program; if not, write to the Free Software
23707 + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
23711 + * super_block operations
23714 +#ifndef __AUFS_SUPER_H__
23715 +#define __AUFS_SUPER_H__
23719 +#include <linux/fs.h>
23720 +#include "rwsem.h"
23724 +typedef ssize_t (*au_readf_t)(struct file *, char __user *, size_t, loff_t *);
23725 +typedef ssize_t (*au_writef_t)(struct file *, const char __user *, size_t,
23728 +/* policies to select one among multiple writable branches */
23729 +struct au_wbr_copyup_operations {
23730 + int (*copyup)(struct dentry *dentry);
23733 +struct au_wbr_create_operations {
23734 + int (*create)(struct dentry *dentry, int isdir);
23735 + int (*init)(struct super_block *sb);
23736 + int (*fin)(struct super_block *sb);
23739 +struct au_wbr_mfs {
23740 + struct mutex mfs_lock; /* protect this structure */
23741 + unsigned long mfs_jiffy;
23742 + unsigned long mfs_expire;
23743 + aufs_bindex_t mfs_bindex;
23745 + unsigned long long mfsrr_bytes;
23746 + unsigned long long mfsrr_watermark;
23750 +struct au_sbinfo {
23751 + /* nowait tasks in the system-wide workqueue */
23752 + struct au_nowait_tasks si_nowait;
23755 + * tried sb->s_umount, but failed due to the dependecy between i_mutex.
23756 + * rwsem for au_sbinfo is necessary.
23758 + struct au_rwsem si_rwsem;
23760 + /* prevent recursive locking in deleting inode */
23762 + unsigned long *bitmap;
23763 + spinlock_t tree_lock;
23764 + struct radix_tree_root tree;
23768 + * dirty approach to protect sb->sb_inodes and ->s_files from remount.
23770 + atomic_long_t si_ninodes, si_nfiles;
23772 + /* branch management */
23773 + unsigned int si_generation;
23775 + /* see above flags */
23776 + unsigned char au_si_status;
23778 + aufs_bindex_t si_bend;
23780 + /* dirty trick to keep br_id plus */
23781 + unsigned int si_last_br_id :
23782 + sizeof(aufs_bindex_t) * BITS_PER_BYTE - 1;
23783 + struct au_branch **si_branch;
23785 + /* policy to select a writable branch */
23786 + unsigned char si_wbr_copyup;
23787 + unsigned char si_wbr_create;
23788 + struct au_wbr_copyup_operations *si_wbr_copyup_ops;
23789 + struct au_wbr_create_operations *si_wbr_create_ops;
23791 + /* round robin */
23792 + atomic_t si_wbr_rr_next;
23794 + /* most free space */
23795 + struct au_wbr_mfs si_wbr_mfs;
23797 + /* mount flags */
23798 + /* include/asm-ia64/siginfo.h defines a macro named si_flags */
23799 + unsigned int si_mntflags;
23801 + /* external inode number (bitmap and translation table) */
23802 + au_readf_t si_xread;
23803 + au_writef_t si_xwrite;
23804 + struct file *si_xib;
23805 + struct mutex si_xib_mtx; /* protect xib members */
23806 + unsigned long *si_xib_buf;
23807 + unsigned long si_xib_last_pindex;
23808 + int si_xib_next_bit;
23809 + aufs_bindex_t si_xino_brid;
23810 + /* reserved for future use */
23811 + /* unsigned long long si_xib_limit; */ /* Max xib file size */
23813 +#ifdef CONFIG_AUFS_EXPORT
23814 + /* i_generation */
23815 + struct file *si_xigen;
23816 + atomic_t si_xigen_next;
23819 + /* vdir parameters */
23820 + unsigned long si_rdcache; /* max cache time in jiffies */
23821 + unsigned int si_rdblk; /* deblk size */
23822 + unsigned int si_rdhash; /* hash size */
23825 + * If the number of whiteouts are larger than si_dirwh, leave all of
23826 + * them after au_whtmp_ren to reduce the cost of rmdir(2).
23827 + * future fsck.aufs or kernel thread will remove them later.
23828 + * Otherwise, remove all whiteouts and the dir in rmdir(2).
23830 + unsigned int si_dirwh;
23833 + * rename(2) a directory with all children.
23835 + /* reserved for future use */
23836 + /* int si_rendir; */
23838 + /* pseudo_link list */
23839 + struct au_splhead si_plink;
23840 + wait_queue_head_t si_plink_wq;
23841 + spinlock_t si_plink_maint_lock;
23842 + pid_t si_plink_maint_pid;
23845 + * sysfs and lifetime management.
23846 + * this is not a small structure and it may be a waste of memory in case
23847 + * of sysfs is disabled, particulary when many aufs-es are mounted.
23848 + * but using sysfs is majority.
23850 + struct kobject si_kobj;
23851 +#ifdef CONFIG_DEBUG_FS
23852 + struct dentry *si_dbgaufs, *si_dbgaufs_xib;
23853 +#ifdef CONFIG_AUFS_EXPORT
23854 + struct dentry *si_dbgaufs_xigen;
23858 +#ifdef CONFIG_AUFS_SBILIST
23859 + struct list_head si_list;
23862 + /* dirty, necessary for unmounting, sysfs and sysrq */
23863 + struct super_block *si_sb;
23866 +/* sbinfo status flags */
23868 + * set true when refresh_dirs() failed at remount time.
23869 + * then try refreshing dirs at access time again.
23870 + * if it is false, refreshing dirs at access time is unnecesary
23872 +#define AuSi_FAILED_REFRESH_DIR 1
23873 +static inline unsigned char au_do_ftest_si(struct au_sbinfo *sbi,
23874 + unsigned int flag)
23876 + AuRwMustAnyLock(&sbi->si_rwsem);
23877 + return sbi->au_si_status & flag;
23879 +#define au_ftest_si(sbinfo, name) au_do_ftest_si(sbinfo, AuSi_##name)
23880 +#define au_fset_si(sbinfo, name) do { \
23881 + AuRwMustWriteLock(&(sbinfo)->si_rwsem); \
23882 + (sbinfo)->au_si_status |= AuSi_##name; \
23884 +#define au_fclr_si(sbinfo, name) do { \
23885 + AuRwMustWriteLock(&(sbinfo)->si_rwsem); \
23886 + (sbinfo)->au_si_status &= ~AuSi_##name; \
23889 +/* ---------------------------------------------------------------------- */
23891 +/* policy to select one among writable branches */
23892 +#define AuWbrCopyup(sbinfo, ...) \
23893 + ((sbinfo)->si_wbr_copyup_ops->copyup(__VA_ARGS__))
23894 +#define AuWbrCreate(sbinfo, ...) \
23895 + ((sbinfo)->si_wbr_create_ops->create(__VA_ARGS__))
23897 +/* flags for si_read_lock()/aufs_read_lock()/di_read_lock() */
23898 +#define AuLock_DW 1 /* write-lock dentry */
23899 +#define AuLock_IR (1 << 1) /* read-lock inode */
23900 +#define AuLock_IW (1 << 2) /* write-lock inode */
23901 +#define AuLock_FLUSH (1 << 3) /* wait for 'nowait' tasks */
23902 +#define AuLock_DIR (1 << 4) /* target is a dir */
23903 +#define AuLock_NOPLM (1 << 5) /* return err in plm mode */
23904 +#define AuLock_NOPLMW (1 << 6) /* wait for plm mode ends */
23905 +#define AuLock_GEN (1 << 7) /* test digen/iigen */
23906 +#define au_ftest_lock(flags, name) ((flags) & AuLock_##name)
23907 +#define au_fset_lock(flags, name) \
23908 + do { (flags) |= AuLock_##name; } while (0)
23909 +#define au_fclr_lock(flags, name) \
23910 + do { (flags) &= ~AuLock_##name; } while (0)
23912 +/* ---------------------------------------------------------------------- */
23915 +extern struct file_system_type aufs_fs_type;
23916 +struct inode *au_iget_locked(struct super_block *sb, ino_t ino);
23917 +typedef unsigned long long (*au_arraycb_t)(void *array, unsigned long long max,
23919 +void au_array_free(void *array);
23920 +void *au_array_alloc(unsigned long long *hint, au_arraycb_t cb, void *arg);
23921 +struct inode **au_iarray_alloc(struct super_block *sb, unsigned long long *max);
23922 +void au_iarray_free(struct inode **a, unsigned long long max);
23925 +void au_si_free(struct kobject *kobj);
23926 +int au_si_alloc(struct super_block *sb);
23927 +int au_sbr_realloc(struct au_sbinfo *sbinfo, int nbr);
23929 +unsigned int au_sigen_inc(struct super_block *sb);
23930 +aufs_bindex_t au_new_br_id(struct super_block *sb);
23932 +int si_read_lock(struct super_block *sb, int flags);
23933 +int si_write_lock(struct super_block *sb, int flags);
23934 +int aufs_read_lock(struct dentry *dentry, int flags);
23935 +void aufs_read_unlock(struct dentry *dentry, int flags);
23936 +void aufs_write_lock(struct dentry *dentry);
23937 +void aufs_write_unlock(struct dentry *dentry);
23938 +int aufs_read_and_write_lock2(struct dentry *d1, struct dentry *d2, int flags);
23939 +void aufs_read_and_write_unlock2(struct dentry *d1, struct dentry *d2);
23941 +int si_pid_test_slow(struct super_block *sb);
23942 +void si_pid_set_slow(struct super_block *sb);
23943 +void si_pid_clr_slow(struct super_block *sb);
23945 +/* wbr_policy.c */
23946 +extern struct au_wbr_copyup_operations au_wbr_copyup_ops[];
23947 +extern struct au_wbr_create_operations au_wbr_create_ops[];
23948 +int au_cpdown_dirs(struct dentry *dentry, aufs_bindex_t bdst);
23950 +/* ---------------------------------------------------------------------- */
23952 +static inline struct au_sbinfo *au_sbi(struct super_block *sb)
23954 + return sb->s_fs_info;
23957 +/* ---------------------------------------------------------------------- */
23959 +#ifdef CONFIG_AUFS_EXPORT
23960 +void au_export_init(struct super_block *sb);
23962 +static inline int au_test_nfsd(void)
23964 + struct task_struct *tsk = current;
23966 + return (tsk->flags & PF_KTHREAD)
23967 + && !strcmp(tsk->comm, "nfsd");
23970 +void au_xigen_inc(struct inode *inode);
23971 +int au_xigen_new(struct inode *inode);
23972 +int au_xigen_set(struct super_block *sb, struct file *base);
23973 +void au_xigen_clr(struct super_block *sb);
23975 +static inline int au_busy_or_stale(void)
23977 + if (!au_test_nfsd())
23982 +AuStubVoid(au_export_init, struct super_block *sb)
23983 +AuStubInt0(au_test_nfsd, void)
23984 +AuStubVoid(au_xigen_inc, struct inode *inode)
23985 +AuStubInt0(au_xigen_new, struct inode *inode)
23986 +AuStubInt0(au_xigen_set, struct super_block *sb, struct file *base)
23987 +AuStubVoid(au_xigen_clr, struct super_block *sb)
23988 +static inline int au_busy_or_stale(void)
23992 +#endif /* CONFIG_AUFS_EXPORT */
23994 +/* ---------------------------------------------------------------------- */
23996 +#ifdef CONFIG_AUFS_SBILIST
23998 +extern struct au_splhead au_sbilist;
24000 +static inline void au_sbilist_init(void)
24002 + au_spl_init(&au_sbilist);
24005 +static inline void au_sbilist_add(struct super_block *sb)
24007 + au_spl_add(&au_sbi(sb)->si_list, &au_sbilist);
24010 +static inline void au_sbilist_del(struct super_block *sb)
24012 + au_spl_del(&au_sbi(sb)->si_list, &au_sbilist);
24015 +#ifdef CONFIG_AUFS_MAGIC_SYSRQ
24016 +static inline void au_sbilist_lock(void)
24018 + spin_lock(&au_sbilist.spin);
24021 +static inline void au_sbilist_unlock(void)
24023 + spin_unlock(&au_sbilist.spin);
24025 +#define AuGFP_SBILIST GFP_ATOMIC
24027 +AuStubVoid(au_sbilist_lock, void)
24028 +AuStubVoid(au_sbilist_unlock, void)
24029 +#define AuGFP_SBILIST GFP_NOFS
24030 +#endif /* CONFIG_AUFS_MAGIC_SYSRQ */
24032 +AuStubVoid(au_sbilist_init, void)
24033 +AuStubVoid(au_sbilist_add, struct super_block*)
24034 +AuStubVoid(au_sbilist_del, struct super_block*)
24035 +AuStubVoid(au_sbilist_lock, void)
24036 +AuStubVoid(au_sbilist_unlock, void)
24037 +#define AuGFP_SBILIST GFP_NOFS
24040 +/* ---------------------------------------------------------------------- */
24042 +static inline void dbgaufs_si_null(struct au_sbinfo *sbinfo)
24045 + * This function is a dynamic '__init' fucntion actually,
24046 + * so the tiny check for si_rwsem is unnecessary.
24048 + /* AuRwMustWriteLock(&sbinfo->si_rwsem); */
24049 +#ifdef CONFIG_DEBUG_FS
24050 + sbinfo->si_dbgaufs = NULL;
24051 + sbinfo->si_dbgaufs_xib = NULL;
24052 +#ifdef CONFIG_AUFS_EXPORT
24053 + sbinfo->si_dbgaufs_xigen = NULL;
24058 +/* ---------------------------------------------------------------------- */
24060 +static inline pid_t si_pid_bit(void)
24062 + /* the origin of pid is 1, but the bitmap's is 0 */
24063 + return current->pid - 1;
24066 +static inline int si_pid_test(struct super_block *sb)
24068 + pid_t bit = si_pid_bit();
24069 + if (bit < PID_MAX_DEFAULT)
24070 + return test_bit(bit, au_sbi(sb)->au_si_pid.bitmap);
24072 + return si_pid_test_slow(sb);
24075 +static inline void si_pid_set(struct super_block *sb)
24077 + pid_t bit = si_pid_bit();
24078 + if (bit < PID_MAX_DEFAULT) {
24079 + AuDebugOn(test_bit(bit, au_sbi(sb)->au_si_pid.bitmap));
24080 + set_bit(bit, au_sbi(sb)->au_si_pid.bitmap);
24083 + si_pid_set_slow(sb);
24086 +static inline void si_pid_clr(struct super_block *sb)
24088 + pid_t bit = si_pid_bit();
24089 + if (bit < PID_MAX_DEFAULT) {
24090 + AuDebugOn(!test_bit(bit, au_sbi(sb)->au_si_pid.bitmap));
24091 + clear_bit(bit, au_sbi(sb)->au_si_pid.bitmap);
24094 + si_pid_clr_slow(sb);
24097 +/* ---------------------------------------------------------------------- */
24099 +/* lock superblock. mainly for entry point functions */
24101 + * __si_read_lock, __si_write_lock,
24102 + * __si_read_unlock, __si_write_unlock, __si_downgrade_lock
24104 +AuSimpleRwsemFuncs(__si, struct super_block *sb, &au_sbi(sb)->si_rwsem);
24106 +#define SiMustNoWaiters(sb) AuRwMustNoWaiters(&au_sbi(sb)->si_rwsem)
24107 +#define SiMustAnyLock(sb) AuRwMustAnyLock(&au_sbi(sb)->si_rwsem)
24108 +#define SiMustWriteLock(sb) AuRwMustWriteLock(&au_sbi(sb)->si_rwsem)
24110 +static inline void si_noflush_read_lock(struct super_block *sb)
24112 + __si_read_lock(sb);
24116 +static inline int si_noflush_read_trylock(struct super_block *sb)
24118 + int locked = __si_read_trylock(sb);
24124 +static inline void si_noflush_write_lock(struct super_block *sb)
24126 + __si_write_lock(sb);
24130 +static inline int si_noflush_write_trylock(struct super_block *sb)
24132 + int locked = __si_write_trylock(sb);
24138 +#if 0 /* unused */
24139 +static inline int si_read_trylock(struct super_block *sb, int flags)
24141 + if (au_ftest_lock(flags, FLUSH))
24142 + au_nwt_flush(&au_sbi(sb)->si_nowait);
24143 + return si_noflush_read_trylock(sb);
24147 +static inline void si_read_unlock(struct super_block *sb)
24150 + __si_read_unlock(sb);
24153 +#if 0 /* unused */
24154 +static inline int si_write_trylock(struct super_block *sb, int flags)
24156 + if (au_ftest_lock(flags, FLUSH))
24157 + au_nwt_flush(&au_sbi(sb)->si_nowait);
24158 + return si_noflush_write_trylock(sb);
24162 +static inline void si_write_unlock(struct super_block *sb)
24165 + __si_write_unlock(sb);
24168 +#if 0 /* unused */
24169 +static inline void si_downgrade_lock(struct super_block *sb)
24171 + __si_downgrade_lock(sb);
24175 +/* ---------------------------------------------------------------------- */
24177 +static inline aufs_bindex_t au_sbend(struct super_block *sb)
24179 + SiMustAnyLock(sb);
24180 + return au_sbi(sb)->si_bend;
24183 +static inline unsigned int au_mntflags(struct super_block *sb)
24185 + SiMustAnyLock(sb);
24186 + return au_sbi(sb)->si_mntflags;
24189 +static inline unsigned int au_sigen(struct super_block *sb)
24191 + SiMustAnyLock(sb);
24192 + return au_sbi(sb)->si_generation;
24195 +static inline void au_ninodes_inc(struct super_block *sb)
24197 + atomic_long_inc(&au_sbi(sb)->si_ninodes);
24200 +static inline void au_ninodes_dec(struct super_block *sb)
24202 + AuDebugOn(!atomic_long_read(&au_sbi(sb)->si_ninodes));
24203 + atomic_long_dec(&au_sbi(sb)->si_ninodes);
24206 +static inline void au_nfiles_inc(struct super_block *sb)
24208 + atomic_long_inc(&au_sbi(sb)->si_nfiles);
24211 +static inline void au_nfiles_dec(struct super_block *sb)
24213 + AuDebugOn(!atomic_long_read(&au_sbi(sb)->si_nfiles));
24214 + atomic_long_dec(&au_sbi(sb)->si_nfiles);
24217 +static inline struct au_branch *au_sbr(struct super_block *sb,
24218 + aufs_bindex_t bindex)
24220 + SiMustAnyLock(sb);
24221 + return au_sbi(sb)->si_branch[0 + bindex];
24224 +static inline void au_xino_brid_set(struct super_block *sb, aufs_bindex_t brid)
24226 + SiMustWriteLock(sb);
24227 + au_sbi(sb)->si_xino_brid = brid;
24230 +static inline aufs_bindex_t au_xino_brid(struct super_block *sb)
24232 + SiMustAnyLock(sb);
24233 + return au_sbi(sb)->si_xino_brid;
24236 +#endif /* __KERNEL__ */
24237 +#endif /* __AUFS_SUPER_H__ */
24238 diff -urN /usr/share/empty/fs/aufs/sysaufs.c linux/fs/aufs/sysaufs.c
24239 --- /usr/share/empty/fs/aufs/sysaufs.c 1970-01-01 01:00:00.000000000 +0100
24240 +++ linux/fs/aufs/sysaufs.c 2012-02-13 21:54:56.973105100 +0100
24243 + * Copyright (C) 2005-2012 Junjiro R. Okajima
24245 + * This program, aufs is free software; you can redistribute it and/or modify
24246 + * it under the terms of the GNU General Public License as published by
24247 + * the Free Software Foundation; either version 2 of the License, or
24248 + * (at your option) any later version.
24250 + * This program is distributed in the hope that it will be useful,
24251 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
24252 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
24253 + * GNU General Public License for more details.
24255 + * You should have received a copy of the GNU General Public License
24256 + * along with this program; if not, write to the Free Software
24257 + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
24261 + * sysfs interface and lifetime management
24262 + * they are necessary regardless sysfs is disabled.
24265 +#include <linux/random.h>
24268 +unsigned long sysaufs_si_mask;
24269 +struct kset *sysaufs_kset;
24271 +#define AuSiAttr(_name) { \
24272 + .attr = { .name = __stringify(_name), .mode = 0444 }, \
24273 + .show = sysaufs_si_##_name, \
24276 +static struct sysaufs_si_attr sysaufs_si_attr_xi_path = AuSiAttr(xi_path);
24277 +struct attribute *sysaufs_si_attrs[] = {
24278 + &sysaufs_si_attr_xi_path.attr,
24282 +static const struct sysfs_ops au_sbi_ops = {
24283 + .show = sysaufs_si_show
24286 +static struct kobj_type au_sbi_ktype = {
24287 + .release = au_si_free,
24288 + .sysfs_ops = &au_sbi_ops,
24289 + .default_attrs = sysaufs_si_attrs
24292 +/* ---------------------------------------------------------------------- */
24294 +int sysaufs_si_init(struct au_sbinfo *sbinfo)
24298 + sbinfo->si_kobj.kset = sysaufs_kset;
24299 + /* cf. sysaufs_name() */
24300 + err = kobject_init_and_add
24301 + (&sbinfo->si_kobj, &au_sbi_ktype, /*&sysaufs_kset->kobj*/NULL,
24302 + SysaufsSiNamePrefix "%lx", sysaufs_si_id(sbinfo));
24304 + dbgaufs_si_null(sbinfo);
24306 + err = dbgaufs_si_init(sbinfo);
24307 + if (unlikely(err))
24308 + kobject_put(&sbinfo->si_kobj);
24313 +void sysaufs_fin(void)
24316 + sysfs_remove_group(&sysaufs_kset->kobj, sysaufs_attr_group);
24317 + kset_unregister(sysaufs_kset);
24320 +int __init sysaufs_init(void)
24325 + get_random_bytes(&sysaufs_si_mask, sizeof(sysaufs_si_mask));
24326 + } while (!sysaufs_si_mask);
24329 + sysaufs_kset = kset_create_and_add(AUFS_NAME, NULL, fs_kobj);
24330 + if (unlikely(!sysaufs_kset))
24332 + err = PTR_ERR(sysaufs_kset);
24333 + if (IS_ERR(sysaufs_kset))
24335 + err = sysfs_create_group(&sysaufs_kset->kobj, sysaufs_attr_group);
24336 + if (unlikely(err)) {
24337 + kset_unregister(sysaufs_kset);
24341 + err = dbgaufs_init();
24342 + if (unlikely(err))
24347 diff -urN /usr/share/empty/fs/aufs/sysaufs.h linux/fs/aufs/sysaufs.h
24348 --- /usr/share/empty/fs/aufs/sysaufs.h 1970-01-01 01:00:00.000000000 +0100
24349 +++ linux/fs/aufs/sysaufs.h 2012-02-13 21:54:56.973105100 +0100
24352 + * Copyright (C) 2005-2012 Junjiro R. Okajima
24354 + * This program, aufs is free software; you can redistribute it and/or modify
24355 + * it under the terms of the GNU General Public License as published by
24356 + * the Free Software Foundation; either version 2 of the License, or
24357 + * (at your option) any later version.
24359 + * This program is distributed in the hope that it will be useful,
24360 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
24361 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
24362 + * GNU General Public License for more details.
24364 + * You should have received a copy of the GNU General Public License
24365 + * along with this program; if not, write to the Free Software
24366 + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
24370 + * sysfs interface and mount lifetime management
24373 +#ifndef __SYSAUFS_H__
24374 +#define __SYSAUFS_H__
24378 +#include <linux/sysfs.h>
24379 +#include "module.h"
24381 +struct super_block;
24384 +struct sysaufs_si_attr {
24385 + struct attribute attr;
24386 + int (*show)(struct seq_file *seq, struct super_block *sb);
24389 +/* ---------------------------------------------------------------------- */
24392 +extern unsigned long sysaufs_si_mask;
24393 +extern struct kset *sysaufs_kset;
24394 +extern struct attribute *sysaufs_si_attrs[];
24395 +int sysaufs_si_init(struct au_sbinfo *sbinfo);
24396 +int __init sysaufs_init(void);
24397 +void sysaufs_fin(void);
24399 +/* ---------------------------------------------------------------------- */
24401 +/* some people doesn't like to show a pointer in kernel */
24402 +static inline unsigned long sysaufs_si_id(struct au_sbinfo *sbinfo)
24404 + return sysaufs_si_mask ^ (unsigned long)sbinfo;
24407 +#define SysaufsSiNamePrefix "si_"
24408 +#define SysaufsSiNameLen (sizeof(SysaufsSiNamePrefix) + 16)
24409 +static inline void sysaufs_name(struct au_sbinfo *sbinfo, char *name)
24411 + snprintf(name, SysaufsSiNameLen, SysaufsSiNamePrefix "%lx",
24412 + sysaufs_si_id(sbinfo));
24416 +#ifdef CONFIG_SYSFS
24418 +extern struct attribute_group *sysaufs_attr_group;
24420 +int sysaufs_si_xi_path(struct seq_file *seq, struct super_block *sb);
24421 +ssize_t sysaufs_si_show(struct kobject *kobj, struct attribute *attr,
24424 +void sysaufs_br_init(struct au_branch *br);
24425 +void sysaufs_brs_add(struct super_block *sb, aufs_bindex_t bindex);
24426 +void sysaufs_brs_del(struct super_block *sb, aufs_bindex_t bindex);
24428 +#define sysaufs_brs_init() do {} while (0)
24431 +#define sysaufs_attr_group NULL
24433 +AuStubInt0(sysaufs_si_xi_path, struct seq_file *seq, struct super_block *sb)
24436 +ssize_t sysaufs_si_show(struct kobject *kobj, struct attribute *attr,
24442 +AuStubVoid(sysaufs_br_init, struct au_branch *br)
24443 +AuStubVoid(sysaufs_brs_add, struct super_block *sb, aufs_bindex_t bindex)
24444 +AuStubVoid(sysaufs_brs_del, struct super_block *sb, aufs_bindex_t bindex)
24446 +static inline void sysaufs_brs_init(void)
24451 +#endif /* CONFIG_SYSFS */
24453 +#endif /* __KERNEL__ */
24454 +#endif /* __SYSAUFS_H__ */
24455 diff -urN /usr/share/empty/fs/aufs/sysfs.c linux/fs/aufs/sysfs.c
24456 --- /usr/share/empty/fs/aufs/sysfs.c 1970-01-01 01:00:00.000000000 +0100
24457 +++ linux/fs/aufs/sysfs.c 2012-02-13 21:54:56.973105100 +0100
24460 + * Copyright (C) 2005-2012 Junjiro R. Okajima
24462 + * This program, aufs is free software; you can redistribute it and/or modify
24463 + * it under the terms of the GNU General Public License as published by
24464 + * the Free Software Foundation; either version 2 of the License, or
24465 + * (at your option) any later version.
24467 + * This program is distributed in the hope that it will be useful,
24468 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
24469 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
24470 + * GNU General Public License for more details.
24472 + * You should have received a copy of the GNU General Public License
24473 + * along with this program; if not, write to the Free Software
24474 + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
24478 + * sysfs interface
24481 +#include <linux/seq_file.h>
24484 +#ifdef CONFIG_AUFS_FS_MODULE
24485 +/* this entry violates the "one line per file" policy of sysfs */
24486 +static ssize_t config_show(struct kobject *kobj, struct kobj_attribute *attr,
24490 + static char *conf =
24491 +/* this file is generated at compiling */
24492 +#include "conf.str"
24495 + err = snprintf(buf, PAGE_SIZE, conf);
24496 + if (unlikely(err >= PAGE_SIZE))
24501 +static struct kobj_attribute au_config_attr = __ATTR_RO(config);
24504 +static struct attribute *au_attr[] = {
24505 +#ifdef CONFIG_AUFS_FS_MODULE
24506 + &au_config_attr.attr,
24508 + NULL, /* need to NULL terminate the list of attributes */
24511 +static struct attribute_group sysaufs_attr_group_body = {
24515 +struct attribute_group *sysaufs_attr_group = &sysaufs_attr_group_body;
24517 +/* ---------------------------------------------------------------------- */
24519 +int sysaufs_si_xi_path(struct seq_file *seq, struct super_block *sb)
24523 + SiMustAnyLock(sb);
24526 + if (au_opt_test(au_mntflags(sb), XINO)) {
24527 + err = au_xino_path(seq, au_sbi(sb)->si_xib);
24528 + seq_putc(seq, '\n');
24534 + * the lifetime of branch is independent from the entry under sysfs.
24535 + * sysfs handles the lifetime of the entry, and never call ->show() after it is
24538 +static int sysaufs_si_br(struct seq_file *seq, struct super_block *sb,
24539 + aufs_bindex_t bindex)
24542 + struct path path;
24543 + struct dentry *root;
24544 + struct au_branch *br;
24547 + AuDbg("b%d\n", bindex);
24550 + root = sb->s_root;
24551 + di_read_lock_parent(root, !AuLock_IR);
24552 + br = au_sbr(sb, bindex);
24553 + path.mnt = br->br_mnt;
24554 + path.dentry = au_h_dptr(root, bindex);
24555 + au_seq_path(seq, &path);
24556 + di_read_unlock(root, !AuLock_IR);
24557 + perm = au_optstr_br_perm(br->br_perm);
24559 + err = seq_printf(seq, "=%s\n", perm);
24568 +/* ---------------------------------------------------------------------- */
24570 +static struct seq_file *au_seq(char *p, ssize_t len)
24572 + struct seq_file *seq;
24574 + seq = kzalloc(sizeof(*seq), GFP_NOFS);
24576 + /* mutex_init(&seq.lock); */
24579 + return seq; /* success */
24582 + seq = ERR_PTR(-ENOMEM);
24586 +#define SysaufsBr_PREFIX "br"
24588 +/* todo: file size may exceed PAGE_SIZE */
24589 +ssize_t sysaufs_si_show(struct kobject *kobj, struct attribute *attr,
24594 + aufs_bindex_t bend;
24595 + struct au_sbinfo *sbinfo;
24596 + struct super_block *sb;
24597 + struct seq_file *seq;
24599 + struct attribute **cattr;
24601 + sbinfo = container_of(kobj, struct au_sbinfo, si_kobj);
24602 + sb = sbinfo->si_sb;
24605 + * prevent a race condition between sysfs and aufs.
24606 + * for instance, sysfs_file_read() calls sysfs_get_active_two() which
24607 + * prohibits maintaining the sysfs entries.
24608 + * hew we acquire read lock after sysfs_get_active_two().
24609 + * on the other hand, the remount process may maintain the sysfs/aufs
24610 + * entries after acquiring write lock.
24611 + * it can cause a deadlock.
24612 + * simply we gave up processing read here.
24615 + if (unlikely(!si_noflush_read_trylock(sb)))
24618 + seq = au_seq(buf, PAGE_SIZE);
24619 + err = PTR_ERR(seq);
24623 + name = (void *)attr->name;
24624 + cattr = sysaufs_si_attrs;
24626 + if (!strcmp(name, (*cattr)->name)) {
24627 + err = container_of(*cattr, struct sysaufs_si_attr, attr)
24634 + bend = au_sbend(sb);
24635 + if (!strncmp(name, SysaufsBr_PREFIX, sizeof(SysaufsBr_PREFIX) - 1)) {
24636 + name += sizeof(SysaufsBr_PREFIX) - 1;
24637 + err = kstrtol(name, 10, &l);
24640 + err = sysaufs_si_br(seq, sb, (aufs_bindex_t)l);
24650 + err = seq->count;
24651 + /* sysfs limit */
24652 + if (unlikely(err == PAGE_SIZE))
24657 + si_read_unlock(sb);
24662 +/* ---------------------------------------------------------------------- */
24664 +void sysaufs_br_init(struct au_branch *br)
24666 + struct attribute *attr = &br->br_attr;
24668 + sysfs_attr_init(attr);
24669 + attr->name = br->br_name;
24670 + attr->mode = S_IRUGO;
24673 +void sysaufs_brs_del(struct super_block *sb, aufs_bindex_t bindex)
24675 + struct au_branch *br;
24676 + struct kobject *kobj;
24677 + aufs_bindex_t bend;
24679 + dbgaufs_brs_del(sb, bindex);
24681 + if (!sysaufs_brs)
24684 + kobj = &au_sbi(sb)->si_kobj;
24685 + bend = au_sbend(sb);
24686 + for (; bindex <= bend; bindex++) {
24687 + br = au_sbr(sb, bindex);
24688 + sysfs_remove_file(kobj, &br->br_attr);
24692 +void sysaufs_brs_add(struct super_block *sb, aufs_bindex_t bindex)
24695 + aufs_bindex_t bend;
24696 + struct kobject *kobj;
24697 + struct au_branch *br;
24699 + dbgaufs_brs_add(sb, bindex);
24701 + if (!sysaufs_brs)
24704 + kobj = &au_sbi(sb)->si_kobj;
24705 + bend = au_sbend(sb);
24706 + for (; bindex <= bend; bindex++) {
24707 + br = au_sbr(sb, bindex);
24708 + snprintf(br->br_name, sizeof(br->br_name), SysaufsBr_PREFIX
24710 + err = sysfs_create_file(kobj, &br->br_attr);
24711 + if (unlikely(err))
24712 + pr_warning("failed %s under sysfs(%d)\n",
24713 + br->br_name, err);
24716 diff -urN /usr/share/empty/fs/aufs/sysrq.c linux/fs/aufs/sysrq.c
24717 --- /usr/share/empty/fs/aufs/sysrq.c 1970-01-01 01:00:00.000000000 +0100
24718 +++ linux/fs/aufs/sysrq.c 2012-02-13 21:54:56.973105100 +0100
24721 + * Copyright (C) 2005-2012 Junjiro R. Okajima
24723 + * This program, aufs is free software; you can redistribute it and/or modify
24724 + * it under the terms of the GNU General Public License as published by
24725 + * the Free Software Foundation; either version 2 of the License, or
24726 + * (at your option) any later version.
24728 + * This program is distributed in the hope that it will be useful,
24729 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
24730 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
24731 + * GNU General Public License for more details.
24733 + * You should have received a copy of the GNU General Public License
24734 + * along with this program; if not, write to the Free Software
24735 + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
24739 + * magic sysrq hanlder
24742 +/* #include <linux/sysrq.h> */
24743 +#include <linux/writeback.h>
24746 +/* ---------------------------------------------------------------------- */
24748 +static void sysrq_sb(struct super_block *sb)
24751 + struct au_sbinfo *sbinfo;
24752 + struct file *file;
24754 + plevel = au_plevel;
24755 + au_plevel = KERN_WARNING;
24757 + sbinfo = au_sbi(sb);
24758 + /* since we define pr_fmt, call printk directly */
24759 + printk(KERN_WARNING "si=%lx\n", sysaufs_si_id(sbinfo));
24760 + printk(KERN_WARNING AUFS_NAME ": superblock\n");
24764 + printk(KERN_WARNING AUFS_NAME ": root dentry\n");
24765 + au_dpri_dentry(sb->s_root);
24766 + printk(KERN_WARNING AUFS_NAME ": root inode\n");
24767 + au_dpri_inode(sb->s_root->d_inode);
24772 + int err, i, j, ndentry;
24773 + struct au_dcsub_pages dpages;
24774 + struct au_dpage *dpage;
24776 + err = au_dpages_init(&dpages, GFP_ATOMIC);
24777 + if (unlikely(err))
24779 + err = au_dcsub_pages(&dpages, sb->s_root, NULL, NULL);
24781 + for (i = 0; i < dpages.ndpage; i++) {
24782 + dpage = dpages.dpages + i;
24783 + ndentry = dpage->ndentry;
24784 + for (j = 0; j < ndentry; j++)
24785 + au_dpri_dentry(dpage->dentries[j]);
24787 + au_dpages_free(&dpages);
24794 + printk(KERN_WARNING AUFS_NAME ": isolated inode\n");
24795 + spin_lock(&inode_sb_list_lock);
24796 + list_for_each_entry(i, &sb->s_inodes, i_sb_list) {
24797 + spin_lock(&i->i_lock);
24798 + if (1 || list_empty(&i->i_dentry))
24799 + au_dpri_inode(i);
24800 + spin_unlock(&i->i_lock);
24802 + spin_unlock(&inode_sb_list_lock);
24805 + printk(KERN_WARNING AUFS_NAME ": files\n");
24806 + lg_global_lock(files_lglock);
24807 + do_file_list_for_each_entry(sb, file) {
24809 + mode = file->f_dentry->d_inode->i_mode;
24810 + if (!special_file(mode) || au_special_file(mode))
24811 + au_dpri_file(file);
24812 + } while_file_list_for_each_entry;
24813 + lg_global_unlock(files_lglock);
24814 + printk(KERN_WARNING AUFS_NAME ": done\n");
24816 + au_plevel = plevel;
24819 +/* ---------------------------------------------------------------------- */
24821 +/* module parameter */
24822 +static char *aufs_sysrq_key = "a";
24823 +module_param_named(sysrq, aufs_sysrq_key, charp, S_IRUGO);
24824 +MODULE_PARM_DESC(sysrq, "MagicSysRq key for " AUFS_NAME);
24826 +static void au_sysrq(int key __maybe_unused)
24828 + struct au_sbinfo *sbinfo;
24831 + au_sbilist_lock();
24832 + list_for_each_entry(sbinfo, &au_sbilist.head, si_list)
24833 + sysrq_sb(sbinfo->si_sb);
24834 + au_sbilist_unlock();
24838 +static struct sysrq_key_op au_sysrq_op = {
24839 + .handler = au_sysrq,
24840 + .help_msg = "Aufs",
24841 + .action_msg = "Aufs",
24842 + .enable_mask = SYSRQ_ENABLE_DUMP
24845 +/* ---------------------------------------------------------------------- */
24847 +int __init au_sysrq_init(void)
24853 + key = *aufs_sysrq_key;
24854 + if ('a' <= key && key <= 'z')
24855 + err = register_sysrq_key(key, &au_sysrq_op);
24856 + if (unlikely(err))
24857 + pr_err("err %d, sysrq=%c\n", err, key);
24861 +void au_sysrq_fin(void)
24864 + err = unregister_sysrq_key(*aufs_sysrq_key, &au_sysrq_op);
24865 + if (unlikely(err))
24866 + pr_err("err %d (ignored)\n", err);
24868 diff -urN /usr/share/empty/fs/aufs/vdir.c linux/fs/aufs/vdir.c
24869 --- /usr/share/empty/fs/aufs/vdir.c 1970-01-01 01:00:00.000000000 +0100
24870 +++ linux/fs/aufs/vdir.c 2012-02-13 21:54:56.973105100 +0100
24873 + * Copyright (C) 2005-2012 Junjiro R. Okajima
24875 + * This program, aufs is free software; you can redistribute it and/or modify
24876 + * it under the terms of the GNU General Public License as published by
24877 + * the Free Software Foundation; either version 2 of the License, or
24878 + * (at your option) any later version.
24880 + * This program is distributed in the hope that it will be useful,
24881 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
24882 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
24883 + * GNU General Public License for more details.
24885 + * You should have received a copy of the GNU General Public License
24886 + * along with this program; if not, write to the Free Software
24887 + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
24891 + * virtual or vertical directory
24896 +static unsigned int calc_size(int nlen)
24898 + return ALIGN(sizeof(struct au_vdir_de) + nlen, sizeof(ino_t));
24901 +static int set_deblk_end(union au_vdir_deblk_p *p,
24902 + union au_vdir_deblk_p *deblk_end)
24904 + if (calc_size(0) <= deblk_end->deblk - p->deblk) {
24905 + p->de->de_str.len = 0;
24909 + return -1; /* error */
24912 +/* returns true or false */
24913 +static int is_deblk_end(union au_vdir_deblk_p *p,
24914 + union au_vdir_deblk_p *deblk_end)
24916 + if (calc_size(0) <= deblk_end->deblk - p->deblk)
24917 + return !p->de->de_str.len;
24921 +static unsigned char *last_deblk(struct au_vdir *vdir)
24923 + return vdir->vd_deblk[vdir->vd_nblk - 1];
24926 +/* ---------------------------------------------------------------------- */
24928 +/* estimate the apropriate size for name hash table */
24929 +unsigned int au_rdhash_est(loff_t sz)
24937 + if (sz < AUFS_RDHASH_DEF)
24938 + n = AUFS_RDHASH_DEF;
24939 + /* pr_info("n %u\n", n); */
24944 + * the allocated memory has to be freed by
24945 + * au_nhash_wh_free() or au_nhash_de_free().
24947 +int au_nhash_alloc(struct au_nhash *nhash, unsigned int num_hash, gfp_t gfp)
24949 + struct hlist_head *head;
24952 + head = kmalloc(sizeof(*nhash->nh_head) * num_hash, gfp);
24954 + nhash->nh_num = num_hash;
24955 + nhash->nh_head = head;
24956 + for (u = 0; u < num_hash; u++)
24957 + INIT_HLIST_HEAD(head++);
24958 + return 0; /* success */
24964 +static void nhash_count(struct hlist_head *head)
24968 + struct hlist_node *pos;
24971 + hlist_for_each(pos, head)
24973 + pr_info("%lu\n", n);
24977 +static void au_nhash_wh_do_free(struct hlist_head *head)
24979 + struct au_vdir_wh *tpos;
24980 + struct hlist_node *pos, *node;
24982 + hlist_for_each_entry_safe(tpos, pos, node, head, wh_hash) {
24983 + /* hlist_del(pos); */
24988 +static void au_nhash_de_do_free(struct hlist_head *head)
24990 + struct au_vdir_dehstr *tpos;
24991 + struct hlist_node *pos, *node;
24993 + hlist_for_each_entry_safe(tpos, pos, node, head, hash) {
24994 + /* hlist_del(pos); */
24995 + au_cache_free_vdir_dehstr(tpos);
24999 +static void au_nhash_do_free(struct au_nhash *nhash,
25000 + void (*free)(struct hlist_head *head))
25003 + struct hlist_head *head;
25005 + n = nhash->nh_num;
25009 + head = nhash->nh_head;
25010 + while (n-- > 0) {
25011 + nhash_count(head);
25014 + kfree(nhash->nh_head);
25017 +void au_nhash_wh_free(struct au_nhash *whlist)
25019 + au_nhash_do_free(whlist, au_nhash_wh_do_free);
25022 +static void au_nhash_de_free(struct au_nhash *delist)
25024 + au_nhash_do_free(delist, au_nhash_de_do_free);
25027 +/* ---------------------------------------------------------------------- */
25029 +int au_nhash_test_longer_wh(struct au_nhash *whlist, aufs_bindex_t btgt,
25033 + unsigned int u, n;
25034 + struct hlist_head *head;
25035 + struct au_vdir_wh *tpos;
25036 + struct hlist_node *pos;
25039 + n = whlist->nh_num;
25040 + head = whlist->nh_head;
25041 + for (u = 0; u < n; u++, head++)
25042 + hlist_for_each_entry(tpos, pos, head, wh_hash)
25043 + if (tpos->wh_bindex == btgt && ++num > limit)
25048 +static struct hlist_head *au_name_hash(struct au_nhash *nhash,
25049 + unsigned char *name,
25050 + unsigned int len)
25053 + /* const unsigned int magic_bit = 12; */
25055 + AuDebugOn(!nhash->nh_num || !nhash->nh_head);
25060 + /* v = hash_long(v, magic_bit); */
25061 + v %= nhash->nh_num;
25062 + return nhash->nh_head + v;
25065 +static int au_nhash_test_name(struct au_vdir_destr *str, const char *name,
25068 + return str->len == nlen && !memcmp(str->name, name, nlen);
25071 +/* returns found or not */
25072 +int au_nhash_test_known_wh(struct au_nhash *whlist, char *name, int nlen)
25074 + struct hlist_head *head;
25075 + struct au_vdir_wh *tpos;
25076 + struct hlist_node *pos;
25077 + struct au_vdir_destr *str;
25079 + head = au_name_hash(whlist, name, nlen);
25080 + hlist_for_each_entry(tpos, pos, head, wh_hash) {
25081 + str = &tpos->wh_str;
25082 + AuDbg("%.*s\n", str->len, str->name);
25083 + if (au_nhash_test_name(str, name, nlen))
25089 +/* returns found(true) or not */
25090 +static int test_known(struct au_nhash *delist, char *name, int nlen)
25092 + struct hlist_head *head;
25093 + struct au_vdir_dehstr *tpos;
25094 + struct hlist_node *pos;
25095 + struct au_vdir_destr *str;
25097 + head = au_name_hash(delist, name, nlen);
25098 + hlist_for_each_entry(tpos, pos, head, hash) {
25100 + AuDbg("%.*s\n", str->len, str->name);
25101 + if (au_nhash_test_name(str, name, nlen))
25107 +static void au_shwh_init_wh(struct au_vdir_wh *wh, ino_t ino,
25108 + unsigned char d_type)
25110 +#ifdef CONFIG_AUFS_SHWH
25111 + wh->wh_ino = ino;
25112 + wh->wh_type = d_type;
25116 +/* ---------------------------------------------------------------------- */
25118 +int au_nhash_append_wh(struct au_nhash *whlist, char *name, int nlen, ino_t ino,
25119 + unsigned int d_type, aufs_bindex_t bindex,
25120 + unsigned char shwh)
25123 + struct au_vdir_destr *str;
25124 + struct au_vdir_wh *wh;
25126 + AuDbg("%.*s\n", nlen, name);
25127 + AuDebugOn(!whlist->nh_num || !whlist->nh_head);
25130 + wh = kmalloc(sizeof(*wh) + nlen, GFP_NOFS);
25131 + if (unlikely(!wh))
25135 + wh->wh_bindex = bindex;
25137 + au_shwh_init_wh(wh, ino, d_type);
25138 + str = &wh->wh_str;
25140 + memcpy(str->name, name, nlen);
25141 + hlist_add_head(&wh->wh_hash, au_name_hash(whlist, name, nlen));
25148 +static int append_deblk(struct au_vdir *vdir)
25151 + unsigned long ul;
25152 + const unsigned int deblk_sz = vdir->vd_deblk_sz;
25153 + union au_vdir_deblk_p p, deblk_end;
25154 + unsigned char **o;
25157 + o = krealloc(vdir->vd_deblk, sizeof(*o) * (vdir->vd_nblk + 1),
25159 + if (unlikely(!o))
25162 + vdir->vd_deblk = o;
25163 + p.deblk = kmalloc(deblk_sz, GFP_NOFS);
25165 + ul = vdir->vd_nblk++;
25166 + vdir->vd_deblk[ul] = p.deblk;
25167 + vdir->vd_last.ul = ul;
25168 + vdir->vd_last.p.deblk = p.deblk;
25169 + deblk_end.deblk = p.deblk + deblk_sz;
25170 + err = set_deblk_end(&p, &deblk_end);
25177 +static int append_de(struct au_vdir *vdir, char *name, int nlen, ino_t ino,
25178 + unsigned int d_type, struct au_nhash *delist)
25182 + const unsigned int deblk_sz = vdir->vd_deblk_sz;
25183 + union au_vdir_deblk_p p, *room, deblk_end;
25184 + struct au_vdir_dehstr *dehstr;
25186 + p.deblk = last_deblk(vdir);
25187 + deblk_end.deblk = p.deblk + deblk_sz;
25188 + room = &vdir->vd_last.p;
25189 + AuDebugOn(room->deblk < p.deblk || deblk_end.deblk <= room->deblk
25190 + || !is_deblk_end(room, &deblk_end));
25192 + sz = calc_size(nlen);
25193 + if (unlikely(sz > deblk_end.deblk - room->deblk)) {
25194 + err = append_deblk(vdir);
25195 + if (unlikely(err))
25198 + p.deblk = last_deblk(vdir);
25199 + deblk_end.deblk = p.deblk + deblk_sz;
25201 + AuDebugOn(room->deblk != p.deblk);
25205 + dehstr = au_cache_alloc_vdir_dehstr();
25206 + if (unlikely(!dehstr))
25209 + dehstr->str = &room->de->de_str;
25210 + hlist_add_head(&dehstr->hash, au_name_hash(delist, name, nlen));
25211 + room->de->de_ino = ino;
25212 + room->de->de_type = d_type;
25213 + room->de->de_str.len = nlen;
25214 + memcpy(room->de->de_str.name, name, nlen);
25217 + room->deblk += sz;
25218 + if (unlikely(set_deblk_end(room, &deblk_end)))
25219 + err = append_deblk(vdir);
25226 +/* ---------------------------------------------------------------------- */
25228 +void au_vdir_free(struct au_vdir *vdir)
25230 + unsigned char **deblk;
25232 + deblk = vdir->vd_deblk;
25233 + while (vdir->vd_nblk--)
25235 + kfree(vdir->vd_deblk);
25236 + au_cache_free_vdir(vdir);
25239 +static struct au_vdir *alloc_vdir(struct file *file)
25241 + struct au_vdir *vdir;
25242 + struct super_block *sb;
25245 + sb = file->f_dentry->d_sb;
25246 + SiMustAnyLock(sb);
25249 + vdir = au_cache_alloc_vdir();
25250 + if (unlikely(!vdir))
25253 + vdir->vd_deblk = kzalloc(sizeof(*vdir->vd_deblk), GFP_NOFS);
25254 + if (unlikely(!vdir->vd_deblk))
25257 + vdir->vd_deblk_sz = au_sbi(sb)->si_rdblk;
25258 + if (!vdir->vd_deblk_sz) {
25259 + /* estimate the apropriate size for deblk */
25260 + vdir->vd_deblk_sz = au_dir_size(file, /*dentry*/NULL);
25261 + /* pr_info("vd_deblk_sz %u\n", vdir->vd_deblk_sz); */
25263 + vdir->vd_nblk = 0;
25264 + vdir->vd_version = 0;
25265 + vdir->vd_jiffy = 0;
25266 + err = append_deblk(vdir);
25268 + return vdir; /* success */
25270 + kfree(vdir->vd_deblk);
25273 + au_cache_free_vdir(vdir);
25275 + vdir = ERR_PTR(err);
25279 +static int reinit_vdir(struct au_vdir *vdir)
25282 + union au_vdir_deblk_p p, deblk_end;
25284 + while (vdir->vd_nblk > 1) {
25285 + kfree(vdir->vd_deblk[vdir->vd_nblk - 1]);
25286 + /* vdir->vd_deblk[vdir->vd_nblk - 1] = NULL; */
25289 + p.deblk = vdir->vd_deblk[0];
25290 + deblk_end.deblk = p.deblk + vdir->vd_deblk_sz;
25291 + err = set_deblk_end(&p, &deblk_end);
25292 + /* keep vd_dblk_sz */
25293 + vdir->vd_last.ul = 0;
25294 + vdir->vd_last.p.deblk = vdir->vd_deblk[0];
25295 + vdir->vd_version = 0;
25296 + vdir->vd_jiffy = 0;
25301 +/* ---------------------------------------------------------------------- */
25303 +#define AuFillVdir_CALLED 1
25304 +#define AuFillVdir_WHABLE (1 << 1)
25305 +#define AuFillVdir_SHWH (1 << 2)
25306 +#define au_ftest_fillvdir(flags, name) ((flags) & AuFillVdir_##name)
25307 +#define au_fset_fillvdir(flags, name) \
25308 + do { (flags) |= AuFillVdir_##name; } while (0)
25309 +#define au_fclr_fillvdir(flags, name) \
25310 + do { (flags) &= ~AuFillVdir_##name; } while (0)
25312 +#ifndef CONFIG_AUFS_SHWH
25313 +#undef AuFillVdir_SHWH
25314 +#define AuFillVdir_SHWH 0
25317 +struct fillvdir_arg {
25318 + struct file *file;
25319 + struct au_vdir *vdir;
25320 + struct au_nhash delist;
25321 + struct au_nhash whlist;
25322 + aufs_bindex_t bindex;
25323 + unsigned int flags;
25327 +static int fillvdir(void *__arg, const char *__name, int nlen,
25328 + loff_t offset __maybe_unused, u64 h_ino,
25329 + unsigned int d_type)
25331 + struct fillvdir_arg *arg = __arg;
25332 + char *name = (void *)__name;
25333 + struct super_block *sb;
25335 + const unsigned char shwh = !!au_ftest_fillvdir(arg->flags, SHWH);
25338 + sb = arg->file->f_dentry->d_sb;
25339 + au_fset_fillvdir(arg->flags, CALLED);
25341 + if (nlen <= AUFS_WH_PFX_LEN
25342 + || memcmp(name, AUFS_WH_PFX, AUFS_WH_PFX_LEN)) {
25343 + if (test_known(&arg->delist, name, nlen)
25344 + || au_nhash_test_known_wh(&arg->whlist, name, nlen))
25345 + goto out; /* already exists or whiteouted */
25347 + sb = arg->file->f_dentry->d_sb;
25348 + arg->err = au_ino(sb, arg->bindex, h_ino, d_type, &ino);
25350 + if (unlikely(nlen > AUFS_MAX_NAMELEN))
25351 + d_type = DT_UNKNOWN;
25352 + arg->err = append_de(arg->vdir, name, nlen, ino,
25353 + d_type, &arg->delist);
25355 + } else if (au_ftest_fillvdir(arg->flags, WHABLE)) {
25356 + name += AUFS_WH_PFX_LEN;
25357 + nlen -= AUFS_WH_PFX_LEN;
25358 + if (au_nhash_test_known_wh(&arg->whlist, name, nlen))
25359 + goto out; /* already whiteouted */
25362 + arg->err = au_wh_ino(sb, arg->bindex, h_ino, d_type,
25365 + if (nlen <= AUFS_MAX_NAMELEN + AUFS_WH_PFX_LEN)
25366 + d_type = DT_UNKNOWN;
25367 + arg->err = au_nhash_append_wh
25368 + (&arg->whlist, name, nlen, ino, d_type,
25369 + arg->bindex, shwh);
25375 + arg->vdir->vd_jiffy = jiffies;
25377 + AuTraceErr(arg->err);
25381 +static int au_handle_shwh(struct super_block *sb, struct au_vdir *vdir,
25382 + struct au_nhash *whlist, struct au_nhash *delist)
25384 +#ifdef CONFIG_AUFS_SHWH
25386 + unsigned int nh, u;
25387 + struct hlist_head *head;
25388 + struct au_vdir_wh *tpos;
25389 + struct hlist_node *pos, *n;
25391 + struct au_vdir_destr *destr;
25393 + AuDebugOn(!au_opt_test(au_mntflags(sb), SHWH));
25396 + o = p = __getname_gfp(GFP_NOFS);
25397 + if (unlikely(!p))
25401 + nh = whlist->nh_num;
25402 + memcpy(p, AUFS_WH_PFX, AUFS_WH_PFX_LEN);
25403 + p += AUFS_WH_PFX_LEN;
25404 + for (u = 0; u < nh; u++) {
25405 + head = whlist->nh_head + u;
25406 + hlist_for_each_entry_safe(tpos, pos, n, head, wh_hash) {
25407 + destr = &tpos->wh_str;
25408 + memcpy(p, destr->name, destr->len);
25409 + err = append_de(vdir, o, destr->len + AUFS_WH_PFX_LEN,
25410 + tpos->wh_ino, tpos->wh_type, delist);
25411 + if (unlikely(err))
25426 +static int au_do_read_vdir(struct fillvdir_arg *arg)
25429 + unsigned int rdhash;
25431 + aufs_bindex_t bend, bindex, bstart;
25432 + unsigned char shwh;
25433 + struct file *hf, *file;
25434 + struct super_block *sb;
25436 + file = arg->file;
25437 + sb = file->f_dentry->d_sb;
25438 + SiMustAnyLock(sb);
25440 + rdhash = au_sbi(sb)->si_rdhash;
25442 + rdhash = au_rdhash_est(au_dir_size(file, /*dentry*/NULL));
25443 + err = au_nhash_alloc(&arg->delist, rdhash, GFP_NOFS);
25444 + if (unlikely(err))
25446 + err = au_nhash_alloc(&arg->whlist, rdhash, GFP_NOFS);
25447 + if (unlikely(err))
25453 + if (au_opt_test(au_mntflags(sb), SHWH)) {
25455 + au_fset_fillvdir(arg->flags, SHWH);
25457 + bstart = au_fbstart(file);
25458 + bend = au_fbend_dir(file);
25459 + for (bindex = bstart; !err && bindex <= bend; bindex++) {
25460 + hf = au_hf_dir(file, bindex);
25464 + offset = vfsub_llseek(hf, 0, SEEK_SET);
25466 + if (unlikely(offset))
25469 + arg->bindex = bindex;
25470 + au_fclr_fillvdir(arg->flags, WHABLE);
25472 + || (bindex != bend
25473 + && au_br_whable(au_sbr_perm(sb, bindex))))
25474 + au_fset_fillvdir(arg->flags, WHABLE);
25477 + au_fclr_fillvdir(arg->flags, CALLED);
25479 + err = vfsub_readdir(hf, fillvdir, arg);
25482 + } while (!err && au_ftest_fillvdir(arg->flags, CALLED));
25485 + if (!err && shwh)
25486 + err = au_handle_shwh(sb, arg->vdir, &arg->whlist, &arg->delist);
25488 + au_nhash_wh_free(&arg->whlist);
25491 + au_nhash_de_free(&arg->delist);
25496 +static int read_vdir(struct file *file, int may_read)
25499 + unsigned long expire;
25500 + unsigned char do_read;
25501 + struct fillvdir_arg arg;
25502 + struct inode *inode;
25503 + struct au_vdir *vdir, *allocated;
25506 + inode = file->f_dentry->d_inode;
25507 + IMustLock(inode);
25508 + SiMustAnyLock(inode->i_sb);
25510 + allocated = NULL;
25512 + expire = au_sbi(inode->i_sb)->si_rdcache;
25513 + vdir = au_ivdir(inode);
25516 + vdir = alloc_vdir(file);
25517 + err = PTR_ERR(vdir);
25518 + if (IS_ERR(vdir))
25521 + allocated = vdir;
25522 + } else if (may_read
25523 + && (inode->i_version != vdir->vd_version
25524 + || time_after(jiffies, vdir->vd_jiffy + expire))) {
25526 + err = reinit_vdir(vdir);
25527 + if (unlikely(err))
25532 + return 0; /* success */
25536 + err = au_do_read_vdir(&arg);
25538 + /* file->f_pos = 0; */
25539 + vdir->vd_version = inode->i_version;
25540 + vdir->vd_last.ul = 0;
25541 + vdir->vd_last.p.deblk = vdir->vd_deblk[0];
25543 + au_set_ivdir(inode, allocated);
25544 + } else if (allocated)
25545 + au_vdir_free(allocated);
25551 +static int copy_vdir(struct au_vdir *tgt, struct au_vdir *src)
25554 + unsigned long ul, n;
25555 + const unsigned int deblk_sz = src->vd_deblk_sz;
25557 + AuDebugOn(tgt->vd_nblk != 1);
25560 + if (tgt->vd_nblk < src->vd_nblk) {
25561 + unsigned char **p;
25563 + p = krealloc(tgt->vd_deblk, sizeof(*p) * src->vd_nblk,
25565 + if (unlikely(!p))
25567 + tgt->vd_deblk = p;
25570 + if (tgt->vd_deblk_sz != deblk_sz) {
25571 + unsigned char *p;
25573 + tgt->vd_deblk_sz = deblk_sz;
25574 + p = krealloc(tgt->vd_deblk[0], deblk_sz, GFP_NOFS);
25575 + if (unlikely(!p))
25577 + tgt->vd_deblk[0] = p;
25579 + memcpy(tgt->vd_deblk[0], src->vd_deblk[0], deblk_sz);
25580 + tgt->vd_version = src->vd_version;
25581 + tgt->vd_jiffy = src->vd_jiffy;
25583 + n = src->vd_nblk;
25584 + for (ul = 1; ul < n; ul++) {
25585 + tgt->vd_deblk[ul] = kmemdup(src->vd_deblk[ul], deblk_sz,
25587 + if (unlikely(!tgt->vd_deblk[ul]))
25591 + tgt->vd_nblk = n;
25592 + tgt->vd_last.ul = tgt->vd_last.ul;
25593 + tgt->vd_last.p.deblk = tgt->vd_deblk[tgt->vd_last.ul];
25594 + tgt->vd_last.p.deblk += src->vd_last.p.deblk
25595 + - src->vd_deblk[src->vd_last.ul];
25597 + return 0; /* success */
25600 + rerr = reinit_vdir(tgt);
25605 +int au_vdir_init(struct file *file)
25608 + struct inode *inode;
25609 + struct au_vdir *vdir_cache, *allocated;
25611 + err = read_vdir(file, !file->f_pos);
25612 + if (unlikely(err))
25615 + allocated = NULL;
25616 + vdir_cache = au_fvdir_cache(file);
25617 + if (!vdir_cache) {
25618 + vdir_cache = alloc_vdir(file);
25619 + err = PTR_ERR(vdir_cache);
25620 + if (IS_ERR(vdir_cache))
25622 + allocated = vdir_cache;
25623 + } else if (!file->f_pos && vdir_cache->vd_version != file->f_version) {
25624 + err = reinit_vdir(vdir_cache);
25625 + if (unlikely(err))
25628 + return 0; /* success */
25630 + inode = file->f_dentry->d_inode;
25631 + err = copy_vdir(vdir_cache, au_ivdir(inode));
25633 + file->f_version = inode->i_version;
25635 + au_set_fvdir_cache(file, allocated);
25636 + } else if (allocated)
25637 + au_vdir_free(allocated);
25643 +static loff_t calc_offset(struct au_vdir *vdir)
25646 + union au_vdir_deblk_p p;
25648 + p.deblk = vdir->vd_deblk[vdir->vd_last.ul];
25649 + offset = vdir->vd_last.p.deblk - p.deblk;
25650 + offset += vdir->vd_deblk_sz * vdir->vd_last.ul;
25654 +/* returns true or false */
25655 +static int seek_vdir(struct file *file)
25658 + unsigned int deblk_sz;
25659 + unsigned long ul, n;
25661 + union au_vdir_deblk_p p, deblk_end;
25662 + struct au_vdir *vdir_cache;
25665 + vdir_cache = au_fvdir_cache(file);
25666 + offset = calc_offset(vdir_cache);
25667 + AuDbg("offset %lld\n", offset);
25668 + if (file->f_pos == offset)
25671 + vdir_cache->vd_last.ul = 0;
25672 + vdir_cache->vd_last.p.deblk = vdir_cache->vd_deblk[0];
25673 + if (!file->f_pos)
25677 + deblk_sz = vdir_cache->vd_deblk_sz;
25678 + ul = div64_u64(file->f_pos, deblk_sz);
25679 + AuDbg("ul %lu\n", ul);
25680 + if (ul >= vdir_cache->vd_nblk)
25683 + n = vdir_cache->vd_nblk;
25684 + for (; ul < n; ul++) {
25685 + p.deblk = vdir_cache->vd_deblk[ul];
25686 + deblk_end.deblk = p.deblk + deblk_sz;
25688 + offset *= deblk_sz;
25689 + while (!is_deblk_end(&p, &deblk_end) && offset < file->f_pos) {
25692 + l = calc_size(p.de->de_str.len);
25696 + if (!is_deblk_end(&p, &deblk_end)) {
25698 + vdir_cache->vd_last.ul = ul;
25699 + vdir_cache->vd_last.p = p;
25706 + AuTraceErr(!valid);
25710 +int au_vdir_fill_de(struct file *file, void *dirent, filldir_t filldir)
25713 + unsigned int l, deblk_sz;
25714 + union au_vdir_deblk_p deblk_end;
25715 + struct au_vdir *vdir_cache;
25716 + struct au_vdir_de *de;
25718 + vdir_cache = au_fvdir_cache(file);
25719 + if (!seek_vdir(file))
25722 + deblk_sz = vdir_cache->vd_deblk_sz;
25724 + deblk_end.deblk = vdir_cache->vd_deblk[vdir_cache->vd_last.ul];
25725 + deblk_end.deblk += deblk_sz;
25726 + while (!is_deblk_end(&vdir_cache->vd_last.p, &deblk_end)) {
25727 + de = vdir_cache->vd_last.p.de;
25728 + AuDbg("%.*s, off%lld, i%lu, dt%d\n",
25729 + de->de_str.len, de->de_str.name, file->f_pos,
25730 + (unsigned long)de->de_ino, de->de_type);
25731 + err = filldir(dirent, de->de_str.name, de->de_str.len,
25732 + file->f_pos, de->de_ino, de->de_type);
25733 + if (unlikely(err)) {
25735 + /* todo: ignore the error caused by udba? */
25736 + /* return err; */
25740 + l = calc_size(de->de_str.len);
25741 + vdir_cache->vd_last.p.deblk += l;
25742 + file->f_pos += l;
25744 + if (vdir_cache->vd_last.ul < vdir_cache->vd_nblk - 1) {
25745 + vdir_cache->vd_last.ul++;
25746 + vdir_cache->vd_last.p.deblk
25747 + = vdir_cache->vd_deblk[vdir_cache->vd_last.ul];
25748 + file->f_pos = deblk_sz * vdir_cache->vd_last.ul;
25757 diff -urN /usr/share/empty/fs/aufs/vfsub.c linux/fs/aufs/vfsub.c
25758 --- /usr/share/empty/fs/aufs/vfsub.c 1970-01-01 01:00:00.000000000 +0100
25759 +++ linux/fs/aufs/vfsub.c 2012-02-13 21:54:56.973105100 +0100
25762 + * Copyright (C) 2005-2012 Junjiro R. Okajima
25764 + * This program, aufs is free software; you can redistribute it and/or modify
25765 + * it under the terms of the GNU General Public License as published by
25766 + * the Free Software Foundation; either version 2 of the License, or
25767 + * (at your option) any later version.
25769 + * This program is distributed in the hope that it will be useful,
25770 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
25771 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
25772 + * GNU General Public License for more details.
25774 + * You should have received a copy of the GNU General Public License
25775 + * along with this program; if not, write to the Free Software
25776 + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
25780 + * sub-routines for VFS
25783 +#include <linux/ima.h>
25784 +#include <linux/namei.h>
25785 +#include <linux/security.h>
25786 +#include <linux/splice.h>
25789 +int vfsub_update_h_iattr(struct path *h_path, int *did)
25793 + struct super_block *h_sb;
25795 + /* for remote fs, leave work for its getattr or d_revalidate */
25796 + /* for bad i_attr fs, handle them in aufs_getattr() */
25797 + /* still some fs may acquire i_mutex. we need to skip them */
25801 + h_sb = h_path->dentry->d_sb;
25802 + *did = (!au_test_fs_remote(h_sb) && au_test_fs_refresh_iattr(h_sb));
25804 + err = vfs_getattr(h_path->mnt, h_path->dentry, &st);
25809 +/* ---------------------------------------------------------------------- */
25811 +struct file *vfsub_dentry_open(struct path *path, int flags)
25813 + struct file *file;
25816 + file = dentry_open(path->dentry, path->mnt,
25817 + flags /* | __FMODE_NONOTIFY */,
25819 + if (!IS_ERR_OR_NULL(file)
25820 + && (file->f_mode & (FMODE_READ | FMODE_WRITE)) == FMODE_READ)
25821 + i_readcount_inc(path->dentry->d_inode);
25826 +struct file *vfsub_filp_open(const char *path, int oflags, int mode)
25828 + struct file *file;
25831 + file = filp_open(path,
25832 + oflags /* | __FMODE_NONOTIFY */,
25835 + if (IS_ERR(file))
25837 + vfsub_update_h_iattr(&file->f_path, /*did*/NULL); /*ignore*/
25843 +int vfsub_kern_path(const char *name, unsigned int flags, struct path *path)
25847 + err = kern_path(name, flags, path);
25848 + if (!err && path->dentry->d_inode)
25849 + vfsub_update_h_iattr(path, /*did*/NULL); /*ignore*/
25853 +struct dentry *vfsub_lookup_one_len(const char *name, struct dentry *parent,
25856 + struct path path = {
25860 + /* VFS checks it too, but by WARN_ON_ONCE() */
25861 + IMustLock(parent->d_inode);
25863 + path.dentry = lookup_one_len(name, parent, len);
25864 + if (IS_ERR(path.dentry))
25866 + if (path.dentry->d_inode)
25867 + vfsub_update_h_iattr(&path, /*did*/NULL); /*ignore*/
25870 + AuTraceErrPtr(path.dentry);
25871 + return path.dentry;
25874 +struct dentry *vfsub_lookup_hash(struct nameidata *nd)
25876 + struct path path = {
25877 + .mnt = nd->path.mnt
25880 + IMustLock(nd->path.dentry->d_inode);
25882 + path.dentry = lookup_hash(nd);
25883 + if (IS_ERR(path.dentry))
25885 + if (path.dentry->d_inode)
25886 + vfsub_update_h_iattr(&path, /*did*/NULL); /*ignore*/
25889 + AuTraceErrPtr(path.dentry);
25890 + return path.dentry;
25894 + * this is "VFS:__lookup_one_len()" which was removed and merged into
25895 + * VFS:lookup_one_len() by the commit.
25896 + * 6a96ba5 2011-03-14 kill __lookup_one_len()
25897 + * this function should always be equivalent to the corresponding part in
25898 + * VFS:lookup_one_len().
25900 +int vfsub_name_hash(const char *name, struct qstr *this, int len)
25902 + unsigned long hash;
25905 + this->name = name;
25910 + hash = init_name_hash();
25912 + c = *(const unsigned char *)name++;
25913 + if (c == '/' || c == '\0')
25915 + hash = partial_name_hash(c, hash);
25917 + this->hash = end_name_hash(hash);
25921 +/* ---------------------------------------------------------------------- */
25923 +struct dentry *vfsub_lock_rename(struct dentry *d1, struct au_hinode *hdir1,
25924 + struct dentry *d2, struct au_hinode *hdir2)
25926 + struct dentry *d;
25929 + d = lock_rename(d1, d2);
25931 + au_hn_suspend(hdir1);
25932 + if (hdir1 != hdir2)
25933 + au_hn_suspend(hdir2);
25938 +void vfsub_unlock_rename(struct dentry *d1, struct au_hinode *hdir1,
25939 + struct dentry *d2, struct au_hinode *hdir2)
25941 + au_hn_resume(hdir1);
25942 + if (hdir1 != hdir2)
25943 + au_hn_resume(hdir2);
25945 + unlock_rename(d1, d2);
25949 +/* ---------------------------------------------------------------------- */
25951 +int vfsub_create(struct inode *dir, struct path *path, int mode)
25954 + struct dentry *d;
25958 + d = path->dentry;
25959 + path->dentry = d->d_parent;
25960 + err = security_path_mknod(path, d, mode, 0);
25961 + path->dentry = d;
25962 + if (unlikely(err))
25965 + if (au_test_fs_null_nd(dir->i_sb))
25966 + err = vfs_create(dir, path->dentry, mode, NULL);
25968 + struct nameidata h_nd;
25970 + memset(&h_nd, 0, sizeof(h_nd));
25971 + h_nd.flags = LOOKUP_CREATE;
25972 + h_nd.intent.open.flags = O_CREAT
25973 + | vfsub_fmode_to_uint(FMODE_READ);
25974 + h_nd.intent.open.create_mode = mode;
25975 + h_nd.path.dentry = path->dentry->d_parent;
25976 + h_nd.path.mnt = path->mnt;
25977 + path_get(&h_nd.path);
25978 + err = vfs_create(dir, path->dentry, mode, &h_nd);
25979 + path_put(&h_nd.path);
25983 + struct path tmp = *path;
25986 + vfsub_update_h_iattr(&tmp, &did);
25988 + tmp.dentry = path->dentry->d_parent;
25989 + vfsub_update_h_iattr(&tmp, /*did*/NULL);
25998 +int vfsub_symlink(struct inode *dir, struct path *path, const char *symname)
26001 + struct dentry *d;
26005 + d = path->dentry;
26006 + path->dentry = d->d_parent;
26007 + err = security_path_symlink(path, d, symname);
26008 + path->dentry = d;
26009 + if (unlikely(err))
26012 + err = vfs_symlink(dir, path->dentry, symname);
26014 + struct path tmp = *path;
26017 + vfsub_update_h_iattr(&tmp, &did);
26019 + tmp.dentry = path->dentry->d_parent;
26020 + vfsub_update_h_iattr(&tmp, /*did*/NULL);
26029 +int vfsub_mknod(struct inode *dir, struct path *path, int mode, dev_t dev)
26032 + struct dentry *d;
26036 + d = path->dentry;
26037 + path->dentry = d->d_parent;
26038 + err = security_path_mknod(path, d, mode, new_encode_dev(dev));
26039 + path->dentry = d;
26040 + if (unlikely(err))
26043 + err = vfs_mknod(dir, path->dentry, mode, dev);
26045 + struct path tmp = *path;
26048 + vfsub_update_h_iattr(&tmp, &did);
26050 + tmp.dentry = path->dentry->d_parent;
26051 + vfsub_update_h_iattr(&tmp, /*did*/NULL);
26060 +static int au_test_nlink(struct inode *inode)
26062 + const unsigned int link_max = UINT_MAX >> 1; /* rough margin */
26064 + if (!au_test_fs_no_limit_nlink(inode->i_sb)
26065 + || inode->i_nlink < link_max)
26070 +int vfsub_link(struct dentry *src_dentry, struct inode *dir, struct path *path)
26073 + struct dentry *d;
26077 + err = au_test_nlink(src_dentry->d_inode);
26078 + if (unlikely(err))
26081 + d = path->dentry;
26082 + path->dentry = d->d_parent;
26083 + err = security_path_link(src_dentry, path, d);
26084 + path->dentry = d;
26085 + if (unlikely(err))
26089 + err = vfs_link(src_dentry, dir, path->dentry);
26092 + struct path tmp = *path;
26095 + /* fuse has different memory inode for the same inumber */
26096 + vfsub_update_h_iattr(&tmp, &did);
26098 + tmp.dentry = path->dentry->d_parent;
26099 + vfsub_update_h_iattr(&tmp, /*did*/NULL);
26100 + tmp.dentry = src_dentry;
26101 + vfsub_update_h_iattr(&tmp, /*did*/NULL);
26110 +int vfsub_rename(struct inode *src_dir, struct dentry *src_dentry,
26111 + struct inode *dir, struct path *path)
26114 + struct path tmp = {
26117 + struct dentry *d;
26120 + IMustLock(src_dir);
26122 + d = path->dentry;
26123 + path->dentry = d->d_parent;
26124 + tmp.dentry = src_dentry->d_parent;
26125 + err = security_path_rename(&tmp, src_dentry, path, d);
26126 + path->dentry = d;
26127 + if (unlikely(err))
26131 + err = vfs_rename(src_dir, src_dentry, dir, path->dentry);
26136 + tmp.dentry = d->d_parent;
26137 + vfsub_update_h_iattr(&tmp, &did);
26139 + tmp.dentry = src_dentry;
26140 + vfsub_update_h_iattr(&tmp, /*did*/NULL);
26141 + tmp.dentry = src_dentry->d_parent;
26142 + vfsub_update_h_iattr(&tmp, /*did*/NULL);
26151 +int vfsub_mkdir(struct inode *dir, struct path *path, int mode)
26154 + struct dentry *d;
26158 + d = path->dentry;
26159 + path->dentry = d->d_parent;
26160 + err = security_path_mkdir(path, d, mode);
26161 + path->dentry = d;
26162 + if (unlikely(err))
26165 + err = vfs_mkdir(dir, path->dentry, mode);
26167 + struct path tmp = *path;
26170 + vfsub_update_h_iattr(&tmp, &did);
26172 + tmp.dentry = path->dentry->d_parent;
26173 + vfsub_update_h_iattr(&tmp, /*did*/NULL);
26182 +int vfsub_rmdir(struct inode *dir, struct path *path)
26185 + struct dentry *d;
26189 + d = path->dentry;
26190 + path->dentry = d->d_parent;
26191 + err = security_path_rmdir(path, d);
26192 + path->dentry = d;
26193 + if (unlikely(err))
26197 + err = vfs_rmdir(dir, path->dentry);
26200 + struct path tmp = {
26201 + .dentry = path->dentry->d_parent,
26205 + vfsub_update_h_iattr(&tmp, /*did*/NULL); /*ignore*/
26212 +/* ---------------------------------------------------------------------- */
26214 +/* todo: support mmap_sem? */
26215 +ssize_t vfsub_read_u(struct file *file, char __user *ubuf, size_t count,
26221 + err = vfs_read(file, ubuf, count, ppos);
26224 + vfsub_update_h_iattr(&file->f_path, /*did*/NULL); /*ignore*/
26228 +/* todo: kernel_read()? */
26229 +ssize_t vfsub_read_k(struct file *file, void *kbuf, size_t count,
26233 + mm_segment_t oldfs;
26240 + oldfs = get_fs();
26241 + set_fs(KERNEL_DS);
26242 + err = vfsub_read_u(file, buf.u, count, ppos);
26247 +ssize_t vfsub_write_u(struct file *file, const char __user *ubuf, size_t count,
26253 + err = vfs_write(file, ubuf, count, ppos);
26256 + vfsub_update_h_iattr(&file->f_path, /*did*/NULL); /*ignore*/
26260 +ssize_t vfsub_write_k(struct file *file, void *kbuf, size_t count, loff_t *ppos)
26263 + mm_segment_t oldfs;
26266 + const char __user *u;
26270 + oldfs = get_fs();
26271 + set_fs(KERNEL_DS);
26272 + err = vfsub_write_u(file, buf.u, count, ppos);
26277 +int vfsub_flush(struct file *file, fl_owner_t id)
26282 + if (file->f_op && file->f_op->flush) {
26283 + if (!au_test_nfs(file->f_dentry->d_sb))
26284 + err = file->f_op->flush(file, id);
26287 + err = file->f_op->flush(file, id);
26291 + vfsub_update_h_iattr(&file->f_path, /*did*/NULL);
26297 +int vfsub_readdir(struct file *file, filldir_t filldir, void *arg)
26302 + err = vfs_readdir(file, filldir, arg);
26305 + vfsub_update_h_iattr(&file->f_path, /*did*/NULL); /*ignore*/
26309 +long vfsub_splice_to(struct file *in, loff_t *ppos,
26310 + struct pipe_inode_info *pipe, size_t len,
26311 + unsigned int flags)
26316 + err = do_splice_to(in, ppos, pipe, len, flags);
26318 + file_accessed(in);
26320 + vfsub_update_h_iattr(&in->f_path, /*did*/NULL); /*ignore*/
26324 +long vfsub_splice_from(struct pipe_inode_info *pipe, struct file *out,
26325 + loff_t *ppos, size_t len, unsigned int flags)
26330 + err = do_splice_from(pipe, out, ppos, len, flags);
26333 + vfsub_update_h_iattr(&out->f_path, /*did*/NULL); /*ignore*/
26337 +int vfsub_fsync(struct file *file, struct path *path, int datasync)
26341 + /* file can be NULL */
26343 + err = vfs_fsync(file, datasync);
26347 + AuDebugOn(!file);
26348 + path = &file->f_path;
26350 + vfsub_update_h_iattr(path, /*did*/NULL); /*ignore*/
26355 +/* cf. open.c:do_sys_truncate() and do_sys_ftruncate() */
26356 +int vfsub_trunc(struct path *h_path, loff_t length, unsigned int attr,
26357 + struct file *h_file)
26360 + struct inode *h_inode;
26362 + h_inode = h_path->dentry->d_inode;
26364 + err = mnt_want_write(h_path->mnt);
26367 + err = inode_permission(h_inode, MAY_WRITE);
26370 + err = get_write_access(h_inode);
26373 + err = break_lease(h_inode, O_WRONLY);
26378 + err = locks_verify_truncate(h_inode, h_file, length);
26380 + err = security_path_truncate(h_path);
26383 + err = do_truncate(h_path->dentry, length, attr, h_file);
26389 + put_write_access(h_inode);
26392 + mnt_drop_write(h_path->mnt);
26397 +/* ---------------------------------------------------------------------- */
26399 +struct au_vfsub_mkdir_args {
26401 + struct inode *dir;
26402 + struct path *path;
26406 +static void au_call_vfsub_mkdir(void *args)
26408 + struct au_vfsub_mkdir_args *a = args;
26409 + *a->errp = vfsub_mkdir(a->dir, a->path, a->mode);
26412 +int vfsub_sio_mkdir(struct inode *dir, struct path *path, int mode)
26414 + int err, do_sio, wkq_err;
26416 + do_sio = au_test_h_perm_sio(dir, MAY_EXEC | MAY_WRITE);
26418 + err = vfsub_mkdir(dir, path, mode);
26420 + struct au_vfsub_mkdir_args args = {
26426 + wkq_err = au_wkq_wait(au_call_vfsub_mkdir, &args);
26427 + if (unlikely(wkq_err))
26434 +struct au_vfsub_rmdir_args {
26436 + struct inode *dir;
26437 + struct path *path;
26440 +static void au_call_vfsub_rmdir(void *args)
26442 + struct au_vfsub_rmdir_args *a = args;
26443 + *a->errp = vfsub_rmdir(a->dir, a->path);
26446 +int vfsub_sio_rmdir(struct inode *dir, struct path *path)
26448 + int err, do_sio, wkq_err;
26450 + do_sio = au_test_h_perm_sio(dir, MAY_EXEC | MAY_WRITE);
26452 + err = vfsub_rmdir(dir, path);
26454 + struct au_vfsub_rmdir_args args = {
26459 + wkq_err = au_wkq_wait(au_call_vfsub_rmdir, &args);
26460 + if (unlikely(wkq_err))
26467 +/* ---------------------------------------------------------------------- */
26469 +struct notify_change_args {
26471 + struct path *path;
26472 + struct iattr *ia;
26475 +static void call_notify_change(void *args)
26477 + struct notify_change_args *a = args;
26478 + struct inode *h_inode;
26480 + h_inode = a->path->dentry->d_inode;
26481 + IMustLock(h_inode);
26483 + *a->errp = -EPERM;
26484 + if (!IS_IMMUTABLE(h_inode) && !IS_APPEND(h_inode)) {
26485 + *a->errp = notify_change(a->path->dentry, a->ia);
26487 + vfsub_update_h_iattr(a->path, /*did*/NULL); /*ignore*/
26489 + AuTraceErr(*a->errp);
26492 +int vfsub_notify_change(struct path *path, struct iattr *ia)
26495 + struct notify_change_args args = {
26501 + call_notify_change(&args);
26506 +int vfsub_sio_notify_change(struct path *path, struct iattr *ia)
26508 + int err, wkq_err;
26509 + struct notify_change_args args = {
26515 + wkq_err = au_wkq_wait(call_notify_change, &args);
26516 + if (unlikely(wkq_err))
26522 +/* ---------------------------------------------------------------------- */
26524 +struct unlink_args {
26526 + struct inode *dir;
26527 + struct path *path;
26530 +static void call_unlink(void *args)
26532 + struct unlink_args *a = args;
26533 + struct dentry *d = a->path->dentry;
26534 + struct inode *h_inode;
26535 + const int stop_sillyrename = (au_test_nfs(d->d_sb)
26536 + && d->d_count == 1);
26538 + IMustLock(a->dir);
26540 + a->path->dentry = d->d_parent;
26541 + *a->errp = security_path_unlink(a->path, d);
26542 + a->path->dentry = d;
26543 + if (unlikely(*a->errp))
26546 + if (!stop_sillyrename)
26548 + h_inode = d->d_inode;
26553 + *a->errp = vfs_unlink(a->dir, d);
26556 + struct path tmp = {
26557 + .dentry = d->d_parent,
26558 + .mnt = a->path->mnt
26560 + vfsub_update_h_iattr(&tmp, /*did*/NULL); /*ignore*/
26563 + if (!stop_sillyrename)
26568 + AuTraceErr(*a->errp);
26572 + * @dir: must be locked.
26573 + * @dentry: target dentry.
26575 +int vfsub_unlink(struct inode *dir, struct path *path, int force)
26578 + struct unlink_args args = {
26585 + call_unlink(&args);
26589 + wkq_err = au_wkq_wait(call_unlink, &args);
26590 + if (unlikely(wkq_err))
26596 diff -urN /usr/share/empty/fs/aufs/vfsub.h linux/fs/aufs/vfsub.h
26597 --- /usr/share/empty/fs/aufs/vfsub.h 1970-01-01 01:00:00.000000000 +0100
26598 +++ linux/fs/aufs/vfsub.h 2012-02-13 21:54:56.973105100 +0100
26601 + * Copyright (C) 2005-2012 Junjiro R. Okajima
26603 + * This program, aufs is free software; you can redistribute it and/or modify
26604 + * it under the terms of the GNU General Public License as published by
26605 + * the Free Software Foundation; either version 2 of the License, or
26606 + * (at your option) any later version.
26608 + * This program is distributed in the hope that it will be useful,
26609 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
26610 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
26611 + * GNU General Public License for more details.
26613 + * You should have received a copy of the GNU General Public License
26614 + * along with this program; if not, write to the Free Software
26615 + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
26619 + * sub-routines for VFS
26622 +#ifndef __AUFS_VFSUB_H__
26623 +#define __AUFS_VFSUB_H__
26627 +#include <linux/fs.h>
26628 +#include <linux/lglock.h>
26629 +#include "debug.h"
26631 +/* copied from linux/fs/internal.h */
26632 +/* todo: BAD approach!! */
26633 +DECLARE_BRLOCK(vfsmount_lock);
26634 +extern void file_sb_list_del(struct file *f);
26635 +extern spinlock_t inode_sb_list_lock;
26637 +/* copied from linux/fs/file_table.c */
26638 +DECLARE_LGLOCK(files_lglock);
26641 + * These macros iterate all files on all CPUs for a given superblock.
26642 + * files_lglock must be held globally.
26644 +#define do_file_list_for_each_entry(__sb, __file) \
26647 + for_each_possible_cpu(i) { \
26648 + struct list_head *list; \
26649 + list = per_cpu_ptr((__sb)->s_files, i); \
26650 + list_for_each_entry((__file), list, f_u.fu_list)
26652 +#define while_file_list_for_each_entry \
26658 +#define do_file_list_for_each_entry(__sb, __file) \
26660 + struct list_head *list; \
26661 + list = &(sb)->s_files; \
26662 + list_for_each_entry((__file), list, f_u.fu_list)
26664 +#define while_file_list_for_each_entry \
26668 +/* ---------------------------------------------------------------------- */
26670 +/* lock subclass for lower inode */
26671 +/* default MAX_LOCKDEP_SUBCLASSES(8) is not enough */
26672 +/* reduce? gave up. */
26674 + AuLsc_I_Begin = I_MUTEX_QUOTA, /* 4 */
26675 + AuLsc_I_PARENT, /* lower inode, parent first */
26676 + AuLsc_I_PARENT2, /* copyup dirs */
26677 + AuLsc_I_PARENT3, /* copyup wh */
26683 +/* to debug easier, do not make them inlined functions */
26684 +#define MtxMustLock(mtx) AuDebugOn(!mutex_is_locked(mtx))
26685 +#define IMustLock(i) MtxMustLock(&(i)->i_mutex)
26687 +/* ---------------------------------------------------------------------- */
26689 +static inline void vfsub_drop_nlink(struct inode *inode)
26691 + AuDebugOn(!inode->i_nlink);
26692 + drop_nlink(inode);
26695 +static inline void vfsub_dead_dir(struct inode *inode)
26697 + AuDebugOn(!S_ISDIR(inode->i_mode));
26698 + inode->i_flags |= S_DEAD;
26699 + clear_nlink(inode);
26702 +/* ---------------------------------------------------------------------- */
26704 +int vfsub_update_h_iattr(struct path *h_path, int *did);
26705 +struct file *vfsub_dentry_open(struct path *path, int flags);
26706 +struct file *vfsub_filp_open(const char *path, int oflags, int mode);
26707 +int vfsub_kern_path(const char *name, unsigned int flags, struct path *path);
26708 +struct dentry *vfsub_lookup_one_len(const char *name, struct dentry *parent,
26710 +struct dentry *vfsub_lookup_hash(struct nameidata *nd);
26711 +int vfsub_name_hash(const char *name, struct qstr *this, int len);
26713 +/* ---------------------------------------------------------------------- */
26716 +struct dentry *vfsub_lock_rename(struct dentry *d1, struct au_hinode *hdir1,
26717 + struct dentry *d2, struct au_hinode *hdir2);
26718 +void vfsub_unlock_rename(struct dentry *d1, struct au_hinode *hdir1,
26719 + struct dentry *d2, struct au_hinode *hdir2);
26721 +int vfsub_create(struct inode *dir, struct path *path, int mode);
26722 +int vfsub_symlink(struct inode *dir, struct path *path,
26723 + const char *symname);
26724 +int vfsub_mknod(struct inode *dir, struct path *path, int mode, dev_t dev);
26725 +int vfsub_link(struct dentry *src_dentry, struct inode *dir,
26726 + struct path *path);
26727 +int vfsub_rename(struct inode *src_hdir, struct dentry *src_dentry,
26728 + struct inode *hdir, struct path *path);
26729 +int vfsub_mkdir(struct inode *dir, struct path *path, int mode);
26730 +int vfsub_rmdir(struct inode *dir, struct path *path);
26732 +/* ---------------------------------------------------------------------- */
26734 +ssize_t vfsub_read_u(struct file *file, char __user *ubuf, size_t count,
26736 +ssize_t vfsub_read_k(struct file *file, void *kbuf, size_t count,
26738 +ssize_t vfsub_write_u(struct file *file, const char __user *ubuf, size_t count,
26740 +ssize_t vfsub_write_k(struct file *file, void *kbuf, size_t count,
26742 +int vfsub_flush(struct file *file, fl_owner_t id);
26743 +int vfsub_readdir(struct file *file, filldir_t filldir, void *arg);
26745 +static inline unsigned int vfsub_file_flags(struct file *file)
26747 + unsigned int flags;
26749 + spin_lock(&file->f_lock);
26750 + flags = file->f_flags;
26751 + spin_unlock(&file->f_lock);
26756 +static inline void vfsub_file_accessed(struct file *h_file)
26758 + file_accessed(h_file);
26759 + vfsub_update_h_iattr(&h_file->f_path, /*did*/NULL); /*ignore*/
26762 +static inline void vfsub_touch_atime(struct vfsmount *h_mnt,
26763 + struct dentry *h_dentry)
26765 + struct path h_path = {
26766 + .dentry = h_dentry,
26769 + touch_atime(h_mnt, h_dentry);
26770 + vfsub_update_h_iattr(&h_path, /*did*/NULL); /*ignore*/
26773 +long vfsub_splice_to(struct file *in, loff_t *ppos,
26774 + struct pipe_inode_info *pipe, size_t len,
26775 + unsigned int flags);
26776 +long vfsub_splice_from(struct pipe_inode_info *pipe, struct file *out,
26777 + loff_t *ppos, size_t len, unsigned int flags);
26778 +int vfsub_trunc(struct path *h_path, loff_t length, unsigned int attr,
26779 + struct file *h_file);
26780 +int vfsub_fsync(struct file *file, struct path *path, int datasync);
26782 +/* ---------------------------------------------------------------------- */
26784 +static inline loff_t vfsub_llseek(struct file *file, loff_t offset, int origin)
26789 + err = vfs_llseek(file, offset, origin);
26794 +/* ---------------------------------------------------------------------- */
26796 +/* dirty workaround for strict type of fmode_t */
26802 +static inline unsigned int vfsub_fmode_to_uint(fmode_t fm)
26804 + union vfsub_fmu u = {
26808 + BUILD_BUG_ON(sizeof(u.fm) != sizeof(u.ui));
26813 +static inline fmode_t vfsub_uint_to_fmode(unsigned int ui)
26815 + union vfsub_fmu u = {
26822 +/* ---------------------------------------------------------------------- */
26824 +int vfsub_sio_mkdir(struct inode *dir, struct path *path, int mode);
26825 +int vfsub_sio_rmdir(struct inode *dir, struct path *path);
26826 +int vfsub_sio_notify_change(struct path *path, struct iattr *ia);
26827 +int vfsub_notify_change(struct path *path, struct iattr *ia);
26828 +int vfsub_unlink(struct inode *dir, struct path *path, int force);
26830 +#endif /* __KERNEL__ */
26831 +#endif /* __AUFS_VFSUB_H__ */
26832 diff -urN /usr/share/empty/fs/aufs/wbr_policy.c linux/fs/aufs/wbr_policy.c
26833 --- /usr/share/empty/fs/aufs/wbr_policy.c 1970-01-01 01:00:00.000000000 +0100
26834 +++ linux/fs/aufs/wbr_policy.c 2012-02-13 21:54:56.973105100 +0100
26837 + * Copyright (C) 2005-2012 Junjiro R. Okajima
26839 + * This program, aufs is free software; you can redistribute it and/or modify
26840 + * it under the terms of the GNU General Public License as published by
26841 + * the Free Software Foundation; either version 2 of the License, or
26842 + * (at your option) any later version.
26844 + * This program is distributed in the hope that it will be useful,
26845 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
26846 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
26847 + * GNU General Public License for more details.
26849 + * You should have received a copy of the GNU General Public License
26850 + * along with this program; if not, write to the Free Software
26851 + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
26855 + * policies for selecting one among multiple writable branches
26858 +#include <linux/statfs.h>
26861 +/* subset of cpup_attr() */
26862 +static noinline_for_stack
26863 +int au_cpdown_attr(struct path *h_path, struct dentry *h_src)
26867 + struct inode *h_isrc;
26869 + h_isrc = h_src->d_inode;
26870 + ia.ia_valid = ATTR_FORCE | ATTR_MODE | ATTR_UID | ATTR_GID;
26871 + ia.ia_mode = h_isrc->i_mode;
26872 + ia.ia_uid = h_isrc->i_uid;
26873 + ia.ia_gid = h_isrc->i_gid;
26874 + sbits = !!(ia.ia_mode & (S_ISUID | S_ISGID));
26875 + au_cpup_attr_flags(h_path->dentry->d_inode, h_isrc);
26876 + err = vfsub_sio_notify_change(h_path, &ia);
26878 + /* is this nfs only? */
26879 + if (!err && sbits && au_test_nfs(h_path->dentry->d_sb)) {
26880 + ia.ia_valid = ATTR_FORCE | ATTR_MODE;
26881 + ia.ia_mode = h_isrc->i_mode;
26882 + err = vfsub_sio_notify_change(h_path, &ia);
26888 +#define AuCpdown_PARENT_OPQ 1
26889 +#define AuCpdown_WHED (1 << 1)
26890 +#define AuCpdown_MADE_DIR (1 << 2)
26891 +#define AuCpdown_DIROPQ (1 << 3)
26892 +#define au_ftest_cpdown(flags, name) ((flags) & AuCpdown_##name)
26893 +#define au_fset_cpdown(flags, name) \
26894 + do { (flags) |= AuCpdown_##name; } while (0)
26895 +#define au_fclr_cpdown(flags, name) \
26896 + do { (flags) &= ~AuCpdown_##name; } while (0)
26898 +struct au_cpdown_dir_args {
26899 + struct dentry *parent;
26900 + unsigned int flags;
26903 +static int au_cpdown_dir_opq(struct dentry *dentry, aufs_bindex_t bdst,
26904 + struct au_cpdown_dir_args *a)
26907 + struct dentry *opq_dentry;
26909 + opq_dentry = au_diropq_create(dentry, bdst);
26910 + err = PTR_ERR(opq_dentry);
26911 + if (IS_ERR(opq_dentry))
26913 + dput(opq_dentry);
26914 + au_fset_cpdown(a->flags, DIROPQ);
26920 +static int au_cpdown_dir_wh(struct dentry *dentry, struct dentry *h_parent,
26921 + struct inode *dir, aufs_bindex_t bdst)
26924 + struct path h_path;
26925 + struct au_branch *br;
26927 + br = au_sbr(dentry->d_sb, bdst);
26928 + h_path.dentry = au_wh_lkup(h_parent, &dentry->d_name, br);
26929 + err = PTR_ERR(h_path.dentry);
26930 + if (IS_ERR(h_path.dentry))
26934 + if (h_path.dentry->d_inode) {
26935 + h_path.mnt = br->br_mnt;
26936 + err = au_wh_unlink_dentry(au_h_iptr(dir, bdst), &h_path,
26939 + dput(h_path.dentry);
26945 +static int au_cpdown_dir(struct dentry *dentry, aufs_bindex_t bdst,
26946 + struct dentry *h_parent, void *arg)
26949 + aufs_bindex_t bopq, bstart;
26950 + struct path h_path;
26951 + struct dentry *parent;
26952 + struct inode *h_dir, *h_inode, *inode, *dir;
26953 + struct au_cpdown_dir_args *args = arg;
26955 + bstart = au_dbstart(dentry);
26956 + /* dentry is di-locked */
26957 + parent = dget_parent(dentry);
26958 + dir = parent->d_inode;
26959 + h_dir = h_parent->d_inode;
26960 + AuDebugOn(h_dir != au_h_iptr(dir, bdst));
26961 + IMustLock(h_dir);
26963 + err = au_lkup_neg(dentry, bdst);
26964 + if (unlikely(err < 0))
26966 + h_path.dentry = au_h_dptr(dentry, bdst);
26967 + h_path.mnt = au_sbr_mnt(dentry->d_sb, bdst);
26968 + err = vfsub_sio_mkdir(au_h_iptr(dir, bdst), &h_path,
26969 + S_IRWXU | S_IRUGO | S_IXUGO);
26970 + if (unlikely(err))
26972 + au_fset_cpdown(args->flags, MADE_DIR);
26974 + bopq = au_dbdiropq(dentry);
26975 + au_fclr_cpdown(args->flags, WHED);
26976 + au_fclr_cpdown(args->flags, DIROPQ);
26977 + if (au_dbwh(dentry) == bdst)
26978 + au_fset_cpdown(args->flags, WHED);
26979 + if (!au_ftest_cpdown(args->flags, PARENT_OPQ) && bopq <= bdst)
26980 + au_fset_cpdown(args->flags, PARENT_OPQ);
26981 + h_inode = h_path.dentry->d_inode;
26982 + mutex_lock_nested(&h_inode->i_mutex, AuLsc_I_CHILD);
26983 + if (au_ftest_cpdown(args->flags, WHED)) {
26984 + err = au_cpdown_dir_opq(dentry, bdst, args);
26985 + if (unlikely(err)) {
26986 + mutex_unlock(&h_inode->i_mutex);
26991 + err = au_cpdown_attr(&h_path, au_h_dptr(dentry, bstart));
26992 + mutex_unlock(&h_inode->i_mutex);
26993 + if (unlikely(err))
26996 + if (au_ftest_cpdown(args->flags, WHED)) {
26997 + err = au_cpdown_dir_wh(dentry, h_parent, dir, bdst);
26998 + if (unlikely(err))
27002 + inode = dentry->d_inode;
27003 + if (au_ibend(inode) < bdst)
27004 + au_set_ibend(inode, bdst);
27005 + au_set_h_iptr(inode, bdst, au_igrab(h_inode),
27006 + au_hi_flags(inode, /*isdir*/1));
27007 + goto out; /* success */
27011 + if (au_ftest_cpdown(args->flags, DIROPQ)) {
27012 + mutex_lock_nested(&h_inode->i_mutex, AuLsc_I_CHILD);
27013 + rerr = au_diropq_remove(dentry, bdst);
27014 + mutex_unlock(&h_inode->i_mutex);
27015 + if (unlikely(rerr)) {
27016 + AuIOErr("failed removing diropq for %.*s b%d (%d)\n",
27017 + AuDLNPair(dentry), bdst, rerr);
27023 + if (au_ftest_cpdown(args->flags, MADE_DIR)) {
27024 + rerr = vfsub_sio_rmdir(au_h_iptr(dir, bdst), &h_path);
27025 + if (unlikely(rerr)) {
27026 + AuIOErr("failed removing %.*s b%d (%d)\n",
27027 + AuDLNPair(dentry), bdst, rerr);
27032 + au_set_h_dptr(dentry, bdst, NULL);
27033 + if (au_dbend(dentry) == bdst)
27034 + au_update_dbend(dentry);
27040 +int au_cpdown_dirs(struct dentry *dentry, aufs_bindex_t bdst)
27043 + struct au_cpdown_dir_args args = {
27044 + .parent = dget_parent(dentry),
27048 + err = au_cp_dirs(dentry, bdst, au_cpdown_dir, &args);
27049 + dput(args.parent);
27054 +/* ---------------------------------------------------------------------- */
27056 +/* policies for create */
27058 +static int au_wbr_nonopq(struct dentry *dentry, aufs_bindex_t bindex)
27060 + int err, i, j, ndentry;
27061 + aufs_bindex_t bopq;
27062 + struct au_dcsub_pages dpages;
27063 + struct au_dpage *dpage;
27064 + struct dentry **dentries, *parent, *d;
27066 + err = au_dpages_init(&dpages, GFP_NOFS);
27067 + if (unlikely(err))
27069 + parent = dget_parent(dentry);
27070 + err = au_dcsub_pages_rev_aufs(&dpages, parent, /*do_include*/0);
27071 + if (unlikely(err))
27075 + for (i = 0; i < dpages.ndpage; i++) {
27076 + dpage = dpages.dpages + i;
27077 + dentries = dpage->dentries;
27078 + ndentry = dpage->ndentry;
27079 + for (j = 0; j < ndentry; j++) {
27081 + di_read_lock_parent2(d, !AuLock_IR);
27082 + bopq = au_dbdiropq(d);
27083 + di_read_unlock(d, !AuLock_IR);
27084 + if (bopq >= 0 && bopq < err)
27091 + au_dpages_free(&dpages);
27096 +static int au_wbr_bu(struct super_block *sb, aufs_bindex_t bindex)
27098 + for (; bindex >= 0; bindex--)
27099 + if (!au_br_rdonly(au_sbr(sb, bindex)))
27104 +/* top down parent */
27105 +static int au_wbr_create_tdp(struct dentry *dentry, int isdir __maybe_unused)
27108 + aufs_bindex_t bstart, bindex;
27109 + struct super_block *sb;
27110 + struct dentry *parent, *h_parent;
27112 + sb = dentry->d_sb;
27113 + bstart = au_dbstart(dentry);
27115 + if (!au_br_rdonly(au_sbr(sb, bstart)))
27119 + parent = dget_parent(dentry);
27120 + for (bindex = au_dbstart(parent); bindex < bstart; bindex++) {
27121 + h_parent = au_h_dptr(parent, bindex);
27122 + if (!h_parent || !h_parent->d_inode)
27125 + if (!au_br_rdonly(au_sbr(sb, bindex))) {
27132 + /* bottom up here */
27133 + if (unlikely(err < 0)) {
27134 + err = au_wbr_bu(sb, bstart - 1);
27136 + err = au_wbr_nonopq(dentry, err);
27140 + AuDbg("b%d\n", err);
27144 +/* ---------------------------------------------------------------------- */
27146 +/* an exception for the policy other than tdp */
27147 +static int au_wbr_create_exp(struct dentry *dentry)
27150 + aufs_bindex_t bwh, bdiropq;
27151 + struct dentry *parent;
27154 + bwh = au_dbwh(dentry);
27155 + parent = dget_parent(dentry);
27156 + bdiropq = au_dbdiropq(parent);
27158 + if (bdiropq >= 0)
27159 + err = min(bdiropq, bwh);
27162 + AuDbg("%d\n", err);
27163 + } else if (bdiropq >= 0) {
27165 + AuDbg("%d\n", err);
27170 + err = au_wbr_nonopq(dentry, err);
27172 + if (err >= 0 && au_br_rdonly(au_sbr(dentry->d_sb, err)))
27175 + AuDbg("%d\n", err);
27179 +/* ---------------------------------------------------------------------- */
27182 +static int au_wbr_create_init_rr(struct super_block *sb)
27186 + err = au_wbr_bu(sb, au_sbend(sb));
27187 + atomic_set(&au_sbi(sb)->si_wbr_rr_next, -err); /* less important */
27190 + AuDbg("b%d\n", err);
27194 +static int au_wbr_create_rr(struct dentry *dentry, int isdir)
27198 + aufs_bindex_t bindex, bend;
27199 + struct super_block *sb;
27202 + err = au_wbr_create_exp(dentry);
27206 + sb = dentry->d_sb;
27207 + next = &au_sbi(sb)->si_wbr_rr_next;
27208 + bend = au_sbend(sb);
27210 + for (bindex = 0; bindex <= bend; bindex++) {
27212 + err = atomic_dec_return(next) + 1;
27213 + /* modulo for 0 is meaningless */
27214 + if (unlikely(!err))
27215 + err = atomic_dec_return(next) + 1;
27217 + err = atomic_read(next);
27218 + AuDbg("%d\n", err);
27221 + AuDbg("%d\n", err);
27222 + if (!au_br_rdonly(au_sbr(sb, err)))
27228 + err = au_wbr_nonopq(dentry, err);
27231 + AuDbg("%d\n", err);
27235 +/* ---------------------------------------------------------------------- */
27237 +/* most free space */
27238 +static void au_mfs(struct dentry *dentry)
27240 + struct super_block *sb;
27241 + struct au_branch *br;
27242 + struct au_wbr_mfs *mfs;
27243 + aufs_bindex_t bindex, bend;
27245 + unsigned long long b, bavail;
27246 + struct path h_path;
27247 + /* reduce the stack usage */
27248 + struct kstatfs *st;
27250 + st = kmalloc(sizeof(*st), GFP_NOFS);
27251 + if (unlikely(!st)) {
27252 + AuWarn1("failed updating mfs(%d), ignored\n", -ENOMEM);
27257 + sb = dentry->d_sb;
27258 + mfs = &au_sbi(sb)->si_wbr_mfs;
27259 + MtxMustLock(&mfs->mfs_lock);
27260 + mfs->mfs_bindex = -EROFS;
27261 + mfs->mfsrr_bytes = 0;
27262 + bend = au_sbend(sb);
27263 + for (bindex = 0; bindex <= bend; bindex++) {
27264 + br = au_sbr(sb, bindex);
27265 + if (au_br_rdonly(br))
27268 + /* sb->s_root for NFS is unreliable */
27269 + h_path.mnt = br->br_mnt;
27270 + h_path.dentry = h_path.mnt->mnt_root;
27271 + err = vfs_statfs(&h_path, st);
27272 + if (unlikely(err)) {
27273 + AuWarn1("failed statfs, b%d, %d\n", bindex, err);
27277 + /* when the available size is equal, select the lower one */
27278 + BUILD_BUG_ON(sizeof(b) < sizeof(st->f_bavail)
27279 + || sizeof(b) < sizeof(st->f_bsize));
27280 + b = st->f_bavail * st->f_bsize;
27281 + br->br_wbr->wbr_bytes = b;
27282 + if (b >= bavail) {
27284 + mfs->mfs_bindex = bindex;
27285 + mfs->mfs_jiffy = jiffies;
27289 + mfs->mfsrr_bytes = bavail;
27290 + AuDbg("b%d\n", mfs->mfs_bindex);
27294 +static int au_wbr_create_mfs(struct dentry *dentry, int isdir __maybe_unused)
27297 + struct super_block *sb;
27298 + struct au_wbr_mfs *mfs;
27300 + err = au_wbr_create_exp(dentry);
27304 + sb = dentry->d_sb;
27305 + mfs = &au_sbi(sb)->si_wbr_mfs;
27306 + mutex_lock(&mfs->mfs_lock);
27307 + if (time_after(jiffies, mfs->mfs_jiffy + mfs->mfs_expire)
27308 + || mfs->mfs_bindex < 0
27309 + || au_br_rdonly(au_sbr(sb, mfs->mfs_bindex)))
27311 + mutex_unlock(&mfs->mfs_lock);
27312 + err = mfs->mfs_bindex;
27315 + err = au_wbr_nonopq(dentry, err);
27318 + AuDbg("b%d\n", err);
27322 +static int au_wbr_create_init_mfs(struct super_block *sb)
27324 + struct au_wbr_mfs *mfs;
27326 + mfs = &au_sbi(sb)->si_wbr_mfs;
27327 + mutex_init(&mfs->mfs_lock);
27328 + mfs->mfs_jiffy = 0;
27329 + mfs->mfs_bindex = -EROFS;
27334 +static int au_wbr_create_fin_mfs(struct super_block *sb __maybe_unused)
27336 + mutex_destroy(&au_sbi(sb)->si_wbr_mfs.mfs_lock);
27340 +/* ---------------------------------------------------------------------- */
27342 +/* most free space and then round robin */
27343 +static int au_wbr_create_mfsrr(struct dentry *dentry, int isdir)
27346 + struct au_wbr_mfs *mfs;
27348 + err = au_wbr_create_mfs(dentry, isdir);
27350 + mfs = &au_sbi(dentry->d_sb)->si_wbr_mfs;
27351 + mutex_lock(&mfs->mfs_lock);
27352 + if (mfs->mfsrr_bytes < mfs->mfsrr_watermark)
27353 + err = au_wbr_create_rr(dentry, isdir);
27354 + mutex_unlock(&mfs->mfs_lock);
27357 + AuDbg("b%d\n", err);
27361 +static int au_wbr_create_init_mfsrr(struct super_block *sb)
27365 + au_wbr_create_init_mfs(sb); /* ignore */
27366 + err = au_wbr_create_init_rr(sb);
27371 +/* ---------------------------------------------------------------------- */
27373 +/* top down parent and most free space */
27374 +static int au_wbr_create_pmfs(struct dentry *dentry, int isdir)
27377 + unsigned long long b;
27378 + aufs_bindex_t bindex, bstart, bend;
27379 + struct super_block *sb;
27380 + struct dentry *parent, *h_parent;
27381 + struct au_branch *br;
27383 + err = au_wbr_create_tdp(dentry, isdir);
27384 + if (unlikely(err < 0))
27386 + parent = dget_parent(dentry);
27387 + bstart = au_dbstart(parent);
27388 + bend = au_dbtaildir(parent);
27389 + if (bstart == bend)
27390 + goto out_parent; /* success */
27392 + e2 = au_wbr_create_mfs(dentry, isdir);
27394 + goto out_parent; /* success */
27396 + /* when the available size is equal, select upper one */
27397 + sb = dentry->d_sb;
27398 + br = au_sbr(sb, err);
27399 + b = br->br_wbr->wbr_bytes;
27400 + AuDbg("b%d, %llu\n", err, b);
27402 + for (bindex = bstart; bindex <= bend; bindex++) {
27403 + h_parent = au_h_dptr(parent, bindex);
27404 + if (!h_parent || !h_parent->d_inode)
27407 + br = au_sbr(sb, bindex);
27408 + if (!au_br_rdonly(br) && br->br_wbr->wbr_bytes > b) {
27409 + b = br->br_wbr->wbr_bytes;
27411 + AuDbg("b%d, %llu\n", err, b);
27416 + err = au_wbr_nonopq(dentry, err);
27421 + AuDbg("b%d\n", err);
27425 +/* ---------------------------------------------------------------------- */
27427 +/* policies for copyup */
27429 +/* top down parent */
27430 +static int au_wbr_copyup_tdp(struct dentry *dentry)
27432 + return au_wbr_create_tdp(dentry, /*isdir, anything is ok*/0);
27435 +/* bottom up parent */
27436 +static int au_wbr_copyup_bup(struct dentry *dentry)
27439 + aufs_bindex_t bindex, bstart;
27440 + struct dentry *parent, *h_parent;
27441 + struct super_block *sb;
27444 + sb = dentry->d_sb;
27445 + parent = dget_parent(dentry);
27446 + bstart = au_dbstart(parent);
27447 + for (bindex = au_dbstart(dentry); bindex >= bstart; bindex--) {
27448 + h_parent = au_h_dptr(parent, bindex);
27449 + if (!h_parent || !h_parent->d_inode)
27452 + if (!au_br_rdonly(au_sbr(sb, bindex))) {
27459 + /* bottom up here */
27460 + if (unlikely(err < 0))
27461 + err = au_wbr_bu(sb, bstart - 1);
27463 + AuDbg("b%d\n", err);
27468 +static int au_wbr_copyup_bu(struct dentry *dentry)
27471 + aufs_bindex_t bstart;
27473 + bstart = au_dbstart(dentry);
27474 + err = au_wbr_bu(dentry->d_sb, bstart);
27475 + AuDbg("b%d\n", err);
27476 + if (err > bstart)
27477 + err = au_wbr_nonopq(dentry, err);
27479 + AuDbg("b%d\n", err);
27483 +/* ---------------------------------------------------------------------- */
27485 +struct au_wbr_copyup_operations au_wbr_copyup_ops[] = {
27486 + [AuWbrCopyup_TDP] = {
27487 + .copyup = au_wbr_copyup_tdp
27489 + [AuWbrCopyup_BUP] = {
27490 + .copyup = au_wbr_copyup_bup
27492 + [AuWbrCopyup_BU] = {
27493 + .copyup = au_wbr_copyup_bu
27497 +struct au_wbr_create_operations au_wbr_create_ops[] = {
27498 + [AuWbrCreate_TDP] = {
27499 + .create = au_wbr_create_tdp
27501 + [AuWbrCreate_RR] = {
27502 + .create = au_wbr_create_rr,
27503 + .init = au_wbr_create_init_rr
27505 + [AuWbrCreate_MFS] = {
27506 + .create = au_wbr_create_mfs,
27507 + .init = au_wbr_create_init_mfs,
27508 + .fin = au_wbr_create_fin_mfs
27510 + [AuWbrCreate_MFSV] = {
27511 + .create = au_wbr_create_mfs,
27512 + .init = au_wbr_create_init_mfs,
27513 + .fin = au_wbr_create_fin_mfs
27515 + [AuWbrCreate_MFSRR] = {
27516 + .create = au_wbr_create_mfsrr,
27517 + .init = au_wbr_create_init_mfsrr,
27518 + .fin = au_wbr_create_fin_mfs
27520 + [AuWbrCreate_MFSRRV] = {
27521 + .create = au_wbr_create_mfsrr,
27522 + .init = au_wbr_create_init_mfsrr,
27523 + .fin = au_wbr_create_fin_mfs
27525 + [AuWbrCreate_PMFS] = {
27526 + .create = au_wbr_create_pmfs,
27527 + .init = au_wbr_create_init_mfs,
27528 + .fin = au_wbr_create_fin_mfs
27530 + [AuWbrCreate_PMFSV] = {
27531 + .create = au_wbr_create_pmfs,
27532 + .init = au_wbr_create_init_mfs,
27533 + .fin = au_wbr_create_fin_mfs
27536 diff -urN /usr/share/empty/fs/aufs/whout.c linux/fs/aufs/whout.c
27537 --- /usr/share/empty/fs/aufs/whout.c 1970-01-01 01:00:00.000000000 +0100
27538 +++ linux/fs/aufs/whout.c 2012-02-13 21:54:56.973105100 +0100
27541 + * Copyright (C) 2005-2012 Junjiro R. Okajima
27543 + * This program, aufs is free software; you can redistribute it and/or modify
27544 + * it under the terms of the GNU General Public License as published by
27545 + * the Free Software Foundation; either version 2 of the License, or
27546 + * (at your option) any later version.
27548 + * This program is distributed in the hope that it will be useful,
27549 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
27550 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
27551 + * GNU General Public License for more details.
27553 + * You should have received a copy of the GNU General Public License
27554 + * along with this program; if not, write to the Free Software
27555 + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
27559 + * whiteout for logical deletion and opaque directory
27564 +#define WH_MASK S_IRUGO
27567 + * If a directory contains this file, then it is opaque. We start with the
27568 + * .wh. flag so that it is blocked by lookup.
27570 +static struct qstr diropq_name = {
27571 + .name = AUFS_WH_DIROPQ,
27572 + .len = sizeof(AUFS_WH_DIROPQ) - 1
27576 + * generate whiteout name, which is NOT terminated by NULL.
27577 + * @name: original d_name.name
27578 + * @len: original d_name.len
27579 + * @wh: whiteout qstr
27580 + * returns zero when succeeds, otherwise error.
27581 + * succeeded value as wh->name should be freed by kfree().
27583 +int au_wh_name_alloc(struct qstr *wh, const struct qstr *name)
27587 + if (unlikely(name->len > PATH_MAX - AUFS_WH_PFX_LEN))
27588 + return -ENAMETOOLONG;
27590 + wh->len = name->len + AUFS_WH_PFX_LEN;
27591 + p = kmalloc(wh->len, GFP_NOFS);
27594 + memcpy(p, AUFS_WH_PFX, AUFS_WH_PFX_LEN);
27595 + memcpy(p + AUFS_WH_PFX_LEN, name->name, name->len);
27602 +/* ---------------------------------------------------------------------- */
27605 + * test if the @wh_name exists under @h_parent.
27606 + * @try_sio specifies the necessary of super-io.
27608 +int au_wh_test(struct dentry *h_parent, struct qstr *wh_name,
27609 + struct au_branch *br, int try_sio)
27612 + struct dentry *wh_dentry;
27615 + wh_dentry = au_lkup_one(wh_name, h_parent, br, /*nd*/NULL);
27617 + wh_dentry = au_sio_lkup_one(wh_name, h_parent, br);
27618 + err = PTR_ERR(wh_dentry);
27619 + if (IS_ERR(wh_dentry))
27623 + if (!wh_dentry->d_inode)
27624 + goto out_wh; /* success */
27627 + if (S_ISREG(wh_dentry->d_inode->i_mode))
27628 + goto out_wh; /* success */
27631 + AuIOErr("%.*s Invalid whiteout entry type 0%o.\n",
27632 + AuDLNPair(wh_dentry), wh_dentry->d_inode->i_mode);
27641 + * test if the @h_dentry sets opaque or not.
27643 +int au_diropq_test(struct dentry *h_dentry, struct au_branch *br)
27646 + struct inode *h_dir;
27648 + h_dir = h_dentry->d_inode;
27649 + err = au_wh_test(h_dentry, &diropq_name, br,
27650 + au_test_h_perm_sio(h_dir, MAY_EXEC));
27655 + * returns a negative dentry whose name is unique and temporary.
27657 +struct dentry *au_whtmp_lkup(struct dentry *h_parent, struct au_branch *br,
27658 + struct qstr *prefix)
27660 + struct dentry *dentry;
27662 + char defname[NAME_MAX - AUFS_MAX_NAMELEN + DNAME_INLINE_LEN + 1],
27664 + /* strict atomic_t is unnecessary here */
27665 + static unsigned short cnt;
27668 + BUILD_BUG_ON(sizeof(cnt) * 2 > AUFS_WH_TMP_LEN);
27671 + qs.len = sizeof(defname) - DNAME_INLINE_LEN + prefix->len - 1;
27672 + if (unlikely(prefix->len > DNAME_INLINE_LEN)) {
27673 + dentry = ERR_PTR(-ENAMETOOLONG);
27674 + if (unlikely(qs.len > NAME_MAX))
27676 + dentry = ERR_PTR(-ENOMEM);
27677 + name = kmalloc(qs.len + 1, GFP_NOFS);
27678 + if (unlikely(!name))
27682 + /* doubly whiteout-ed */
27683 + memcpy(name, AUFS_WH_PFX AUFS_WH_PFX, AUFS_WH_PFX_LEN * 2);
27684 + p = name + AUFS_WH_PFX_LEN * 2;
27685 + memcpy(p, prefix->name, prefix->len);
27686 + p += prefix->len;
27688 + AuDebugOn(name + qs.len + 1 - p <= AUFS_WH_TMP_LEN);
27691 + for (i = 0; i < 3; i++) {
27692 + sprintf(p, "%.*x", AUFS_WH_TMP_LEN, cnt++);
27693 + dentry = au_sio_lkup_one(&qs, h_parent, br);
27694 + if (IS_ERR(dentry) || !dentry->d_inode)
27698 + /* pr_warning("could not get random name\n"); */
27699 + dentry = ERR_PTR(-EEXIST);
27700 + AuDbg("%.*s\n", AuLNPair(&qs));
27704 + if (name != defname)
27707 + AuTraceErrPtr(dentry);
27712 + * rename the @h_dentry on @br to the whiteouted temporary name.
27714 +int au_whtmp_ren(struct dentry *h_dentry, struct au_branch *br)
27717 + struct path h_path = {
27718 + .mnt = br->br_mnt
27720 + struct inode *h_dir;
27721 + struct dentry *h_parent;
27723 + h_parent = h_dentry->d_parent; /* dir inode is locked */
27724 + h_dir = h_parent->d_inode;
27725 + IMustLock(h_dir);
27727 + h_path.dentry = au_whtmp_lkup(h_parent, br, &h_dentry->d_name);
27728 + err = PTR_ERR(h_path.dentry);
27729 + if (IS_ERR(h_path.dentry))
27732 + /* under the same dir, no need to lock_rename() */
27733 + err = vfsub_rename(h_dir, h_dentry, h_dir, &h_path);
27735 + dput(h_path.dentry);
27742 +/* ---------------------------------------------------------------------- */
27744 + * functions for removing a whiteout
27747 +static int do_unlink_wh(struct inode *h_dir, struct path *h_path)
27752 + * forces superio when the dir has a sticky bit.
27753 + * this may be a violation of unix fs semantics.
27755 + force = (h_dir->i_mode & S_ISVTX)
27756 + && h_path->dentry->d_inode->i_uid != current_fsuid();
27757 + return vfsub_unlink(h_dir, h_path, force);
27760 +int au_wh_unlink_dentry(struct inode *h_dir, struct path *h_path,
27761 + struct dentry *dentry)
27765 + err = do_unlink_wh(h_dir, h_path);
27766 + if (!err && dentry)
27767 + au_set_dbwh(dentry, -1);
27772 +static int unlink_wh_name(struct dentry *h_parent, struct qstr *wh,
27773 + struct au_branch *br)
27776 + struct path h_path = {
27777 + .mnt = br->br_mnt
27781 + h_path.dentry = au_lkup_one(wh, h_parent, br, /*nd*/NULL);
27782 + if (IS_ERR(h_path.dentry))
27783 + err = PTR_ERR(h_path.dentry);
27785 + if (h_path.dentry->d_inode
27786 + && S_ISREG(h_path.dentry->d_inode->i_mode))
27787 + err = do_unlink_wh(h_parent->d_inode, &h_path);
27788 + dput(h_path.dentry);
27794 +/* ---------------------------------------------------------------------- */
27796 + * initialize/clean whiteout for a branch
27799 +static void au_wh_clean(struct inode *h_dir, struct path *whpath,
27804 + if (!whpath->dentry->d_inode)
27807 + err = mnt_want_write(whpath->mnt);
27810 + err = vfsub_rmdir(h_dir, whpath);
27812 + err = vfsub_unlink(h_dir, whpath, /*force*/0);
27813 + mnt_drop_write(whpath->mnt);
27815 + if (unlikely(err))
27816 + pr_warning("failed removing %.*s (%d), ignored.\n",
27817 + AuDLNPair(whpath->dentry), err);
27820 +static int test_linkable(struct dentry *h_root)
27822 + struct inode *h_dir = h_root->d_inode;
27824 + if (h_dir->i_op->link)
27827 + pr_err("%.*s (%s) doesn't support link(2), use noplink and rw+nolwh\n",
27828 + AuDLNPair(h_root), au_sbtype(h_root->d_sb));
27832 +/* todo: should this mkdir be done in /sbin/mount.aufs helper? */
27833 +static int au_whdir(struct inode *h_dir, struct path *path)
27838 + if (!path->dentry->d_inode) {
27839 + int mode = S_IRWXU;
27841 + if (au_test_nfs(path->dentry->d_sb))
27843 + err = mnt_want_write(path->mnt);
27845 + err = vfsub_mkdir(h_dir, path, mode);
27846 + mnt_drop_write(path->mnt);
27848 + } else if (S_ISDIR(path->dentry->d_inode->i_mode))
27851 + pr_err("unknown %.*s exists\n", AuDLNPair(path->dentry));
27856 +struct au_wh_base {
27857 + const struct qstr *name;
27858 + struct dentry *dentry;
27861 +static void au_wh_init_ro(struct inode *h_dir, struct au_wh_base base[],
27862 + struct path *h_path)
27864 + h_path->dentry = base[AuBrWh_BASE].dentry;
27865 + au_wh_clean(h_dir, h_path, /*isdir*/0);
27866 + h_path->dentry = base[AuBrWh_PLINK].dentry;
27867 + au_wh_clean(h_dir, h_path, /*isdir*/1);
27868 + h_path->dentry = base[AuBrWh_ORPH].dentry;
27869 + au_wh_clean(h_dir, h_path, /*isdir*/1);
27873 + * returns tri-state,
27874 + * minus: error, caller should print the mesage
27876 + * plus: error, caller should NOT print the mesage
27878 +static int au_wh_init_rw_nolink(struct dentry *h_root, struct au_wbr *wbr,
27879 + int do_plink, struct au_wh_base base[],
27880 + struct path *h_path)
27883 + struct inode *h_dir;
27885 + h_dir = h_root->d_inode;
27886 + h_path->dentry = base[AuBrWh_BASE].dentry;
27887 + au_wh_clean(h_dir, h_path, /*isdir*/0);
27888 + h_path->dentry = base[AuBrWh_PLINK].dentry;
27890 + err = test_linkable(h_root);
27891 + if (unlikely(err)) {
27896 + err = au_whdir(h_dir, h_path);
27897 + if (unlikely(err))
27899 + wbr->wbr_plink = dget(base[AuBrWh_PLINK].dentry);
27901 + au_wh_clean(h_dir, h_path, /*isdir*/1);
27902 + h_path->dentry = base[AuBrWh_ORPH].dentry;
27903 + err = au_whdir(h_dir, h_path);
27904 + if (unlikely(err))
27906 + wbr->wbr_orph = dget(base[AuBrWh_ORPH].dentry);
27913 + * for the moment, aufs supports the branch filesystem which does not support
27914 + * link(2). testing on FAT which does not support i_op->setattr() fully either,
27915 + * copyup failed. finally, such filesystem will not be used as the writable
27918 + * returns tri-state, see above.
27920 +static int au_wh_init_rw(struct dentry *h_root, struct au_wbr *wbr,
27921 + int do_plink, struct au_wh_base base[],
27922 + struct path *h_path)
27925 + struct inode *h_dir;
27927 + WbrWhMustWriteLock(wbr);
27929 + err = test_linkable(h_root);
27930 + if (unlikely(err)) {
27936 + * todo: should this create be done in /sbin/mount.aufs helper?
27939 + h_dir = h_root->d_inode;
27940 + if (!base[AuBrWh_BASE].dentry->d_inode) {
27941 + err = mnt_want_write(h_path->mnt);
27943 + h_path->dentry = base[AuBrWh_BASE].dentry;
27944 + err = vfsub_create(h_dir, h_path, WH_MASK);
27945 + mnt_drop_write(h_path->mnt);
27947 + } else if (S_ISREG(base[AuBrWh_BASE].dentry->d_inode->i_mode))
27950 + pr_err("unknown %.*s/%.*s exists\n",
27951 + AuDLNPair(h_root), AuDLNPair(base[AuBrWh_BASE].dentry));
27952 + if (unlikely(err))
27955 + h_path->dentry = base[AuBrWh_PLINK].dentry;
27957 + err = au_whdir(h_dir, h_path);
27958 + if (unlikely(err))
27960 + wbr->wbr_plink = dget(base[AuBrWh_PLINK].dentry);
27962 + au_wh_clean(h_dir, h_path, /*isdir*/1);
27963 + wbr->wbr_whbase = dget(base[AuBrWh_BASE].dentry);
27965 + h_path->dentry = base[AuBrWh_ORPH].dentry;
27966 + err = au_whdir(h_dir, h_path);
27967 + if (unlikely(err))
27969 + wbr->wbr_orph = dget(base[AuBrWh_ORPH].dentry);
27976 + * initialize the whiteout base file/dir for @br.
27978 +int au_wh_init(struct dentry *h_root, struct au_branch *br,
27979 + struct super_block *sb)
27982 + const unsigned char do_plink
27983 + = !!au_opt_test(au_mntflags(sb), PLINK);
27984 + struct path path = {
27985 + .mnt = br->br_mnt
27987 + struct inode *h_dir;
27988 + struct au_wbr *wbr = br->br_wbr;
27989 + static const struct qstr base_name[] = {
27990 + [AuBrWh_BASE] = {
27991 + .name = AUFS_BASE_NAME,
27992 + .len = sizeof(AUFS_BASE_NAME) - 1
27994 + [AuBrWh_PLINK] = {
27995 + .name = AUFS_PLINKDIR_NAME,
27996 + .len = sizeof(AUFS_PLINKDIR_NAME) - 1
27998 + [AuBrWh_ORPH] = {
27999 + .name = AUFS_ORPHDIR_NAME,
28000 + .len = sizeof(AUFS_ORPHDIR_NAME) - 1
28003 + struct au_wh_base base[] = {
28004 + [AuBrWh_BASE] = {
28005 + .name = base_name + AuBrWh_BASE,
28008 + [AuBrWh_PLINK] = {
28009 + .name = base_name + AuBrWh_PLINK,
28012 + [AuBrWh_ORPH] = {
28013 + .name = base_name + AuBrWh_ORPH,
28019 + WbrWhMustWriteLock(wbr);
28021 + for (i = 0; i < AuBrWh_Last; i++) {
28022 + /* doubly whiteouted */
28023 + struct dentry *d;
28025 + d = au_wh_lkup(h_root, (void *)base[i].name, br);
28026 + err = PTR_ERR(d);
28030 + base[i].dentry = d;
28032 + && wbr->wbr_wh[i]
28033 + && wbr->wbr_wh[i] != base[i].dentry);
28037 + for (i = 0; i < AuBrWh_Last; i++) {
28038 + dput(wbr->wbr_wh[i]);
28039 + wbr->wbr_wh[i] = NULL;
28043 + if (!au_br_writable(br->br_perm)) {
28044 + h_dir = h_root->d_inode;
28045 + au_wh_init_ro(h_dir, base, &path);
28046 + } else if (!au_br_wh_linkable(br->br_perm)) {
28047 + err = au_wh_init_rw_nolink(h_root, wbr, do_plink, base, &path);
28053 + err = au_wh_init_rw(h_root, wbr, do_plink, base, &path);
28059 + goto out; /* success */
28062 + pr_err("an error(%d) on the writable branch %.*s(%s)\n",
28063 + err, AuDLNPair(h_root), au_sbtype(h_root->d_sb));
28065 + for (i = 0; i < AuBrWh_Last; i++)
28066 + dput(base[i].dentry);
28070 +/* ---------------------------------------------------------------------- */
28072 + * whiteouts are all hard-linked usually.
28073 + * when its link count reaches a ceiling, we create a new whiteout base
28074 + * asynchronously.
28077 +struct reinit_br_wh {
28078 + struct super_block *sb;
28079 + struct au_branch *br;
28082 +static void reinit_br_wh(void *arg)
28085 + aufs_bindex_t bindex;
28086 + struct path h_path;
28087 + struct reinit_br_wh *a = arg;
28088 + struct au_wbr *wbr;
28089 + struct inode *dir;
28090 + struct dentry *h_root;
28091 + struct au_hinode *hdir;
28094 + wbr = a->br->br_wbr;
28095 + /* big aufs lock */
28096 + si_noflush_write_lock(a->sb);
28097 + if (!au_br_writable(a->br->br_perm))
28099 + bindex = au_br_index(a->sb, a->br->br_id);
28100 + if (unlikely(bindex < 0))
28103 + di_read_lock_parent(a->sb->s_root, AuLock_IR);
28104 + dir = a->sb->s_root->d_inode;
28105 + hdir = au_hi(dir, bindex);
28106 + h_root = au_h_dptr(a->sb->s_root, bindex);
28108 + au_hn_imtx_lock_nested(hdir, AuLsc_I_PARENT);
28109 + wbr_wh_write_lock(wbr);
28110 + err = au_h_verify(wbr->wbr_whbase, au_opt_udba(a->sb), hdir->hi_inode,
28113 + err = mnt_want_write(a->br->br_mnt);
28115 + h_path.dentry = wbr->wbr_whbase;
28116 + h_path.mnt = a->br->br_mnt;
28117 + err = vfsub_unlink(hdir->hi_inode, &h_path, /*force*/0);
28118 + mnt_drop_write(a->br->br_mnt);
28121 + pr_warning("%.*s is moved, ignored\n",
28122 + AuDLNPair(wbr->wbr_whbase));
28125 + dput(wbr->wbr_whbase);
28126 + wbr->wbr_whbase = NULL;
28128 + err = au_wh_init(h_root, a->br, a->sb);
28129 + wbr_wh_write_unlock(wbr);
28130 + au_hn_imtx_unlock(hdir);
28131 + di_read_unlock(a->sb->s_root, AuLock_IR);
28135 + atomic_dec(&wbr->wbr_wh_running);
28136 + atomic_dec(&a->br->br_count);
28137 + si_write_unlock(a->sb);
28138 + au_nwt_done(&au_sbi(a->sb)->si_nowait);
28140 + if (unlikely(err))
28141 + AuIOErr("err %d\n", err);
28144 +static void kick_reinit_br_wh(struct super_block *sb, struct au_branch *br)
28146 + int do_dec, wkq_err;
28147 + struct reinit_br_wh *arg;
28150 + if (atomic_inc_return(&br->br_wbr->wbr_wh_running) != 1)
28153 + /* ignore ENOMEM */
28154 + arg = kmalloc(sizeof(*arg), GFP_NOFS);
28157 + * dec(wh_running), kfree(arg) and dec(br_count)
28158 + * in reinit function
28162 + atomic_inc(&br->br_count);
28163 + wkq_err = au_wkq_nowait(reinit_br_wh, arg, sb, /*flags*/0);
28164 + if (unlikely(wkq_err)) {
28165 + atomic_dec(&br->br_wbr->wbr_wh_running);
28166 + atomic_dec(&br->br_count);
28174 + atomic_dec(&br->br_wbr->wbr_wh_running);
28177 +/* ---------------------------------------------------------------------- */
28180 + * create the whiteout @wh.
28182 +static int link_or_create_wh(struct super_block *sb, aufs_bindex_t bindex,
28183 + struct dentry *wh)
28186 + struct path h_path = {
28189 + struct au_branch *br;
28190 + struct au_wbr *wbr;
28191 + struct dentry *h_parent;
28192 + struct inode *h_dir;
28194 + h_parent = wh->d_parent; /* dir inode is locked */
28195 + h_dir = h_parent->d_inode;
28196 + IMustLock(h_dir);
28198 + br = au_sbr(sb, bindex);
28199 + h_path.mnt = br->br_mnt;
28200 + wbr = br->br_wbr;
28201 + wbr_wh_read_lock(wbr);
28202 + if (wbr->wbr_whbase) {
28203 + err = vfsub_link(wbr->wbr_whbase, h_dir, &h_path);
28204 + if (!err || err != -EMLINK)
28207 + /* link count full. re-initialize br_whbase. */
28208 + kick_reinit_br_wh(sb, br);
28211 + /* return this error in this context */
28212 + err = vfsub_create(h_dir, &h_path, WH_MASK);
28215 + wbr_wh_read_unlock(wbr);
28219 +/* ---------------------------------------------------------------------- */
28222 + * create or remove the diropq.
28224 +static struct dentry *do_diropq(struct dentry *dentry, aufs_bindex_t bindex,
28225 + unsigned int flags)
28227 + struct dentry *opq_dentry, *h_dentry;
28228 + struct super_block *sb;
28229 + struct au_branch *br;
28232 + sb = dentry->d_sb;
28233 + br = au_sbr(sb, bindex);
28234 + h_dentry = au_h_dptr(dentry, bindex);
28235 + opq_dentry = au_lkup_one(&diropq_name, h_dentry, br, /*nd*/NULL);
28236 + if (IS_ERR(opq_dentry))
28239 + if (au_ftest_diropq(flags, CREATE)) {
28240 + err = link_or_create_wh(sb, bindex, opq_dentry);
28242 + au_set_dbdiropq(dentry, bindex);
28243 + goto out; /* success */
28246 + struct path tmp = {
28247 + .dentry = opq_dentry,
28248 + .mnt = br->br_mnt
28250 + err = do_unlink_wh(au_h_iptr(dentry->d_inode, bindex), &tmp);
28252 + au_set_dbdiropq(dentry, -1);
28254 + dput(opq_dentry);
28255 + opq_dentry = ERR_PTR(err);
28258 + return opq_dentry;
28261 +struct do_diropq_args {
28262 + struct dentry **errp;
28263 + struct dentry *dentry;
28264 + aufs_bindex_t bindex;
28265 + unsigned int flags;
28268 +static void call_do_diropq(void *args)
28270 + struct do_diropq_args *a = args;
28271 + *a->errp = do_diropq(a->dentry, a->bindex, a->flags);
28274 +struct dentry *au_diropq_sio(struct dentry *dentry, aufs_bindex_t bindex,
28275 + unsigned int flags)
28277 + struct dentry *diropq, *h_dentry;
28279 + h_dentry = au_h_dptr(dentry, bindex);
28280 + if (!au_test_h_perm_sio(h_dentry->d_inode, MAY_EXEC | MAY_WRITE))
28281 + diropq = do_diropq(dentry, bindex, flags);
28284 + struct do_diropq_args args = {
28286 + .dentry = dentry,
28287 + .bindex = bindex,
28291 + wkq_err = au_wkq_wait(call_do_diropq, &args);
28292 + if (unlikely(wkq_err))
28293 + diropq = ERR_PTR(wkq_err);
28299 +/* ---------------------------------------------------------------------- */
28302 + * lookup whiteout dentry.
28303 + * @h_parent: lower parent dentry which must exist and be locked
28304 + * @base_name: name of dentry which will be whiteouted
28305 + * returns dentry for whiteout.
28307 +struct dentry *au_wh_lkup(struct dentry *h_parent, struct qstr *base_name,
28308 + struct au_branch *br)
28311 + struct qstr wh_name;
28312 + struct dentry *wh_dentry;
28314 + err = au_wh_name_alloc(&wh_name, base_name);
28315 + wh_dentry = ERR_PTR(err);
28317 + wh_dentry = au_lkup_one(&wh_name, h_parent, br, /*nd*/NULL);
28318 + kfree(wh_name.name);
28320 + return wh_dentry;
28324 + * link/create a whiteout for @dentry on @bindex.
28326 +struct dentry *au_wh_create(struct dentry *dentry, aufs_bindex_t bindex,
28327 + struct dentry *h_parent)
28329 + struct dentry *wh_dentry;
28330 + struct super_block *sb;
28333 + sb = dentry->d_sb;
28334 + wh_dentry = au_wh_lkup(h_parent, &dentry->d_name, au_sbr(sb, bindex));
28335 + if (!IS_ERR(wh_dentry) && !wh_dentry->d_inode) {
28336 + err = link_or_create_wh(sb, bindex, wh_dentry);
28338 + au_set_dbwh(dentry, bindex);
28341 + wh_dentry = ERR_PTR(err);
28345 + return wh_dentry;
28348 +/* ---------------------------------------------------------------------- */
28350 +/* Delete all whiteouts in this directory on branch bindex. */
28351 +static int del_wh_children(struct dentry *h_dentry, struct au_nhash *whlist,
28352 + aufs_bindex_t bindex, struct au_branch *br)
28355 + unsigned long ul, n;
28356 + struct qstr wh_name;
28358 + struct hlist_head *head;
28359 + struct au_vdir_wh *tpos;
28360 + struct hlist_node *pos;
28361 + struct au_vdir_destr *str;
28364 + p = __getname_gfp(GFP_NOFS);
28365 + wh_name.name = p;
28366 + if (unlikely(!wh_name.name))
28370 + memcpy(p, AUFS_WH_PFX, AUFS_WH_PFX_LEN);
28371 + p += AUFS_WH_PFX_LEN;
28372 + n = whlist->nh_num;
28373 + head = whlist->nh_head;
28374 + for (ul = 0; !err && ul < n; ul++, head++) {
28375 + hlist_for_each_entry(tpos, pos, head, wh_hash) {
28376 + if (tpos->wh_bindex != bindex)
28379 + str = &tpos->wh_str;
28380 + if (str->len + AUFS_WH_PFX_LEN <= PATH_MAX) {
28381 + memcpy(p, str->name, str->len);
28382 + wh_name.len = AUFS_WH_PFX_LEN + str->len;
28383 + err = unlink_wh_name(h_dentry, &wh_name, br);
28388 + AuIOErr("whiteout name too long %.*s\n",
28389 + str->len, str->name);
28394 + __putname(wh_name.name);
28400 +struct del_wh_children_args {
28402 + struct dentry *h_dentry;
28403 + struct au_nhash *whlist;
28404 + aufs_bindex_t bindex;
28405 + struct au_branch *br;
28408 +static void call_del_wh_children(void *args)
28410 + struct del_wh_children_args *a = args;
28411 + *a->errp = del_wh_children(a->h_dentry, a->whlist, a->bindex, a->br);
28414 +/* ---------------------------------------------------------------------- */
28416 +struct au_whtmp_rmdir *au_whtmp_rmdir_alloc(struct super_block *sb, gfp_t gfp)
28418 + struct au_whtmp_rmdir *whtmp;
28420 + unsigned int rdhash;
28422 + SiMustAnyLock(sb);
28424 + whtmp = kmalloc(sizeof(*whtmp), gfp);
28425 + if (unlikely(!whtmp)) {
28426 + whtmp = ERR_PTR(-ENOMEM);
28430 + whtmp->dir = NULL;
28431 + whtmp->br = NULL;
28432 + whtmp->wh_dentry = NULL;
28433 + /* no estimation for dir size */
28434 + rdhash = au_sbi(sb)->si_rdhash;
28436 + rdhash = AUFS_RDHASH_DEF;
28437 + err = au_nhash_alloc(&whtmp->whlist, rdhash, gfp);
28438 + if (unlikely(err)) {
28440 + whtmp = ERR_PTR(err);
28447 +void au_whtmp_rmdir_free(struct au_whtmp_rmdir *whtmp)
28450 + atomic_dec(&whtmp->br->br_count);
28451 + dput(whtmp->wh_dentry);
28452 + iput(whtmp->dir);
28453 + au_nhash_wh_free(&whtmp->whlist);
28458 + * rmdir the whiteouted temporary named dir @h_dentry.
28459 + * @whlist: whiteouted children.
28461 +int au_whtmp_rmdir(struct inode *dir, aufs_bindex_t bindex,
28462 + struct dentry *wh_dentry, struct au_nhash *whlist)
28465 + struct path h_tmp;
28466 + struct inode *wh_inode, *h_dir;
28467 + struct au_branch *br;
28469 + h_dir = wh_dentry->d_parent->d_inode; /* dir inode is locked */
28470 + IMustLock(h_dir);
28472 + br = au_sbr(dir->i_sb, bindex);
28473 + wh_inode = wh_dentry->d_inode;
28474 + mutex_lock_nested(&wh_inode->i_mutex, AuLsc_I_CHILD);
28477 + * someone else might change some whiteouts while we were sleeping.
28478 + * it means this whlist may have an obsoleted entry.
28480 + if (!au_test_h_perm_sio(wh_inode, MAY_EXEC | MAY_WRITE))
28481 + err = del_wh_children(wh_dentry, whlist, bindex, br);
28484 + struct del_wh_children_args args = {
28486 + .h_dentry = wh_dentry,
28487 + .whlist = whlist,
28488 + .bindex = bindex,
28492 + wkq_err = au_wkq_wait(call_del_wh_children, &args);
28493 + if (unlikely(wkq_err))
28496 + mutex_unlock(&wh_inode->i_mutex);
28499 + h_tmp.dentry = wh_dentry;
28500 + h_tmp.mnt = br->br_mnt;
28501 + err = vfsub_rmdir(h_dir, &h_tmp);
28505 + if (au_ibstart(dir) == bindex) {
28506 + /* todo: dir->i_mutex is necessary */
28507 + au_cpup_attr_timesizes(dir);
28508 + vfsub_drop_nlink(dir);
28510 + return 0; /* success */
28513 + pr_warning("failed removing %.*s(%d), ignored\n",
28514 + AuDLNPair(wh_dentry), err);
28518 +static void call_rmdir_whtmp(void *args)
28521 + aufs_bindex_t bindex;
28522 + struct au_whtmp_rmdir *a = args;
28523 + struct super_block *sb;
28524 + struct dentry *h_parent;
28525 + struct inode *h_dir;
28526 + struct au_hinode *hdir;
28528 + /* rmdir by nfsd may cause deadlock with this i_mutex */
28529 + /* mutex_lock(&a->dir->i_mutex); */
28531 + sb = a->dir->i_sb;
28532 + si_read_lock(sb, !AuLock_FLUSH);
28533 + if (!au_br_writable(a->br->br_perm))
28535 + bindex = au_br_index(sb, a->br->br_id);
28536 + if (unlikely(bindex < 0))
28540 + ii_write_lock_parent(a->dir);
28541 + h_parent = dget_parent(a->wh_dentry);
28542 + h_dir = h_parent->d_inode;
28543 + hdir = au_hi(a->dir, bindex);
28544 + au_hn_imtx_lock_nested(hdir, AuLsc_I_PARENT);
28545 + err = au_h_verify(a->wh_dentry, au_opt_udba(sb), h_dir, h_parent,
28548 + err = mnt_want_write(a->br->br_mnt);
28550 + err = au_whtmp_rmdir(a->dir, bindex, a->wh_dentry,
28552 + mnt_drop_write(a->br->br_mnt);
28555 + au_hn_imtx_unlock(hdir);
28557 + ii_write_unlock(a->dir);
28560 + /* mutex_unlock(&a->dir->i_mutex); */
28561 + au_whtmp_rmdir_free(a);
28562 + si_read_unlock(sb);
28563 + au_nwt_done(&au_sbi(sb)->si_nowait);
28564 + if (unlikely(err))
28565 + AuIOErr("err %d\n", err);
28568 +void au_whtmp_kick_rmdir(struct inode *dir, aufs_bindex_t bindex,
28569 + struct dentry *wh_dentry, struct au_whtmp_rmdir *args)
28572 + struct super_block *sb;
28576 + /* all post-process will be done in do_rmdir_whtmp(). */
28578 + args->dir = au_igrab(dir);
28579 + args->br = au_sbr(sb, bindex);
28580 + atomic_inc(&args->br->br_count);
28581 + args->wh_dentry = dget(wh_dentry);
28582 + wkq_err = au_wkq_nowait(call_rmdir_whtmp, args, sb, /*flags*/0);
28583 + if (unlikely(wkq_err)) {
28584 + pr_warning("rmdir error %.*s (%d), ignored\n",
28585 + AuDLNPair(wh_dentry), wkq_err);
28586 + au_whtmp_rmdir_free(args);
28589 diff -urN /usr/share/empty/fs/aufs/whout.h linux/fs/aufs/whout.h
28590 --- /usr/share/empty/fs/aufs/whout.h 1970-01-01 01:00:00.000000000 +0100
28591 +++ linux/fs/aufs/whout.h 2012-02-13 21:54:56.973105100 +0100
28594 + * Copyright (C) 2005-2012 Junjiro R. Okajima
28596 + * This program, aufs is free software; you can redistribute it and/or modify
28597 + * it under the terms of the GNU General Public License as published by
28598 + * the Free Software Foundation; either version 2 of the License, or
28599 + * (at your option) any later version.
28601 + * This program is distributed in the hope that it will be useful,
28602 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
28603 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
28604 + * GNU General Public License for more details.
28606 + * You should have received a copy of the GNU General Public License
28607 + * along with this program; if not, write to the Free Software
28608 + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
28612 + * whiteout for logical deletion and opaque directory
28615 +#ifndef __AUFS_WHOUT_H__
28616 +#define __AUFS_WHOUT_H__
28623 +int au_wh_name_alloc(struct qstr *wh, const struct qstr *name);
28625 +int au_wh_test(struct dentry *h_parent, struct qstr *wh_name,
28626 + struct au_branch *br, int try_sio);
28627 +int au_diropq_test(struct dentry *h_dentry, struct au_branch *br);
28628 +struct dentry *au_whtmp_lkup(struct dentry *h_parent, struct au_branch *br,
28629 + struct qstr *prefix);
28630 +int au_whtmp_ren(struct dentry *h_dentry, struct au_branch *br);
28631 +int au_wh_unlink_dentry(struct inode *h_dir, struct path *h_path,
28632 + struct dentry *dentry);
28633 +int au_wh_init(struct dentry *h_parent, struct au_branch *br,
28634 + struct super_block *sb);
28636 +/* diropq flags */
28637 +#define AuDiropq_CREATE 1
28638 +#define au_ftest_diropq(flags, name) ((flags) & AuDiropq_##name)
28639 +#define au_fset_diropq(flags, name) \
28640 + do { (flags) |= AuDiropq_##name; } while (0)
28641 +#define au_fclr_diropq(flags, name) \
28642 + do { (flags) &= ~AuDiropq_##name; } while (0)
28644 +struct dentry *au_diropq_sio(struct dentry *dentry, aufs_bindex_t bindex,
28645 + unsigned int flags);
28646 +struct dentry *au_wh_lkup(struct dentry *h_parent, struct qstr *base_name,
28647 + struct au_branch *br);
28648 +struct dentry *au_wh_create(struct dentry *dentry, aufs_bindex_t bindex,
28649 + struct dentry *h_parent);
28651 +/* real rmdir for the whiteout-ed dir */
28652 +struct au_whtmp_rmdir {
28653 + struct inode *dir;
28654 + struct au_branch *br;
28655 + struct dentry *wh_dentry;
28656 + struct au_nhash whlist;
28659 +struct au_whtmp_rmdir *au_whtmp_rmdir_alloc(struct super_block *sb, gfp_t gfp);
28660 +void au_whtmp_rmdir_free(struct au_whtmp_rmdir *whtmp);
28661 +int au_whtmp_rmdir(struct inode *dir, aufs_bindex_t bindex,
28662 + struct dentry *wh_dentry, struct au_nhash *whlist);
28663 +void au_whtmp_kick_rmdir(struct inode *dir, aufs_bindex_t bindex,
28664 + struct dentry *wh_dentry, struct au_whtmp_rmdir *args);
28666 +/* ---------------------------------------------------------------------- */
28668 +static inline struct dentry *au_diropq_create(struct dentry *dentry,
28669 + aufs_bindex_t bindex)
28671 + return au_diropq_sio(dentry, bindex, AuDiropq_CREATE);
28674 +static inline int au_diropq_remove(struct dentry *dentry, aufs_bindex_t bindex)
28676 + return PTR_ERR(au_diropq_sio(dentry, bindex, !AuDiropq_CREATE));
28679 +#endif /* __KERNEL__ */
28680 +#endif /* __AUFS_WHOUT_H__ */
28681 diff -urN /usr/share/empty/fs/aufs/wkq.c linux/fs/aufs/wkq.c
28682 --- /usr/share/empty/fs/aufs/wkq.c 1970-01-01 01:00:00.000000000 +0100
28683 +++ linux/fs/aufs/wkq.c 2012-02-13 21:54:56.973105100 +0100
28686 + * Copyright (C) 2005-2012 Junjiro R. Okajima
28688 + * This program, aufs is free software; you can redistribute it and/or modify
28689 + * it under the terms of the GNU General Public License as published by
28690 + * the Free Software Foundation; either version 2 of the License, or
28691 + * (at your option) any later version.
28693 + * This program is distributed in the hope that it will be useful,
28694 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
28695 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
28696 + * GNU General Public License for more details.
28698 + * You should have received a copy of the GNU General Public License
28699 + * along with this program; if not, write to the Free Software
28700 + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
28704 + * workqueue for asynchronous/super-io operations
28705 + * todo: try new dredential scheme
28708 +#include <linux/module.h>
28711 +/* internal workqueue named AUFS_WKQ_NAME */
28713 +static struct workqueue_struct *au_wkq;
28715 +struct au_wkinfo {
28716 + struct work_struct wk;
28717 + struct kobject *kobj;
28719 + unsigned int flags; /* see wkq.h */
28721 + au_wkq_func_t func;
28724 + struct completion *comp;
28727 +/* ---------------------------------------------------------------------- */
28729 +static void wkq_func(struct work_struct *wk)
28731 + struct au_wkinfo *wkinfo = container_of(wk, struct au_wkinfo, wk);
28733 + AuDebugOn(current_fsuid());
28734 + AuDebugOn(rlimit(RLIMIT_FSIZE) != RLIM_INFINITY);
28736 + wkinfo->func(wkinfo->args);
28737 + if (au_ftest_wkq(wkinfo->flags, WAIT))
28738 + complete(wkinfo->comp);
28740 + kobject_put(wkinfo->kobj);
28741 + module_put(THIS_MODULE); /* todo: ?? */
28747 + * Since struct completion is large, try allocating it dynamically.
28749 +#if defined(CONFIG_4KSTACKS) || defined(AuTest4KSTACKS)
28750 +#define AuWkqCompDeclare(name) struct completion *comp = NULL
28752 +static int au_wkq_comp_alloc(struct au_wkinfo *wkinfo, struct completion **comp)
28754 + *comp = kmalloc(sizeof(**comp), GFP_NOFS);
28756 + init_completion(*comp);
28757 + wkinfo->comp = *comp;
28763 +static void au_wkq_comp_free(struct completion *comp)
28771 +#define AuWkqCompDeclare(name) \
28772 + DECLARE_COMPLETION_ONSTACK(_ ## name); \
28773 + struct completion *comp = &_ ## name
28775 +static int au_wkq_comp_alloc(struct au_wkinfo *wkinfo, struct completion **comp)
28777 + wkinfo->comp = *comp;
28781 +static void au_wkq_comp_free(struct completion *comp __maybe_unused)
28785 +#endif /* 4KSTACKS */
28787 +static void au_wkq_run(struct au_wkinfo *wkinfo)
28789 + if (au_ftest_wkq(wkinfo->flags, NEST)) {
28790 + if (au_wkq_test()) {
28791 + AuWarn1("wkq from wkq, due to a dead dir by UDBA?\n");
28792 + AuDebugOn(au_ftest_wkq(wkinfo->flags, WAIT));
28795 + au_dbg_verify_kthread();
28797 + if (au_ftest_wkq(wkinfo->flags, WAIT)) {
28798 + INIT_WORK_ONSTACK(&wkinfo->wk, wkq_func);
28799 + queue_work(au_wkq, &wkinfo->wk);
28801 + INIT_WORK(&wkinfo->wk, wkq_func);
28802 + schedule_work(&wkinfo->wk);
28807 + * Be careful. It is easy to make deadlock happen.
28808 + * processA: lock, wkq and wait
28809 + * processB: wkq and wait, lock in wkq
28812 +int au_wkq_do_wait(unsigned int flags, au_wkq_func_t func, void *args)
28815 + AuWkqCompDeclare(comp);
28816 + struct au_wkinfo wkinfo = {
28822 + err = au_wkq_comp_alloc(&wkinfo, &comp);
28824 + au_wkq_run(&wkinfo);
28825 + /* no timeout, no interrupt */
28826 + wait_for_completion(wkinfo.comp);
28827 + au_wkq_comp_free(comp);
28828 + destroy_work_on_stack(&wkinfo.wk);
28836 + * Note: dget/dput() in func for aufs dentries are not supported. It will be a
28837 + * problem in a concurrent umounting.
28839 +int au_wkq_nowait(au_wkq_func_t func, void *args, struct super_block *sb,
28840 + unsigned int flags)
28843 + struct au_wkinfo *wkinfo;
28845 + atomic_inc(&au_sbi(sb)->si_nowait.nw_len);
28848 + * wkq_func() must free this wkinfo.
28849 + * it highly depends upon the implementation of workqueue.
28852 + wkinfo = kmalloc(sizeof(*wkinfo), GFP_NOFS);
28854 + wkinfo->kobj = &au_sbi(sb)->si_kobj;
28855 + wkinfo->flags = flags & ~AuWkq_WAIT;
28856 + wkinfo->func = func;
28857 + wkinfo->args = args;
28858 + wkinfo->comp = NULL;
28859 + kobject_get(wkinfo->kobj);
28860 + __module_get(THIS_MODULE); /* todo: ?? */
28862 + au_wkq_run(wkinfo);
28865 + au_nwt_done(&au_sbi(sb)->si_nowait);
28871 +/* ---------------------------------------------------------------------- */
28873 +void au_nwt_init(struct au_nowait_tasks *nwt)
28875 + atomic_set(&nwt->nw_len, 0);
28876 + /* smp_mb(); */ /* atomic_set */
28877 + init_waitqueue_head(&nwt->nw_wq);
28880 +void au_wkq_fin(void)
28882 + destroy_workqueue(au_wkq);
28885 +int __init au_wkq_init(void)
28890 + BUILD_BUG_ON(!WQ_RESCUER);
28891 + au_wkq = alloc_workqueue(AUFS_WKQ_NAME, !WQ_RESCUER, WQ_DFL_ACTIVE);
28892 + if (IS_ERR(au_wkq))
28893 + err = PTR_ERR(au_wkq);
28894 + else if (!au_wkq)
28899 diff -urN /usr/share/empty/fs/aufs/wkq.h linux/fs/aufs/wkq.h
28900 --- /usr/share/empty/fs/aufs/wkq.h 1970-01-01 01:00:00.000000000 +0100
28901 +++ linux/fs/aufs/wkq.h 2012-02-13 21:54:56.973105100 +0100
28904 + * Copyright (C) 2005-2012 Junjiro R. Okajima
28906 + * This program, aufs is free software; you can redistribute it and/or modify
28907 + * it under the terms of the GNU General Public License as published by
28908 + * the Free Software Foundation; either version 2 of the License, or
28909 + * (at your option) any later version.
28911 + * This program is distributed in the hope that it will be useful,
28912 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
28913 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
28914 + * GNU General Public License for more details.
28916 + * You should have received a copy of the GNU General Public License
28917 + * along with this program; if not, write to the Free Software
28918 + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
28922 + * workqueue for asynchronous/super-io operations
28923 + * todo: try new credentials management scheme
28926 +#ifndef __AUFS_WKQ_H__
28927 +#define __AUFS_WKQ_H__
28931 +struct super_block;
28933 +/* ---------------------------------------------------------------------- */
28936 + * in the next operation, wait for the 'nowait' tasks in system-wide workqueue
28938 +struct au_nowait_tasks {
28940 + wait_queue_head_t nw_wq;
28943 +/* ---------------------------------------------------------------------- */
28945 +typedef void (*au_wkq_func_t)(void *args);
28948 +#define AuWkq_WAIT 1
28949 +#define AuWkq_NEST (1 << 1)
28950 +#define au_ftest_wkq(flags, name) ((flags) & AuWkq_##name)
28951 +#define au_fset_wkq(flags, name) \
28952 + do { (flags) |= AuWkq_##name; } while (0)
28953 +#define au_fclr_wkq(flags, name) \
28954 + do { (flags) &= ~AuWkq_##name; } while (0)
28956 +#ifndef CONFIG_AUFS_HNOTIFY
28958 +#define AuWkq_NEST 0
28962 +int au_wkq_do_wait(unsigned int flags, au_wkq_func_t func, void *args);
28963 +int au_wkq_nowait(au_wkq_func_t func, void *args, struct super_block *sb,
28964 + unsigned int flags);
28965 +void au_nwt_init(struct au_nowait_tasks *nwt);
28966 +int __init au_wkq_init(void);
28967 +void au_wkq_fin(void);
28969 +/* ---------------------------------------------------------------------- */
28971 +static inline int au_wkq_test(void)
28973 + return current->flags & PF_WQ_WORKER;
28976 +static inline int au_wkq_wait(au_wkq_func_t func, void *args)
28978 + return au_wkq_do_wait(AuWkq_WAIT, func, args);
28981 +static inline void au_nwt_done(struct au_nowait_tasks *nwt)
28983 + if (atomic_dec_and_test(&nwt->nw_len))
28984 + wake_up_all(&nwt->nw_wq);
28987 +static inline int au_nwt_flush(struct au_nowait_tasks *nwt)
28989 + wait_event(nwt->nw_wq, !atomic_read(&nwt->nw_len));
28993 +#endif /* __KERNEL__ */
28994 +#endif /* __AUFS_WKQ_H__ */
28995 diff -urN /usr/share/empty/fs/aufs/xino.c linux/fs/aufs/xino.c
28996 --- /usr/share/empty/fs/aufs/xino.c 1970-01-01 01:00:00.000000000 +0100
28997 +++ linux/fs/aufs/xino.c 2012-02-13 21:54:56.973105100 +0100
29000 + * Copyright (C) 2005-2012 Junjiro R. Okajima
29002 + * This program, aufs is free software; you can redistribute it and/or modify
29003 + * it under the terms of the GNU General Public License as published by
29004 + * the Free Software Foundation; either version 2 of the License, or
29005 + * (at your option) any later version.
29007 + * This program is distributed in the hope that it will be useful,
29008 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
29009 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
29010 + * GNU General Public License for more details.
29012 + * You should have received a copy of the GNU General Public License
29013 + * along with this program; if not, write to the Free Software
29014 + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
29018 + * external inode number translation table and bitmap
29021 +#include <linux/seq_file.h>
29024 +/* todo: unnecessary to support mmap_sem since kernel-space? */
29025 +ssize_t xino_fread(au_readf_t func, struct file *file, void *kbuf, size_t size,
29029 + mm_segment_t oldfs;
29036 + oldfs = get_fs();
29037 + set_fs(KERNEL_DS);
29039 + /* todo: signal_pending? */
29040 + err = func(file, buf.u, size, pos);
29041 + } while (err == -EAGAIN || err == -EINTR);
29044 +#if 0 /* reserved for future use */
29046 + fsnotify_access(file->f_dentry);
29052 +/* ---------------------------------------------------------------------- */
29054 +static ssize_t do_xino_fwrite(au_writef_t func, struct file *file, void *kbuf,
29055 + size_t size, loff_t *pos)
29058 + mm_segment_t oldfs;
29061 + const char __user *u;
29065 + oldfs = get_fs();
29066 + set_fs(KERNEL_DS);
29068 + /* todo: signal_pending? */
29069 + err = func(file, buf.u, size, pos);
29070 + } while (err == -EAGAIN || err == -EINTR);
29073 +#if 0 /* reserved for future use */
29075 + fsnotify_modify(file->f_dentry);
29081 +struct do_xino_fwrite_args {
29083 + au_writef_t func;
29084 + struct file *file;
29090 +static void call_do_xino_fwrite(void *args)
29092 + struct do_xino_fwrite_args *a = args;
29093 + *a->errp = do_xino_fwrite(a->func, a->file, a->buf, a->size, a->pos);
29096 +ssize_t xino_fwrite(au_writef_t func, struct file *file, void *buf, size_t size,
29101 + /* todo: signal block and no wkq? */
29102 + if (rlimit(RLIMIT_FSIZE) == RLIM_INFINITY) {
29104 + err = do_xino_fwrite(func, file, buf, size, pos);
29108 + * it breaks RLIMIT_FSIZE and normal user's limit,
29109 + * users should care about quota and real 'filesystem full.'
29112 + struct do_xino_fwrite_args args = {
29121 + wkq_err = au_wkq_wait(call_do_xino_fwrite, &args);
29122 + if (unlikely(wkq_err))
29129 +/* ---------------------------------------------------------------------- */
29132 + * create a new xinofile at the same place/path as @base_file.
29134 +struct file *au_xino_create2(struct file *base_file, struct file *copy_src)
29136 + struct file *file;
29137 + struct dentry *base, *parent;
29138 + struct inode *dir;
29139 + struct qstr *name;
29140 + struct path path;
29143 + base = base_file->f_dentry;
29144 + parent = base->d_parent; /* dir inode is locked */
29145 + dir = parent->d_inode;
29148 + file = ERR_PTR(-EINVAL);
29149 + name = &base->d_name;
29150 + path.dentry = vfsub_lookup_one_len(name->name, parent, name->len);
29151 + if (IS_ERR(path.dentry)) {
29152 + file = (void *)path.dentry;
29153 + pr_err("%.*s lookup err %ld\n",
29154 + AuLNPair(name), PTR_ERR(path.dentry));
29158 + /* no need to mnt_want_write() since we call dentry_open() later */
29159 + err = vfs_create(dir, path.dentry, S_IRUGO | S_IWUGO, NULL);
29160 + if (unlikely(err)) {
29161 + file = ERR_PTR(err);
29162 + pr_err("%.*s create err %d\n", AuLNPair(name), err);
29166 + path.mnt = base_file->f_vfsmnt;
29167 + file = vfsub_dentry_open(&path,
29168 + O_RDWR | O_CREAT | O_EXCL | O_LARGEFILE
29169 + /* | __FMODE_NONOTIFY */);
29170 + if (IS_ERR(file)) {
29171 + pr_err("%.*s open err %ld\n", AuLNPair(name), PTR_ERR(file));
29175 + err = vfsub_unlink(dir, &file->f_path, /*force*/0);
29176 + if (unlikely(err)) {
29177 + pr_err("%.*s unlink err %d\n", AuLNPair(name), err);
29182 + /* no one can touch copy_src xino */
29183 + err = au_copy_file(file, copy_src,
29184 + i_size_read(copy_src->f_dentry->d_inode));
29185 + if (unlikely(err)) {
29186 + pr_err("%.*s copy err %d\n", AuLNPair(name), err);
29190 + goto out_dput; /* success */
29194 + file = ERR_PTR(err);
29196 + dput(path.dentry);
29201 +struct au_xino_lock_dir {
29202 + struct au_hinode *hdir;
29203 + struct dentry *parent;
29204 + struct mutex *mtx;
29207 +static void au_xino_lock_dir(struct super_block *sb, struct file *xino,
29208 + struct au_xino_lock_dir *ldir)
29210 + aufs_bindex_t brid, bindex;
29212 + ldir->hdir = NULL;
29214 + brid = au_xino_brid(sb);
29216 + bindex = au_br_index(sb, brid);
29217 + if (bindex >= 0) {
29218 + ldir->hdir = au_hi(sb->s_root->d_inode, bindex);
29219 + au_hn_imtx_lock_nested(ldir->hdir, AuLsc_I_PARENT);
29221 + ldir->parent = dget_parent(xino->f_dentry);
29222 + ldir->mtx = &ldir->parent->d_inode->i_mutex;
29223 + mutex_lock_nested(ldir->mtx, AuLsc_I_PARENT);
29227 +static void au_xino_unlock_dir(struct au_xino_lock_dir *ldir)
29230 + au_hn_imtx_unlock(ldir->hdir);
29232 + mutex_unlock(ldir->mtx);
29233 + dput(ldir->parent);
29237 +/* ---------------------------------------------------------------------- */
29239 +/* trucate xino files asynchronously */
29241 +int au_xino_trunc(struct super_block *sb, aufs_bindex_t bindex)
29244 + aufs_bindex_t bi, bend;
29245 + struct au_branch *br;
29246 + struct file *new_xino, *file;
29247 + struct super_block *h_sb;
29248 + struct au_xino_lock_dir ldir;
29251 + bend = au_sbend(sb);
29252 + if (unlikely(bindex < 0 || bend < bindex))
29254 + br = au_sbr(sb, bindex);
29255 + file = br->br_xino.xi_file;
29259 + au_xino_lock_dir(sb, file, &ldir);
29260 + /* mnt_want_write() is unnecessary here */
29261 + new_xino = au_xino_create2(file, file);
29262 + au_xino_unlock_dir(&ldir);
29263 + err = PTR_ERR(new_xino);
29264 + if (IS_ERR(new_xino))
29268 + br->br_xino.xi_file = new_xino;
29270 + h_sb = br->br_mnt->mnt_sb;
29271 + for (bi = 0; bi <= bend; bi++) {
29272 + if (unlikely(bi == bindex))
29274 + br = au_sbr(sb, bi);
29275 + if (br->br_mnt->mnt_sb != h_sb)
29278 + fput(br->br_xino.xi_file);
29279 + br->br_xino.xi_file = new_xino;
29280 + get_file(new_xino);
29287 +struct xino_do_trunc_args {
29288 + struct super_block *sb;
29289 + struct au_branch *br;
29292 +static void xino_do_trunc(void *_args)
29294 + struct xino_do_trunc_args *args = _args;
29295 + struct super_block *sb;
29296 + struct au_branch *br;
29297 + struct inode *dir;
29299 + aufs_bindex_t bindex;
29303 + dir = sb->s_root->d_inode;
29306 + si_noflush_write_lock(sb);
29307 + ii_read_lock_parent(dir);
29308 + bindex = au_br_index(sb, br->br_id);
29309 + err = au_xino_trunc(sb, bindex);
29311 + && br->br_xino.xi_file->f_dentry->d_inode->i_blocks
29312 + >= br->br_xino_upper)
29313 + br->br_xino_upper += AUFS_XINO_TRUNC_STEP;
29315 + ii_read_unlock(dir);
29316 + if (unlikely(err))
29317 + pr_warning("err b%d, (%d)\n", bindex, err);
29318 + atomic_dec(&br->br_xino_running);
29319 + atomic_dec(&br->br_count);
29320 + si_write_unlock(sb);
29321 + au_nwt_done(&au_sbi(sb)->si_nowait);
29325 +static void xino_try_trunc(struct super_block *sb, struct au_branch *br)
29327 + struct xino_do_trunc_args *args;
29330 + if (br->br_xino.xi_file->f_dentry->d_inode->i_blocks
29331 + < br->br_xino_upper)
29334 + if (atomic_inc_return(&br->br_xino_running) > 1)
29337 + /* lock and kfree() will be called in trunc_xino() */
29338 + args = kmalloc(sizeof(*args), GFP_NOFS);
29339 + if (unlikely(!args)) {
29340 + AuErr1("no memory\n");
29344 + atomic_inc(&br->br_count);
29347 + wkq_err = au_wkq_nowait(xino_do_trunc, args, sb, /*flags*/0);
29349 + return; /* success */
29351 + pr_err("wkq %d\n", wkq_err);
29352 + atomic_dec(&br->br_count);
29357 + atomic_dec(&br->br_xino_running);
29360 +/* ---------------------------------------------------------------------- */
29362 +static int au_xino_do_write(au_writef_t write, struct file *file,
29363 + ino_t h_ino, ino_t ino)
29369 + if (unlikely(au_loff_max / sizeof(ino) - 1 < pos)) {
29370 + AuIOErr1("too large hi%lu\n", (unsigned long)h_ino);
29373 + pos *= sizeof(ino);
29374 + sz = xino_fwrite(write, file, &ino, sizeof(ino), &pos);
29375 + if (sz == sizeof(ino))
29376 + return 0; /* success */
29378 + AuIOErr("write failed (%zd)\n", sz);
29383 + * write @ino to the xinofile for the specified branch{@sb, @bindex}
29384 + * at the position of @h_ino.
29385 + * even if @ino is zero, it is written to the xinofile and means no entry.
29386 + * if the size of the xino file on a specific filesystem exceeds the watermark,
29387 + * try truncating it.
29389 +int au_xino_write(struct super_block *sb, aufs_bindex_t bindex, ino_t h_ino,
29393 + unsigned int mnt_flags;
29394 + struct au_branch *br;
29396 + BUILD_BUG_ON(sizeof(long long) != sizeof(au_loff_max)
29397 + || ((loff_t)-1) > 0);
29398 + SiMustAnyLock(sb);
29400 + mnt_flags = au_mntflags(sb);
29401 + if (!au_opt_test(mnt_flags, XINO))
29404 + br = au_sbr(sb, bindex);
29405 + err = au_xino_do_write(au_sbi(sb)->si_xwrite, br->br_xino.xi_file,
29408 + if (au_opt_test(mnt_flags, TRUNC_XINO)
29409 + && au_test_fs_trunc_xino(br->br_mnt->mnt_sb))
29410 + xino_try_trunc(sb, br);
29411 + return 0; /* success */
29414 + AuIOErr("write failed (%d)\n", err);
29418 +/* ---------------------------------------------------------------------- */
29420 +/* aufs inode number bitmap */
29422 +static const int page_bits = (int)PAGE_SIZE * BITS_PER_BYTE;
29423 +static ino_t xib_calc_ino(unsigned long pindex, int bit)
29427 + AuDebugOn(bit < 0 || page_bits <= bit);
29428 + ino = AUFS_FIRST_INO + pindex * page_bits + bit;
29432 +static void xib_calc_bit(ino_t ino, unsigned long *pindex, int *bit)
29434 + AuDebugOn(ino < AUFS_FIRST_INO);
29435 + ino -= AUFS_FIRST_INO;
29436 + *pindex = ino / page_bits;
29437 + *bit = ino % page_bits;
29440 +static int xib_pindex(struct super_block *sb, unsigned long pindex)
29445 + struct au_sbinfo *sbinfo;
29446 + struct file *xib;
29447 + unsigned long *p;
29449 + sbinfo = au_sbi(sb);
29450 + MtxMustLock(&sbinfo->si_xib_mtx);
29451 + AuDebugOn(pindex > ULONG_MAX / PAGE_SIZE
29452 + || !au_opt_test(sbinfo->si_mntflags, XINO));
29454 + if (pindex == sbinfo->si_xib_last_pindex)
29457 + xib = sbinfo->si_xib;
29458 + p = sbinfo->si_xib_buf;
29459 + pos = sbinfo->si_xib_last_pindex;
29460 + pos *= PAGE_SIZE;
29461 + sz = xino_fwrite(sbinfo->si_xwrite, xib, p, PAGE_SIZE, &pos);
29462 + if (unlikely(sz != PAGE_SIZE))
29466 + pos *= PAGE_SIZE;
29467 + if (i_size_read(xib->f_dentry->d_inode) >= pos + PAGE_SIZE)
29468 + sz = xino_fread(sbinfo->si_xread, xib, p, PAGE_SIZE, &pos);
29470 + memset(p, 0, PAGE_SIZE);
29471 + sz = xino_fwrite(sbinfo->si_xwrite, xib, p, PAGE_SIZE, &pos);
29473 + if (sz == PAGE_SIZE) {
29474 + sbinfo->si_xib_last_pindex = pindex;
29475 + return 0; /* success */
29479 + AuIOErr1("write failed (%zd)\n", sz);
29486 +/* ---------------------------------------------------------------------- */
29488 +static void au_xib_clear_bit(struct inode *inode)
29491 + unsigned long pindex;
29492 + struct super_block *sb;
29493 + struct au_sbinfo *sbinfo;
29495 + AuDebugOn(inode->i_nlink);
29497 + sb = inode->i_sb;
29498 + xib_calc_bit(inode->i_ino, &pindex, &bit);
29499 + AuDebugOn(page_bits <= bit);
29500 + sbinfo = au_sbi(sb);
29501 + mutex_lock(&sbinfo->si_xib_mtx);
29502 + err = xib_pindex(sb, pindex);
29504 + clear_bit(bit, sbinfo->si_xib_buf);
29505 + sbinfo->si_xib_next_bit = bit;
29507 + mutex_unlock(&sbinfo->si_xib_mtx);
29510 +/* for s_op->delete_inode() */
29511 +void au_xino_delete_inode(struct inode *inode, const int unlinked)
29514 + unsigned int mnt_flags;
29515 + aufs_bindex_t bindex, bend, bi;
29516 + unsigned char try_trunc;
29517 + struct au_iinfo *iinfo;
29518 + struct super_block *sb;
29519 + struct au_hinode *hi;
29520 + struct inode *h_inode;
29521 + struct au_branch *br;
29522 + au_writef_t xwrite;
29524 + sb = inode->i_sb;
29525 + mnt_flags = au_mntflags(sb);
29526 + if (!au_opt_test(mnt_flags, XINO)
29527 + || inode->i_ino == AUFS_ROOT_INO)
29531 + au_xigen_inc(inode);
29532 + au_xib_clear_bit(inode);
29535 + iinfo = au_ii(inode);
29539 + bindex = iinfo->ii_bstart;
29543 + xwrite = au_sbi(sb)->si_xwrite;
29544 + try_trunc = !!au_opt_test(mnt_flags, TRUNC_XINO);
29545 + hi = iinfo->ii_hinode + bindex;
29546 + bend = iinfo->ii_bend;
29547 + for (; bindex <= bend; bindex++, hi++) {
29548 + h_inode = hi->hi_inode;
29550 + || (!unlinked && h_inode->i_nlink))
29553 + /* inode may not be revalidated */
29554 + bi = au_br_index(sb, hi->hi_id);
29558 + br = au_sbr(sb, bi);
29559 + err = au_xino_do_write(xwrite, br->br_xino.xi_file,
29560 + h_inode->i_ino, /*ino*/0);
29561 + if (!err && try_trunc
29562 + && au_test_fs_trunc_xino(br->br_mnt->mnt_sb))
29563 + xino_try_trunc(sb, br);
29567 +/* get an unused inode number from bitmap */
29568 +ino_t au_xino_new_ino(struct super_block *sb)
29571 + unsigned long *p, pindex, ul, pend;
29572 + struct au_sbinfo *sbinfo;
29573 + struct file *file;
29574 + int free_bit, err;
29576 + if (!au_opt_test(au_mntflags(sb), XINO))
29577 + return iunique(sb, AUFS_FIRST_INO);
29579 + sbinfo = au_sbi(sb);
29580 + mutex_lock(&sbinfo->si_xib_mtx);
29581 + p = sbinfo->si_xib_buf;
29582 + free_bit = sbinfo->si_xib_next_bit;
29583 + if (free_bit < page_bits && !test_bit(free_bit, p))
29584 + goto out; /* success */
29585 + free_bit = find_first_zero_bit(p, page_bits);
29586 + if (free_bit < page_bits)
29587 + goto out; /* success */
29589 + pindex = sbinfo->si_xib_last_pindex;
29590 + for (ul = pindex - 1; ul < ULONG_MAX; ul--) {
29591 + err = xib_pindex(sb, ul);
29592 + if (unlikely(err))
29594 + free_bit = find_first_zero_bit(p, page_bits);
29595 + if (free_bit < page_bits)
29596 + goto out; /* success */
29599 + file = sbinfo->si_xib;
29600 + pend = i_size_read(file->f_dentry->d_inode) / PAGE_SIZE;
29601 + for (ul = pindex + 1; ul <= pend; ul++) {
29602 + err = xib_pindex(sb, ul);
29603 + if (unlikely(err))
29605 + free_bit = find_first_zero_bit(p, page_bits);
29606 + if (free_bit < page_bits)
29607 + goto out; /* success */
29612 + set_bit(free_bit, p);
29613 + sbinfo->si_xib_next_bit = free_bit + 1;
29614 + pindex = sbinfo->si_xib_last_pindex;
29615 + mutex_unlock(&sbinfo->si_xib_mtx);
29616 + ino = xib_calc_ino(pindex, free_bit);
29617 + AuDbg("i%lu\n", (unsigned long)ino);
29620 + mutex_unlock(&sbinfo->si_xib_mtx);
29626 + * read @ino from xinofile for the specified branch{@sb, @bindex}
29627 + * at the position of @h_ino.
29628 + * if @ino does not exist and @do_new is true, get new one.
29630 +int au_xino_read(struct super_block *sb, aufs_bindex_t bindex, ino_t h_ino,
29636 + struct file *file;
29637 + struct au_sbinfo *sbinfo;
29640 + if (!au_opt_test(au_mntflags(sb), XINO))
29641 + return 0; /* no xino */
29644 + sbinfo = au_sbi(sb);
29646 + if (unlikely(au_loff_max / sizeof(*ino) - 1 < pos)) {
29647 + AuIOErr1("too large hi%lu\n", (unsigned long)h_ino);
29650 + pos *= sizeof(*ino);
29652 + file = au_sbr(sb, bindex)->br_xino.xi_file;
29653 + if (i_size_read(file->f_dentry->d_inode) < pos + sizeof(*ino))
29654 + return 0; /* no ino */
29656 + sz = xino_fread(sbinfo->si_xread, file, ino, sizeof(*ino), &pos);
29657 + if (sz == sizeof(*ino))
29658 + return 0; /* success */
29661 + if (unlikely(sz >= 0)) {
29663 + AuIOErr("xino read error (%zd)\n", sz);
29669 +/* ---------------------------------------------------------------------- */
29671 +/* create and set a new xino file */
29673 +struct file *au_xino_create(struct super_block *sb, char *fname, int silent)
29675 + struct file *file;
29676 + struct dentry *h_parent, *d;
29677 + struct inode *h_dir;
29681 + * at mount-time, and the xino file is the default path,
29682 + * hnotify is disabled so we have no notify events to ignore.
29683 + * when a user specified the xino, we cannot get au_hdir to be ignored.
29685 + file = vfsub_filp_open(fname, O_RDWR | O_CREAT | O_EXCL | O_LARGEFILE
29686 + /* | __FMODE_NONOTIFY */,
29687 + S_IRUGO | S_IWUGO);
29688 + if (IS_ERR(file)) {
29690 + pr_err("open %s(%ld)\n", fname, PTR_ERR(file));
29694 + /* keep file count */
29695 + h_parent = dget_parent(file->f_dentry);
29696 + h_dir = h_parent->d_inode;
29697 + mutex_lock_nested(&h_dir->i_mutex, AuLsc_I_PARENT);
29698 + /* mnt_want_write() is unnecessary here */
29699 + err = vfsub_unlink(h_dir, &file->f_path, /*force*/0);
29700 + mutex_unlock(&h_dir->i_mutex);
29702 + if (unlikely(err)) {
29704 + pr_err("unlink %s(%d)\n", fname, err);
29709 + d = file->f_dentry;
29710 + if (unlikely(sb == d->d_sb)) {
29712 + pr_err("%s must be outside\n", fname);
29715 + if (unlikely(au_test_fs_bad_xino(d->d_sb))) {
29717 + pr_err("xino doesn't support %s(%s)\n",
29718 + fname, au_sbtype(d->d_sb));
29721 + return file; /* success */
29725 + file = ERR_PTR(err);
29730 + * find another branch who is on the same filesystem of the specified
29731 + * branch{@btgt}. search until @bend.
29733 +static int is_sb_shared(struct super_block *sb, aufs_bindex_t btgt,
29734 + aufs_bindex_t bend)
29736 + aufs_bindex_t bindex;
29737 + struct super_block *tgt_sb = au_sbr_sb(sb, btgt);
29739 + for (bindex = 0; bindex < btgt; bindex++)
29740 + if (unlikely(tgt_sb == au_sbr_sb(sb, bindex)))
29742 + for (bindex++; bindex <= bend; bindex++)
29743 + if (unlikely(tgt_sb == au_sbr_sb(sb, bindex)))
29748 +/* ---------------------------------------------------------------------- */
29751 + * initialize the xinofile for the specified branch @br
29752 + * at the place/path where @base_file indicates.
29753 + * test whether another branch is on the same filesystem or not,
29754 + * if @do_test is true.
29756 +int au_xino_br(struct super_block *sb, struct au_branch *br, ino_t h_ino,
29757 + struct file *base_file, int do_test)
29761 + aufs_bindex_t bend, bindex;
29762 + struct au_branch *shared_br, *b;
29763 + struct file *file;
29764 + struct super_block *tgt_sb;
29766 + shared_br = NULL;
29767 + bend = au_sbend(sb);
29769 + tgt_sb = br->br_mnt->mnt_sb;
29770 + for (bindex = 0; bindex <= bend; bindex++) {
29771 + b = au_sbr(sb, bindex);
29772 + if (tgt_sb == b->br_mnt->mnt_sb) {
29779 + if (!shared_br || !shared_br->br_xino.xi_file) {
29780 + struct au_xino_lock_dir ldir;
29782 + au_xino_lock_dir(sb, base_file, &ldir);
29783 + /* mnt_want_write() is unnecessary here */
29784 + file = au_xino_create2(base_file, NULL);
29785 + au_xino_unlock_dir(&ldir);
29786 + err = PTR_ERR(file);
29787 + if (IS_ERR(file))
29789 + br->br_xino.xi_file = file;
29791 + br->br_xino.xi_file = shared_br->br_xino.xi_file;
29792 + get_file(br->br_xino.xi_file);
29795 + ino = AUFS_ROOT_INO;
29796 + err = au_xino_do_write(au_sbi(sb)->si_xwrite, br->br_xino.xi_file,
29798 + if (unlikely(err)) {
29799 + fput(br->br_xino.xi_file);
29800 + br->br_xino.xi_file = NULL;
29807 +/* ---------------------------------------------------------------------- */
29809 +/* trucate a xino bitmap file */
29812 +static int do_xib_restore(struct super_block *sb, struct file *file, void *page)
29816 + unsigned long pindex;
29817 + loff_t pos, pend;
29818 + struct au_sbinfo *sbinfo;
29821 + unsigned long *p;
29824 + sbinfo = au_sbi(sb);
29825 + MtxMustLock(&sbinfo->si_xib_mtx);
29826 + p = sbinfo->si_xib_buf;
29827 + func = sbinfo->si_xread;
29828 + pend = i_size_read(file->f_dentry->d_inode);
29830 + while (pos < pend) {
29831 + sz = xino_fread(func, file, page, PAGE_SIZE, &pos);
29833 + if (unlikely(sz <= 0))
29837 + for (ino = page; sz > 0; ino++, sz -= sizeof(ino)) {
29838 + if (unlikely(*ino < AUFS_FIRST_INO))
29841 + xib_calc_bit(*ino, &pindex, &bit);
29842 + AuDebugOn(page_bits <= bit);
29843 + err = xib_pindex(sb, pindex);
29855 +static int xib_restore(struct super_block *sb)
29858 + aufs_bindex_t bindex, bend;
29862 + page = (void *)__get_free_page(GFP_NOFS);
29863 + if (unlikely(!page))
29867 + bend = au_sbend(sb);
29868 + for (bindex = 0; !err && bindex <= bend; bindex++)
29869 + if (!bindex || is_sb_shared(sb, bindex, bindex - 1) < 0)
29870 + err = do_xib_restore
29871 + (sb, au_sbr(sb, bindex)->br_xino.xi_file, page);
29873 + AuDbg("b%d\n", bindex);
29874 + free_page((unsigned long)page);
29880 +int au_xib_trunc(struct super_block *sb)
29885 + struct au_xino_lock_dir ldir;
29886 + struct au_sbinfo *sbinfo;
29887 + unsigned long *p;
29888 + struct file *file;
29890 + SiMustWriteLock(sb);
29893 + sbinfo = au_sbi(sb);
29894 + if (!au_opt_test(sbinfo->si_mntflags, XINO))
29897 + file = sbinfo->si_xib;
29898 + if (i_size_read(file->f_dentry->d_inode) <= PAGE_SIZE)
29901 + au_xino_lock_dir(sb, file, &ldir);
29902 + /* mnt_want_write() is unnecessary here */
29903 + file = au_xino_create2(sbinfo->si_xib, NULL);
29904 + au_xino_unlock_dir(&ldir);
29905 + err = PTR_ERR(file);
29906 + if (IS_ERR(file))
29908 + fput(sbinfo->si_xib);
29909 + sbinfo->si_xib = file;
29911 + p = sbinfo->si_xib_buf;
29912 + memset(p, 0, PAGE_SIZE);
29914 + sz = xino_fwrite(sbinfo->si_xwrite, sbinfo->si_xib, p, PAGE_SIZE, &pos);
29915 + if (unlikely(sz != PAGE_SIZE)) {
29917 + AuIOErr("err %d\n", err);
29923 + mutex_lock(&sbinfo->si_xib_mtx);
29924 + /* mnt_want_write() is unnecessary here */
29925 + err = xib_restore(sb);
29926 + mutex_unlock(&sbinfo->si_xib_mtx);
29932 +/* ---------------------------------------------------------------------- */
29935 + * xino mount option handlers
29937 +static au_readf_t find_readf(struct file *h_file)
29939 + const struct file_operations *fop = h_file->f_op;
29943 + return fop->read;
29944 + if (fop->aio_read)
29945 + return do_sync_read;
29947 + return ERR_PTR(-ENOSYS);
29950 +static au_writef_t find_writef(struct file *h_file)
29952 + const struct file_operations *fop = h_file->f_op;
29956 + return fop->write;
29957 + if (fop->aio_write)
29958 + return do_sync_write;
29960 + return ERR_PTR(-ENOSYS);
29964 +static void xino_clear_xib(struct super_block *sb)
29966 + struct au_sbinfo *sbinfo;
29968 + SiMustWriteLock(sb);
29970 + sbinfo = au_sbi(sb);
29971 + sbinfo->si_xread = NULL;
29972 + sbinfo->si_xwrite = NULL;
29973 + if (sbinfo->si_xib)
29974 + fput(sbinfo->si_xib);
29975 + sbinfo->si_xib = NULL;
29976 + free_page((unsigned long)sbinfo->si_xib_buf);
29977 + sbinfo->si_xib_buf = NULL;
29980 +static int au_xino_set_xib(struct super_block *sb, struct file *base)
29984 + struct au_sbinfo *sbinfo;
29985 + struct file *file;
29987 + SiMustWriteLock(sb);
29989 + sbinfo = au_sbi(sb);
29990 + file = au_xino_create2(base, sbinfo->si_xib);
29991 + err = PTR_ERR(file);
29992 + if (IS_ERR(file))
29994 + if (sbinfo->si_xib)
29995 + fput(sbinfo->si_xib);
29996 + sbinfo->si_xib = file;
29997 + sbinfo->si_xread = find_readf(file);
29998 + sbinfo->si_xwrite = find_writef(file);
30001 + if (!sbinfo->si_xib_buf)
30002 + sbinfo->si_xib_buf = (void *)get_zeroed_page(GFP_NOFS);
30003 + if (unlikely(!sbinfo->si_xib_buf))
30006 + sbinfo->si_xib_last_pindex = 0;
30007 + sbinfo->si_xib_next_bit = 0;
30008 + if (i_size_read(file->f_dentry->d_inode) < PAGE_SIZE) {
30010 + err = xino_fwrite(sbinfo->si_xwrite, file, sbinfo->si_xib_buf,
30011 + PAGE_SIZE, &pos);
30012 + if (unlikely(err != PAGE_SIZE))
30016 + goto out; /* success */
30019 + free_page((unsigned long)sbinfo->si_xib_buf);
30020 + sbinfo->si_xib_buf = NULL;
30024 + fput(sbinfo->si_xib);
30025 + sbinfo->si_xib = NULL;
30026 + sbinfo->si_xread = NULL;
30027 + sbinfo->si_xwrite = NULL;
30032 +/* xino for each branch */
30033 +static void xino_clear_br(struct super_block *sb)
30035 + aufs_bindex_t bindex, bend;
30036 + struct au_branch *br;
30038 + bend = au_sbend(sb);
30039 + for (bindex = 0; bindex <= bend; bindex++) {
30040 + br = au_sbr(sb, bindex);
30041 + if (!br || !br->br_xino.xi_file)
30044 + fput(br->br_xino.xi_file);
30045 + br->br_xino.xi_file = NULL;
30049 +static int au_xino_set_br(struct super_block *sb, struct file *base)
30053 + aufs_bindex_t bindex, bend, bshared;
30055 + struct file *old, *new;
30057 + struct au_branch *br;
30058 + struct inode *inode;
30059 + au_writef_t writef;
30061 + SiMustWriteLock(sb);
30064 + bend = au_sbend(sb);
30065 + fpair = kcalloc(bend + 1, sizeof(*fpair), GFP_NOFS);
30066 + if (unlikely(!fpair))
30069 + inode = sb->s_root->d_inode;
30070 + ino = AUFS_ROOT_INO;
30071 + writef = au_sbi(sb)->si_xwrite;
30072 + for (bindex = 0, p = fpair; bindex <= bend; bindex++, p++) {
30073 + br = au_sbr(sb, bindex);
30074 + bshared = is_sb_shared(sb, bindex, bindex - 1);
30075 + if (bshared >= 0) {
30076 + /* shared xino */
30077 + *p = fpair[bshared];
30078 + get_file(p->new);
30083 + p->old = br->br_xino.xi_file;
30084 + p->new = au_xino_create2(base, br->br_xino.xi_file);
30085 + err = PTR_ERR(p->new);
30086 + if (IS_ERR(p->new)) {
30092 + err = au_xino_do_write(writef, p->new,
30093 + au_h_iptr(inode, bindex)->i_ino, ino);
30094 + if (unlikely(err))
30098 + for (bindex = 0, p = fpair; bindex <= bend; bindex++, p++) {
30099 + br = au_sbr(sb, bindex);
30100 + if (br->br_xino.xi_file)
30101 + fput(br->br_xino.xi_file);
30102 + get_file(p->new);
30103 + br->br_xino.xi_file = p->new;
30107 + for (bindex = 0, p = fpair; bindex <= bend; bindex++, p++)
30117 +void au_xino_clr(struct super_block *sb)
30119 + struct au_sbinfo *sbinfo;
30121 + au_xigen_clr(sb);
30122 + xino_clear_xib(sb);
30123 + xino_clear_br(sb);
30124 + sbinfo = au_sbi(sb);
30125 + /* lvalue, do not call au_mntflags() */
30126 + au_opt_clr(sbinfo->si_mntflags, XINO);
30129 +int au_xino_set(struct super_block *sb, struct au_opt_xino *xino, int remount)
30132 + struct dentry *parent, *cur_parent;
30133 + struct qstr *dname, *cur_name;
30134 + struct file *cur_xino;
30135 + struct inode *dir;
30136 + struct au_sbinfo *sbinfo;
30138 + SiMustWriteLock(sb);
30141 + sbinfo = au_sbi(sb);
30142 + parent = dget_parent(xino->file->f_dentry);
30145 + dname = &xino->file->f_dentry->d_name;
30146 + cur_xino = sbinfo->si_xib;
30148 + cur_parent = dget_parent(cur_xino->f_dentry);
30149 + cur_name = &cur_xino->f_dentry->d_name;
30150 + skip = (cur_parent == parent
30151 + && dname->len == cur_name->len
30152 + && !memcmp(dname->name, cur_name->name,
30154 + dput(cur_parent);
30160 + au_opt_set(sbinfo->si_mntflags, XINO);
30161 + dir = parent->d_inode;
30162 + mutex_lock_nested(&dir->i_mutex, AuLsc_I_PARENT);
30163 + /* mnt_want_write() is unnecessary here */
30164 + err = au_xino_set_xib(sb, xino->file);
30166 + err = au_xigen_set(sb, xino->file);
30168 + err = au_xino_set_br(sb, xino->file);
30169 + mutex_unlock(&dir->i_mutex);
30171 + goto out; /* success */
30174 + AuIOErr("failed creating xino(%d).\n", err);
30181 +/* ---------------------------------------------------------------------- */
30184 + * create a xinofile at the default place/path.
30186 +struct file *au_xino_def(struct super_block *sb)
30188 + struct file *file;
30190 + struct au_branch *br;
30191 + struct super_block *h_sb;
30192 + struct path path;
30193 + aufs_bindex_t bend, bindex, bwr;
30196 + bend = au_sbend(sb);
30198 + for (bindex = 0; bindex <= bend; bindex++) {
30199 + br = au_sbr(sb, bindex);
30200 + if (au_br_writable(br->br_perm)
30201 + && !au_test_fs_bad_xino(br->br_mnt->mnt_sb)) {
30208 + file = ERR_PTR(-ENOMEM);
30209 + page = __getname_gfp(GFP_NOFS);
30210 + if (unlikely(!page))
30212 + path.mnt = br->br_mnt;
30213 + path.dentry = au_h_dptr(sb->s_root, bwr);
30214 + p = d_path(&path, page, PATH_MAX - sizeof(AUFS_XINO_FNAME));
30215 + file = (void *)p;
30216 + if (!IS_ERR(p)) {
30217 + strcat(p, "/" AUFS_XINO_FNAME);
30218 + AuDbg("%s\n", p);
30219 + file = au_xino_create(sb, p, /*silent*/0);
30220 + if (!IS_ERR(file))
30221 + au_xino_brid_set(sb, br->br_id);
30225 + file = au_xino_create(sb, AUFS_XINO_DEFPATH, /*silent*/0);
30226 + if (IS_ERR(file))
30228 + h_sb = file->f_dentry->d_sb;
30229 + if (unlikely(au_test_fs_bad_xino(h_sb))) {
30230 + pr_err("xino doesn't support %s(%s)\n",
30231 + AUFS_XINO_DEFPATH, au_sbtype(h_sb));
30233 + file = ERR_PTR(-EINVAL);
30235 + if (!IS_ERR(file))
30236 + au_xino_brid_set(sb, -1);
30243 +/* ---------------------------------------------------------------------- */
30245 +int au_xino_path(struct seq_file *seq, struct file *file)
30249 + err = au_seq_path(seq, &file->f_path);
30250 + if (unlikely(err < 0))
30254 +#define Deleted "\\040(deleted)"
30255 + seq->count -= sizeof(Deleted) - 1;
30256 + AuDebugOn(memcmp(seq->buf + seq->count, Deleted,
30257 + sizeof(Deleted) - 1));
30263 diff -urN /usr/share/empty/include/linux/aufs_type.h linux/include/linux/aufs_type.h
30264 --- /usr/share/empty/include/linux/aufs_type.h 1970-01-01 01:00:00.000000000 +0100
30265 +++ linux/include/linux/aufs_type.h 2012-02-13 21:54:56.973105100 +0100
30268 + * Copyright (C) 2005-2012 Junjiro R. Okajima
30270 + * This program, aufs is free software; you can redistribute it and/or modify
30271 + * it under the terms of the GNU General Public License as published by
30272 + * the Free Software Foundation; either version 2 of the License, or
30273 + * (at your option) any later version.
30275 + * This program is distributed in the hope that it will be useful,
30276 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
30277 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
30278 + * GNU General Public License for more details.
30280 + * You should have received a copy of the GNU General Public License
30281 + * along with this program; if not, write to the Free Software
30282 + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
30285 +#ifndef __AUFS_TYPE_H__
30286 +#define __AUFS_TYPE_H__
30288 +#define AUFS_NAME "aufs"
30292 + * define it before including all other headers.
30293 + * sched.h may use pr_* macros before defining "current", so define the
30294 + * no-current version first, and re-define later.
30296 +#define pr_fmt(fmt) AUFS_NAME " %s:%d: " fmt, __func__, __LINE__
30297 +#include <linux/sched.h>
30299 +#define pr_fmt(fmt) AUFS_NAME " %s:%d:%s[%d]: " fmt, \
30300 + __func__, __LINE__, current->comm, current->pid
30302 +#include <stdint.h>
30303 +#include <sys/types.h>
30304 +#endif /* __KERNEL__ */
30306 +#include <linux/limits.h>
30308 +#define AUFS_VERSION "3.2-20120109"
30310 +/* todo? move this to linux-2.6.19/include/magic.h */
30311 +#define AUFS_SUPER_MAGIC ('a' << 24 | 'u' << 16 | 'f' << 8 | 's')
30313 +/* ---------------------------------------------------------------------- */
30315 +#ifdef CONFIG_AUFS_BRANCH_MAX_127
30316 +typedef int8_t aufs_bindex_t;
30317 +#define AUFS_BRANCH_MAX 127
30319 +typedef int16_t aufs_bindex_t;
30320 +#ifdef CONFIG_AUFS_BRANCH_MAX_511
30321 +#define AUFS_BRANCH_MAX 511
30322 +#elif defined(CONFIG_AUFS_BRANCH_MAX_1023)
30323 +#define AUFS_BRANCH_MAX 1023
30324 +#elif defined(CONFIG_AUFS_BRANCH_MAX_32767)
30325 +#define AUFS_BRANCH_MAX 32767
30330 +#ifndef AUFS_BRANCH_MAX
30331 +#error unknown CONFIG_AUFS_BRANCH_MAX value
30333 +#endif /* __KERNEL__ */
30335 +/* ---------------------------------------------------------------------- */
30337 +#define AUFS_FSTYPE AUFS_NAME
30339 +#define AUFS_ROOT_INO 2
30340 +#define AUFS_FIRST_INO 11
30342 +#define AUFS_WH_PFX ".wh."
30343 +#define AUFS_WH_PFX_LEN ((int)sizeof(AUFS_WH_PFX) - 1)
30344 +#define AUFS_WH_TMP_LEN 4
30345 +/* a limit for rmdir/rename a dir */
30346 +#define AUFS_MAX_NAMELEN (NAME_MAX \
30347 + - AUFS_WH_PFX_LEN * 2 /* doubly whiteouted */\
30349 + - AUFS_WH_TMP_LEN) /* hex */
30350 +#define AUFS_XINO_FNAME "." AUFS_NAME ".xino"
30351 +#define AUFS_XINO_DEFPATH "/tmp/" AUFS_XINO_FNAME
30352 +#define AUFS_XINO_TRUNC_INIT 64 /* blocks */
30353 +#define AUFS_XINO_TRUNC_STEP 4 /* blocks */
30354 +#define AUFS_DIRWH_DEF 3
30355 +#define AUFS_RDCACHE_DEF 10 /* seconds */
30356 +#define AUFS_RDCACHE_MAX 3600 /* seconds */
30357 +#define AUFS_RDBLK_DEF 512 /* bytes */
30358 +#define AUFS_RDHASH_DEF 32
30359 +#define AUFS_WKQ_NAME AUFS_NAME "d"
30360 +#define AUFS_MFS_DEF_SEC 30 /* seconds */
30361 +#define AUFS_MFS_MAX_SEC 3600 /* seconds */
30362 +#define AUFS_PLINK_WARN 100 /* number of plinks */
30364 +/* pseudo-link maintenace under /proc */
30365 +#define AUFS_PLINK_MAINT_NAME "plink_maint"
30366 +#define AUFS_PLINK_MAINT_DIR "fs/" AUFS_NAME
30367 +#define AUFS_PLINK_MAINT_PATH AUFS_PLINK_MAINT_DIR "/" AUFS_PLINK_MAINT_NAME
30369 +#define AUFS_DIROPQ_NAME AUFS_WH_PFX ".opq" /* whiteouted doubly */
30370 +#define AUFS_WH_DIROPQ AUFS_WH_PFX AUFS_DIROPQ_NAME
30372 +#define AUFS_BASE_NAME AUFS_WH_PFX AUFS_NAME
30373 +#define AUFS_PLINKDIR_NAME AUFS_WH_PFX "plnk"
30374 +#define AUFS_ORPHDIR_NAME AUFS_WH_PFX "orph"
30376 +/* doubly whiteouted */
30377 +#define AUFS_WH_BASE AUFS_WH_PFX AUFS_BASE_NAME
30378 +#define AUFS_WH_PLINKDIR AUFS_WH_PFX AUFS_PLINKDIR_NAME
30379 +#define AUFS_WH_ORPHDIR AUFS_WH_PFX AUFS_ORPHDIR_NAME
30381 +/* branch permissions and attributes */
30382 +#define AUFS_BRPERM_RW "rw"
30383 +#define AUFS_BRPERM_RO "ro"
30384 +#define AUFS_BRPERM_RR "rr"
30385 +#define AUFS_BRRATTR_WH "wh"
30386 +#define AUFS_BRWATTR_NLWH "nolwh"
30388 +/* ---------------------------------------------------------------------- */
30392 + /* readdir in userspace */
30396 + /* pathconf wrapper */
30403 +/* borrowed from linux/include/linux/kernel.h */
30405 +#define ALIGN(x, a) __ALIGN_MASK(x, (typeof(x))(a)-1)
30406 +#define __ALIGN_MASK(x, mask) (((x)+(mask))&~(mask))
30409 +/* borrowed from linux/include/linux/compiler-gcc3.h */
30411 +#define __aligned(x) __attribute__((aligned(x)))
30416 +#define __packed __attribute__((packed))
30420 +struct au_rdu_cookie {
30425 + uint32_t generation;
30428 +struct au_rdu_ent {
30437 +static inline int au_rdu_len(int nlen)
30439 + /* include the terminating NULL */
30440 + return ALIGN(sizeof(struct au_rdu_ent) + nlen + 1,
30441 + sizeof(uint64_t));
30444 +union au_rdu_ent_ul {
30445 + struct au_rdu_ent __user *e;
30457 + uint64_t sz; /* AuCtl_RDU */
30458 + uint64_t nent; /* AuCtl_RDU_INO */
30460 + union au_rdu_ent_ul ent;
30461 + uint16_t verify[AufsCtlRduV_End];
30463 + /* input/output */
30467 + union au_rdu_ent_ul tail;
30468 + /* number of entries which were added in a single call */
30473 + struct au_rdu_cookie cookie;
30476 +/* ---------------------------------------------------------------------- */
30478 +struct aufs_wbr_fd {
30483 +/* ---------------------------------------------------------------------- */
30485 +struct aufs_ibusy {
30486 + uint64_t ino, h_ino;
30490 +/* ---------------------------------------------------------------------- */
30492 +#define AuCtlType 'A'
30493 +#define AUFS_CTL_RDU _IOWR(AuCtlType, AuCtl_RDU, struct aufs_rdu)
30494 +#define AUFS_CTL_RDU_INO _IOWR(AuCtlType, AuCtl_RDU_INO, struct aufs_rdu)
30495 +#define AUFS_CTL_WBR_FD _IOW(AuCtlType, AuCtl_WBR_FD, \
30496 + struct aufs_wbr_fd)
30497 +#define AUFS_CTL_IBUSY _IOWR(AuCtlType, AuCtl_IBUSY, struct aufs_ibusy)
30499 +#endif /* __AUFS_TYPE_H__ */