[PATCH] struct path: convert smbfs (17b75e69) · Commits · 戴 / test

fs/smbfs/cache.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -125,7 +125,7 @@ smb_fill_cache(struct file filp, void dirent, filldir_t filldir,
		struct smb_cache_control ctrl, struct qstr qname,
		struct smb_fattr *entry)
		{
		struct dentry newdent, dentry = filp->f_dentry;
		struct dentry newdent, dentry = filp->f_path.dentry;
		struct inode newino, inode = dentry->d_inode;
		struct smb_cache_control ctl = *ctrl;
		int valid = 0;

fs/smbfs/dir.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -78,7 +78,7 @@ struct inode_operations smb_dir_inode_operations_unix =
		static int
		smb_readdir(struct file filp, void dirent, filldir_t filldir)
		{
		struct dentry *dentry = filp->f_dentry;
		struct dentry *dentry = filp->f_path.dentry;
		struct inode *dir = dentry->d_inode;
		struct smb_sb_info *server = server_from_dentry(dentry);
		union smb_dir_cache *cache = NULL;
		@@ -238,12 +238,12 @@ out:
		static int
		smb_dir_open(struct inode dir, struct file file)
		{
		struct dentry *dentry = file->f_dentry;
		struct dentry *dentry = file->f_path.dentry;
		struct smb_sb_info *server;
		int error = 0;

		VERBOSE("(%s/%s)\n", dentry->d_parent->d_name.name,
		file->f_dentry->d_name.name);
		file->f_path.dentry->d_name.name);

		/*
		* Directory timestamps in the core protocol aren't updated

fs/smbfs/file.c

+7 −7

Original line number	Diff line number	Diff line
		@@ -102,7 +102,7 @@ static int
		smb_readpage(struct file file, struct page page)
		{
		int error;
		struct dentry *dentry = file->f_dentry;
		struct dentry *dentry = file->f_path.dentry;

		page_cache_get(page);
		error = smb_readpage_sync(dentry, page);
		@@ -205,7 +205,7 @@ static int
		smb_updatepage(struct file file, struct page page, unsigned long offset,
		unsigned int count)
		{
		struct dentry *dentry = file->f_dentry;
		struct dentry *dentry = file->f_path.dentry;

		DEBUG1("(%s/%s %d@%lld)\n", DENTRY_PATH(dentry), count,
		((unsigned long long)page->index << PAGE_CACHE_SHIFT) + offset);
		@@ -218,7 +218,7 @@ smb_file_aio_read(struct kiocb iocb, const struct iovec iov,
		unsigned long nr_segs, loff_t pos)
		{
		struct file * file = iocb->ki_filp;
		struct dentry * dentry = file->f_dentry;
		struct dentry * dentry = file->f_path.dentry;
		ssize_t status;

		VERBOSE("file %s/%s, count=%lu@%lu\n", DENTRY_PATH(dentry),
		@@ -243,7 +243,7 @@ out:
		static int
		smb_file_mmap(struct file * file, struct vm_area_struct * vma)
		{
		struct dentry * dentry = file->f_dentry;
		struct dentry * dentry = file->f_path.dentry;
		int status;

		VERBOSE("file %s/%s, address %lu - %lu\n",
		@@ -264,7 +264,7 @@ static ssize_t
		smb_file_sendfile(struct file file, loff_t ppos,
		size_t count, read_actor_t actor, void *target)
		{
		struct dentry *dentry = file->f_dentry;
		struct dentry *dentry = file->f_path.dentry;
		ssize_t status;

		VERBOSE("file %s/%s, pos=%Ld, count=%d\n",
		@@ -323,7 +323,7 @@ smb_file_aio_write(struct kiocb iocb, const struct iovec iov,
		unsigned long nr_segs, loff_t pos)
		{
		struct file * file = iocb->ki_filp;
		struct dentry * dentry = file->f_dentry;
		struct dentry * dentry = file->f_path.dentry;
		ssize_t result;

		VERBOSE("file %s/%s, count=%lu@%lu\n",
		@@ -355,7 +355,7 @@ static int
		smb_file_open(struct inode inode, struct file file)
		{
		int result;
		struct dentry *dentry = file->f_dentry;
		struct dentry *dentry = file->f_path.dentry;
		int smb_mode = (file->f_mode & O_ACCMODE) - 1;

		lock_kernel();

fs/smbfs/proc.c

+5 −5

Original line number	Diff line number	Diff line
		@@ -873,7 +873,7 @@ smb_newconn(struct smb_sb_info server, struct smb_conn_opt opt)
		filp = fget(opt->fd);
		if (!filp)
		goto out;
		if (!smb_valid_socket(filp->f_dentry->d_inode))
		if (!smb_valid_socket(filp->f_path.dentry->d_inode))
		goto out_putf;

		server->sock_file = filp;
		@@ -898,7 +898,7 @@ smb_newconn(struct smb_sb_info server, struct smb_conn_opt opt)
		/*
		* Store the server in sock user_data (Only used by sunrpc)
		*/
		sk = SOCKET_I(filp->f_dentry->d_inode)->sk;
		sk = SOCKET_I(filp->f_path.dentry->d_inode)->sk;
		sk->sk_user_data = server;

		/* chain into the data_ready callback */
		@@ -1939,7 +1939,7 @@ static int
		smb_proc_readdir_short(struct file filp, void dirent, filldir_t filldir,
		struct smb_cache_control *ctl)
		{
		struct dentry *dir = filp->f_dentry;
		struct dentry *dir = filp->f_path.dentry;
		struct smb_sb_info *server = server_from_dentry(dir);
		struct qstr qname;
		struct smb_fattr fattr;
		@@ -2291,7 +2291,7 @@ static int
		smb_proc_readdir_long(struct file filp, void dirent, filldir_t filldir,
		struct smb_cache_control *ctl)
		{
		struct dentry *dir = filp->f_dentry;
		struct dentry *dir = filp->f_path.dentry;
		struct smb_sb_info *server = server_from_dentry(dir);
		struct qstr qname;
		struct smb_fattr fattr;
		@@ -2859,7 +2859,7 @@ static int
		smb_proc_readdir_null(struct file filp, void dirent, filldir_t filldir,
		struct smb_cache_control *ctl)
		{
		struct smb_sb_info *server = server_from_dentry(filp->f_dentry);
		struct smb_sb_info *server = server_from_dentry(filp->f_path.dentry);

		if (smb_proc_ops_wait(server) < 0)
		return -EIO;

fs/smbfs/sock.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -82,10 +82,10 @@ server_sock(struct smb_sb_info *server)
		if (server && (file = server->sock_file))
		{
		#ifdef SMBFS_PARANOIA
		if (!smb_valid_socket(file->f_dentry->d_inode))
		if (!smb_valid_socket(file->f_path.dentry->d_inode))
		PARANOIA("bad socket!\n");
		#endif
		return SOCKET_I(file->f_dentry->d_inode);
		return SOCKET_I(file->f_path.dentry->d_inode);
		}
		return NULL;
		}

Admin message