Skip to content

Commit 3dffadf

Browse files
nizhen-thubcapsc
authored andcommitted
orangefs: Remove unused type in macro fill_default_sys_attrs
Remove the unused type parameter from the macro definition and all its callers, making the interface consistent with its actual usage. Fixes: 69a23de ("orangefs: clean up fill_default_sys_attrs") Signed-off-by: Zhen Ni <[email protected]> Signed-off-by: Mike Marshall <[email protected]>
1 parent f83ec76 commit 3dffadf

File tree

2 files changed

+4
-8
lines changed

2 files changed

+4
-8
lines changed

fs/orangefs/namei.c

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,7 @@ static int orangefs_create(struct mnt_idmap *idmap,
3838

3939
new_op->upcall.req.create.parent_refn = parent->refn;
4040

41-
fill_default_sys_attrs(new_op->upcall.req.create.attributes,
42-
ORANGEFS_TYPE_METAFILE, mode);
41+
fill_default_sys_attrs(new_op->upcall.req.create.attributes, mode);
4342

4443
strscpy(new_op->upcall.req.create.d_name, dentry->d_name.name);
4544

@@ -240,9 +239,7 @@ static int orangefs_symlink(struct mnt_idmap *idmap,
240239

241240
new_op->upcall.req.sym.parent_refn = parent->refn;
242241

243-
fill_default_sys_attrs(new_op->upcall.req.sym.attributes,
244-
ORANGEFS_TYPE_SYMLINK,
245-
mode);
242+
fill_default_sys_attrs(new_op->upcall.req.sym.attributes, mode);
246243

247244
strscpy(new_op->upcall.req.sym.entry_name, dentry->d_name.name);
248245
strscpy(new_op->upcall.req.sym.target, symname);
@@ -316,8 +313,7 @@ static struct dentry *orangefs_mkdir(struct mnt_idmap *idmap, struct inode *dir,
316313

317314
new_op->upcall.req.mkdir.parent_refn = parent->refn;
318315

319-
fill_default_sys_attrs(new_op->upcall.req.mkdir.attributes,
320-
ORANGEFS_TYPE_DIRECTORY, mode);
316+
fill_default_sys_attrs(new_op->upcall.req.mkdir.attributes, mode);
321317

322318
strscpy(new_op->upcall.req.mkdir.d_name, dentry->d_name.name);
323319

fs/orangefs/orangefs-kernel.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -462,7 +462,7 @@ int service_operation(struct orangefs_kernel_op_s *op,
462462
((ORANGEFS_SB(inode->i_sb)->flags & ORANGEFS_OPT_INTR) ? \
463463
ORANGEFS_OP_INTERRUPTIBLE : 0)
464464

465-
#define fill_default_sys_attrs(sys_attr, type, mode) \
465+
#define fill_default_sys_attrs(sys_attr, mode) \
466466
do { \
467467
sys_attr.owner = from_kuid(&init_user_ns, current_fsuid()); \
468468
sys_attr.group = from_kgid(&init_user_ns, current_fsgid()); \

0 commit comments

Comments
 (0)