Browse Source

nfs: make nfs_async_rename non-static

...and move the prototype for nfs_sillyrename to internal.h.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
Tested-by: Anna Schumaker <Anna.Schumaker@netapp.com>
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Jeff Layton 11 năm trước cách đây
mục cha
commit
0e862a4051
3 tập tin đã thay đổi với 8 bổ sung2 xóa
  1. 7 0
      fs/nfs/internal.h
  2. 1 1
      fs/nfs/unlink.c
  3. 0 1
      include/linux/nfs_fs.h

+ 7 - 0
fs/nfs/internal.h

@@ -474,6 +474,13 @@ extern int nfs_migrate_page(struct address_space *,
 #define nfs_migrate_page NULL
 #define nfs_migrate_page NULL
 #endif
 #endif
 
 
+/* unlink.c */
+extern struct rpc_task *
+nfs_async_rename(struct inode *old_dir, struct inode *new_dir,
+		 struct dentry *old_dentry, struct dentry *new_dentry,
+		 void (*complete)(struct rpc_task *, struct nfs_renamedata *));
+extern int nfs_sillyrename(struct inode *dir, struct dentry *dentry);
+
 /* direct.c */
 /* direct.c */
 void nfs_init_cinfo_from_dreq(struct nfs_commit_info *cinfo,
 void nfs_init_cinfo_from_dreq(struct nfs_commit_info *cinfo,
 			      struct nfs_direct_req *dreq);
 			      struct nfs_direct_req *dreq);

+ 1 - 1
fs/nfs/unlink.c

@@ -399,7 +399,7 @@ static const struct rpc_call_ops nfs_rename_ops = {
  *
  *
  * It's expected that valid references to the dentries and inodes are held
  * It's expected that valid references to the dentries and inodes are held
  */
  */
-static struct rpc_task *
+struct rpc_task *
 nfs_async_rename(struct inode *old_dir, struct inode *new_dir,
 nfs_async_rename(struct inode *old_dir, struct inode *new_dir,
 		 struct dentry *old_dentry, struct dentry *new_dentry,
 		 struct dentry *old_dentry, struct dentry *new_dentry,
 		 void (*complete)(struct rpc_task *, struct nfs_renamedata *))
 		 void (*complete)(struct rpc_task *, struct nfs_renamedata *))

+ 0 - 1
include/linux/nfs_fs.h

@@ -511,7 +511,6 @@ extern void nfs_complete_unlink(struct dentry *dentry, struct inode *);
 extern void nfs_wait_on_sillyrename(struct dentry *dentry);
 extern void nfs_wait_on_sillyrename(struct dentry *dentry);
 extern void nfs_block_sillyrename(struct dentry *dentry);
 extern void nfs_block_sillyrename(struct dentry *dentry);
 extern void nfs_unblock_sillyrename(struct dentry *dentry);
 extern void nfs_unblock_sillyrename(struct dentry *dentry);
-extern int  nfs_sillyrename(struct inode *dir, struct dentry *dentry);
 
 
 /*
 /*
  * linux/fs/nfs/write.c
  * linux/fs/nfs/write.c