浏览代码

qstr: constify instances in ocfs2

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Al Viro 9 年之前
父节点
当前提交
612645f7cf
共有 4 个文件被更改,包括 5 次插入7 次删除
  1. 1 3
      fs/ocfs2/dlm/dlmdomain.c
  2. 2 2
      fs/ocfs2/dlmfs/dlmfs.c
  3. 1 1
      fs/ocfs2/dlmfs/userdlm.c
  4. 1 1
      fs/ocfs2/dlmfs/userdlm.h

+ 1 - 3
fs/ocfs2/dlm/dlmdomain.c

@@ -172,12 +172,10 @@ void __dlm_unhash_lockres(struct dlm_ctxt *dlm, struct dlm_lock_resource *res)
 void __dlm_insert_lockres(struct dlm_ctxt *dlm, struct dlm_lock_resource *res)
 void __dlm_insert_lockres(struct dlm_ctxt *dlm, struct dlm_lock_resource *res)
 {
 {
 	struct hlist_head *bucket;
 	struct hlist_head *bucket;
-	struct qstr *q;
 
 
 	assert_spin_locked(&dlm->spinlock);
 	assert_spin_locked(&dlm->spinlock);
 
 
-	q = &res->lockname;
-	bucket = dlm_lockres_hash(dlm, q->hash);
+	bucket = dlm_lockres_hash(dlm, res->lockname.hash);
 
 
 	/* get a reference for our hashtable */
 	/* get a reference for our hashtable */
 	dlm_lockres_get(res);
 	dlm_lockres_get(res);

+ 2 - 2
fs/ocfs2/dlmfs/dlmfs.c

@@ -469,7 +469,7 @@ static int dlmfs_mkdir(struct inode * dir,
 {
 {
 	int status;
 	int status;
 	struct inode *inode = NULL;
 	struct inode *inode = NULL;
-	struct qstr *domain = &dentry->d_name;
+	const struct qstr *domain = &dentry->d_name;
 	struct dlmfs_inode_private *ip;
 	struct dlmfs_inode_private *ip;
 	struct ocfs2_cluster_connection *conn;
 	struct ocfs2_cluster_connection *conn;
 
 
@@ -518,7 +518,7 @@ static int dlmfs_create(struct inode *dir,
 {
 {
 	int status = 0;
 	int status = 0;
 	struct inode *inode;
 	struct inode *inode;
-	struct qstr *name = &dentry->d_name;
+	const struct qstr *name = &dentry->d_name;
 
 
 	mlog(0, "create %.*s\n", name->len, name->name);
 	mlog(0, "create %.*s\n", name->len, name->name);
 
 

+ 1 - 1
fs/ocfs2/dlmfs/userdlm.c

@@ -667,7 +667,7 @@ void user_dlm_set_locking_protocol(void)
 	ocfs2_stack_glue_set_max_proto_version(&user_dlm_lproto.lp_max_version);
 	ocfs2_stack_glue_set_max_proto_version(&user_dlm_lproto.lp_max_version);
 }
 }
 
 
-struct ocfs2_cluster_connection *user_dlm_register(struct qstr *name)
+struct ocfs2_cluster_connection *user_dlm_register(const struct qstr *name)
 {
 {
 	int rc;
 	int rc;
 	struct ocfs2_cluster_connection *conn;
 	struct ocfs2_cluster_connection *conn;

+ 1 - 1
fs/ocfs2/dlmfs/userdlm.h

@@ -83,7 +83,7 @@ void user_dlm_write_lvb(struct inode *inode,
 ssize_t user_dlm_read_lvb(struct inode *inode,
 ssize_t user_dlm_read_lvb(struct inode *inode,
 			  char *val,
 			  char *val,
 			  unsigned int len);
 			  unsigned int len);
-struct ocfs2_cluster_connection *user_dlm_register(struct qstr *name);
+struct ocfs2_cluster_connection *user_dlm_register(const struct qstr *name);
 void user_dlm_unregister(struct ocfs2_cluster_connection *conn);
 void user_dlm_unregister(struct ocfs2_cluster_connection *conn);
 void user_dlm_set_locking_protocol(void);
 void user_dlm_set_locking_protocol(void);