aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfs/proc.c
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/nfs/proc.c
parentce804bf598b59427a2c930e5c1f5fe2e51f1b517 (diff)
parent19a6d89de2f10ee3b18c3b9fd6c7c2e249a30d71 (diff)
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/nfs/proc.c')
-rw-r--r--fs/nfs/proc.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/nfs/proc.c b/fs/nfs/proc.c
index b417bbcd9704..b7bca8303989 100644
--- a/fs/nfs/proc.c
+++ b/fs/nfs/proc.c
@@ -145,7 +145,7 @@ nfs_proc_setattr(struct dentry *dentry, struct nfs_fattr *fattr,
145} 145}
146 146
147static int 147static int
148nfs_proc_lookup(struct inode *dir, struct qstr *name, 148nfs_proc_lookup(struct inode *dir, const struct qstr *name,
149 struct nfs_fh *fhandle, struct nfs_fattr *fattr, 149 struct nfs_fh *fhandle, struct nfs_fattr *fattr,
150 struct nfs4_label *label) 150 struct nfs4_label *label)
151{ 151{
@@ -299,7 +299,7 @@ out:
299} 299}
300 300
301static int 301static int
302nfs_proc_remove(struct inode *dir, struct qstr *name) 302nfs_proc_remove(struct inode *dir, const struct qstr *name)
303{ 303{
304 struct nfs_removeargs arg = { 304 struct nfs_removeargs arg = {
305 .fh = NFS_FH(dir), 305 .fh = NFS_FH(dir),
@@ -357,7 +357,7 @@ nfs_proc_rename_done(struct rpc_task *task, struct inode *old_dir,
357} 357}
358 358
359static int 359static int
360nfs_proc_link(struct inode *inode, struct inode *dir, struct qstr *name) 360nfs_proc_link(struct inode *inode, struct inode *dir, const struct qstr *name)
361{ 361{
362 struct nfs_linkargs arg = { 362 struct nfs_linkargs arg = {
363 .fromfh = NFS_FH(inode), 363 .fromfh = NFS_FH(inode),
@@ -456,7 +456,7 @@ out:
456} 456}
457 457
458static int 458static int
459nfs_proc_rmdir(struct inode *dir, struct qstr *name) 459nfs_proc_rmdir(struct inode *dir, const struct qstr *name)
460{ 460{
461 struct nfs_diropargs arg = { 461 struct nfs_diropargs arg = {
462 .fh = NFS_FH(dir), 462 .fh = NFS_FH(dir),