diff options
author | Amir Goldstein <amir73il@gmail.com> | 2018-05-16 10:35:02 -0400 |
---|---|---|
committer | Miklos Szeredi <mszeredi@redhat.com> | 2018-05-31 05:06:10 -0400 |
commit | 471ec5dcf4e712ea81bf431a57c98d4b67416d30 (patch) | |
tree | d6e76dcc4899cded83e2bfce352d197fe5cfe1c0 /fs/overlayfs/overlayfs.h | |
parent | 6cf00764b0082cefdaf5a36202aceb1ab2470051 (diff) |
ovl: struct cattr cleanups
* Rename to ovl_cattr
* Fold ovl_create_real() hardlink argument into struct ovl_cattr
* Create macro OVL_CATTR() to initialize struct ovl_cattr from mode
Signed-off-by: Amir Goldstein <amir73il@gmail.com>
Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
Diffstat (limited to 'fs/overlayfs/overlayfs.h')
-rw-r--r-- | fs/overlayfs/overlayfs.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/fs/overlayfs/overlayfs.h b/fs/overlayfs/overlayfs.h index 1c30d60cc290..aa8286419133 100644 --- a/fs/overlayfs/overlayfs.h +++ b/fs/overlayfs/overlayfs.h | |||
@@ -349,14 +349,17 @@ extern const struct inode_operations ovl_dir_inode_operations; | |||
349 | struct dentry *ovl_lookup_temp(struct dentry *workdir); | 349 | struct dentry *ovl_lookup_temp(struct dentry *workdir); |
350 | int ovl_cleanup_and_whiteout(struct dentry *workdir, struct inode *dir, | 350 | int ovl_cleanup_and_whiteout(struct dentry *workdir, struct inode *dir, |
351 | struct dentry *dentry); | 351 | struct dentry *dentry); |
352 | struct cattr { | 352 | struct ovl_cattr { |
353 | dev_t rdev; | 353 | dev_t rdev; |
354 | umode_t mode; | 354 | umode_t mode; |
355 | const char *link; | 355 | const char *link; |
356 | struct dentry *hardlink; | ||
356 | }; | 357 | }; |
358 | |||
359 | #define OVL_CATTR(m) (&(struct ovl_cattr) { .mode = (m) }) | ||
360 | |||
357 | int ovl_create_real(struct inode *dir, struct dentry *newdentry, | 361 | int ovl_create_real(struct inode *dir, struct dentry *newdentry, |
358 | struct cattr *attr, | 362 | struct ovl_cattr *attr); |
359 | struct dentry *hardlink); | ||
360 | int ovl_cleanup(struct inode *dir, struct dentry *dentry); | 363 | int ovl_cleanup(struct inode *dir, struct dentry *dentry); |
361 | 364 | ||
362 | /* copy_up.c */ | 365 | /* copy_up.c */ |