diff options
Diffstat (limited to 'fs/aufs')
| -rw-r--r-- | fs/aufs/dentry.c | 2 | ||||
| -rw-r--r-- | fs/aufs/i_op.c | 1 | ||||
| -rw-r--r-- | fs/aufs/i_op_ren.c | 4 | ||||
| -rw-r--r-- | fs/aufs/vdir.c | 4 | ||||
| -rw-r--r-- | fs/aufs/vfsub.h | 2 |
5 files changed, 7 insertions, 6 deletions
diff --git a/fs/aufs/dentry.c b/fs/aufs/dentry.c index 993c95e14..d03087c84 100644 --- a/fs/aufs/dentry.c +++ b/fs/aufs/dentry.c @@ -179,7 +179,7 @@ int au_lkup_dentry(struct dentry *dentry, aufs_bindex_t bstart, mode_t type) if (dirperm1) au_fset_lkup(args.flags, IGNORE_PERM); - if (au_dbwh(dentry) >= 0) + if (au_dbwh(dentry) == bindex) break; if (!h_dentry) continue; diff --git a/fs/aufs/i_op.c b/fs/aufs/i_op.c index a50cd4c59..9c60a9eed 100644 --- a/fs/aufs/i_op.c +++ b/fs/aufs/i_op.c @@ -8,7 +8,6 @@ #include <linux/device_cgroup.h> #include <linux/fs_stack.h> -#include <linux/mm.h> #include <linux/namei.h> #include <linux/security.h> #include "aufs.h" diff --git a/fs/aufs/i_op_ren.c b/fs/aufs/i_op_ren.c index 132301251..652e973ce 100644 --- a/fs/aufs/i_op_ren.c +++ b/fs/aufs/i_op_ren.c @@ -77,7 +77,7 @@ struct au_ren_args { /* * functions for reverting. * when an error happened in a single rename systemcall, we should revert - * everything as if nothing happend. + * everything as if nothing happened. * we don't need to revert the copied-up/down the parent dir since they are * harmless. */ @@ -859,7 +859,7 @@ int aufs_rename(struct inode *_src_dir, struct dentry *_src_dentry, /* * is it possible? - * yes, it happend (in linux-3.3-rcN) but I don't know why. + * yes, it happened (in linux-3.3-rcN) but I don't know why. * there may exist a problem somewhere else. */ err = -EINVAL; diff --git a/fs/aufs/vdir.c b/fs/aufs/vdir.c index c3f6a74a1..db81f49dd 100644 --- a/fs/aufs/vdir.c +++ b/fs/aufs/vdir.c @@ -40,7 +40,7 @@ static unsigned char *last_deblk(struct au_vdir *vdir) /* ---------------------------------------------------------------------- */ -/* estimate the apropriate size for name hash table */ +/* estimate the appropriate size for name hash table */ unsigned int au_rdhash_est(loff_t sz) { unsigned int n; @@ -366,7 +366,7 @@ static struct au_vdir *alloc_vdir(struct file *file) vdir->vd_deblk_sz = au_sbi(sb)->si_rdblk; if (!vdir->vd_deblk_sz) { - /* estimate the apropriate size for deblk */ + /* estimate the appropriate size for deblk */ vdir->vd_deblk_sz = au_dir_size(file, /*dentry*/NULL); /* pr_info("vd_deblk_sz %u\n", vdir->vd_deblk_sz); */ } diff --git a/fs/aufs/vfsub.h b/fs/aufs/vfsub.h index 778ea2053..541b7b160 100644 --- a/fs/aufs/vfsub.h +++ b/fs/aufs/vfsub.h @@ -183,6 +183,7 @@ static inline void vfsub_file_accessed(struct file *h_file) } #endif +#if 0 /* reserved */ static inline void vfsub_touch_atime(struct vfsmount *h_mnt, struct dentry *h_dentry) { @@ -193,6 +194,7 @@ static inline void vfsub_touch_atime(struct vfsmount *h_mnt, touch_atime(&h_path); vfsub_update_h_iattr(&h_path, /*did*/NULL); /*ignore*/ } +#endif static inline int vfsub_update_time(struct inode *h_inode, struct timespec *ts, int flags) |