switch ncpfs (0378c405) · Commits · 戴 / test

fs/ncpfs/dir.c

+4 −11

Original line number	Diff line number	Diff line
		@@ -82,7 +82,7 @@ static int ncp_compare_dentry(const struct dentry , const struct inode ,
		unsigned int, const char , const struct qstr );
		static int ncp_delete_dentry(const struct dentry *);

		static const struct dentry_operations ncp_dentry_operations =
		const struct dentry_operations ncp_dentry_operations =
		{
		.d_revalidate = ncp_lookup_validate,
		.d_hash = ncp_hash_dentry,
		@@ -90,14 +90,6 @@ static const struct dentry_operations ncp_dentry_operations =
		.d_delete = ncp_delete_dentry,
		};

		const struct dentry_operations ncp_root_dentry_operations =
		{
		.d_hash = ncp_hash_dentry,
		.d_compare = ncp_compare_dentry,
		.d_delete = ncp_delete_dentry,
		};


		#define ncp_namespace(i) (NCP_SERVER(i)->name_space[NCP_FINFO(i)->volNumber])

		static inline int ncp_preserve_entry_case(struct inode *i, __u32 nscreator)
		@@ -309,6 +301,9 @@ ncp_lookup_validate(struct dentry dentry, struct nameidata nd)
		int res, val = 0, len;
		__u8 __name[NCP_MAXPATHLEN + 1];

		if (dentry == dentry->d_sb->s_root)
		return 1;

		if (nd->flags & LOOKUP_RCU)
		return -ECHILD;

		@@ -637,7 +632,6 @@ ncp_fill_cache(struct file filp, void dirent, filldir_t filldir,
		entry->ino = iunique(dir->i_sb, 2);
		inode = ncp_iget(dir->i_sb, entry);
		if (inode) {
		d_set_d_op(newdent, &ncp_dentry_operations);
		d_instantiate(newdent, inode);
		if (!hashed)
		d_rehash(newdent);
		@@ -893,7 +887,6 @@ static struct dentry ncp_lookup(struct inode dir, struct dentry *dentry, struc
		if (inode) {
		ncp_new_dentry(dentry);
		add_entry:
		d_set_d_op(dentry, &ncp_dentry_operations);
		d_add(dentry, inode);
		error = 0;
		}

fs/ncpfs/inode.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -544,6 +544,7 @@ static int ncp_fill_super(struct super_block sb, void raw_data, int silent)
		sb->s_blocksize_bits = 10;
		sb->s_magic = NCP_SUPER_MAGIC;
		sb->s_op = &ncp_sops;
		sb->s_d_op = &ncp_dentry_operations;
		sb->s_bdi = &server->bdi;

		server = NCP_SBP(sb);
		@@ -723,7 +724,6 @@ static int ncp_fill_super(struct super_block sb, void raw_data, int silent)
		sb->s_root = d_alloc_root(root_inode);
		if (!sb->s_root)
		goto out_no_root;
		d_set_d_op(sb->s_root, &ncp_root_dentry_operations);
		return 0;

		out_no_root:

include/linux/ncp_fs.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -204,7 +204,7 @@ void ncp_update_inode2(struct inode , struct ncp_entry_info );
		/* linux/fs/ncpfs/dir.c */
		extern const struct inode_operations ncp_dir_inode_operations;
		extern const struct file_operations ncp_dir_operations;
		extern const struct dentry_operations ncp_root_dentry_operations;
		extern const struct dentry_operations ncp_dentry_operations;
		int ncp_conn_logged_in(struct super_block *);
		int ncp_date_dos2unix(__le16 time, __le16 date);
		void ncp_date_unix2dos(int unix_date, __le16 * time, __le16 * date);

Admin message