summaryrefslogtreecommitdiffstats
path: root/fs/adfs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-08-06 09:49:02 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2016-08-06 09:49:02 -0400
commit835c92d43b29eb354abdbd5475308a474d7efdfa (patch)
tree9b7808c219f01859508d1a7fca2f39eccb4b19b9 /fs/adfs
parentce804bf598b59427a2c930e5c1f5fe2e51f1b517 (diff)
parent19a6d89de2f10ee3b18c3b9fd6c7c2e249a30d71 (diff)
downloadlinux-stable-835c92d43b29eb354abdbd5475308a474d7efdfa.tar.gz
linux-stable-835c92d43b29eb354abdbd5475308a474d7efdfa.tar.bz2
linux-stable-835c92d43b29eb354abdbd5475308a474d7efdfa.zip
Merge branch 'work.const-qstr' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull qstr constification updates from Al Viro: "Fairly self-contained bunch - surprising lot of places passes struct qstr * as an argument when const struct qstr * would suffice; it complicates analysis for no good reason. I'd prefer to feed that separately from the assorted fixes (those are in #for-linus and with somewhat trickier topology)" * 'work.const-qstr' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: qstr: constify instances in adfs qstr: constify instances in lustre qstr: constify instances in f2fs qstr: constify instances in ext2 qstr: constify instances in vfat qstr: constify instances in procfs qstr: constify instances in fuse qstr constify instances in fs/dcache.c qstr: constify instances in nfs qstr: constify instances in ocfs2 qstr: constify instances in autofs4 qstr: constify instances in hfs qstr: constify instances in hfsplus qstr: constify instances in logfs qstr: constify dentry_init_security
Diffstat (limited to 'fs/adfs')
-rw-r--r--fs/adfs/dir.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/adfs/dir.c b/fs/adfs/dir.c
index bec25f7017c0..c39aedc7ed3d 100644
--- a/fs/adfs/dir.c
+++ b/fs/adfs/dir.c
@@ -101,7 +101,7 @@ out:
}
static int
-adfs_match(struct qstr *name, struct object_info *obj)
+adfs_match(const struct qstr *name, struct object_info *obj)
{
int i;
@@ -126,7 +126,7 @@ adfs_match(struct qstr *name, struct object_info *obj)
}
static int
-adfs_dir_lookup_byname(struct inode *inode, struct qstr *name, struct object_info *obj)
+adfs_dir_lookup_byname(struct inode *inode, const struct qstr *name, struct object_info *obj)
{
struct super_block *sb = inode->i_sb;
const struct adfs_dir_ops *ops = ADFS_SB(sb)->s_dir;