Commit 6e66d5da authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6 

Pull cifs fixes from Steve French:
 "A set of 5 small cifs fixes"

* 'for-next' of git://git.samba.org/sfrench/cifs-2.6:
  cif: fix dead code
  cifs: fix error handling cifs_user_readv
  fs: cifs: remove unused variable.
  Return correct error on query of xattr on file with empty xattrs
  cifs: Wait for writebacks to complete before attempting write.
parents 25bfe4f5 1f80c0cc

fs/cifs/cifsfs.c

+13 −1
Original line number Diff line number Diff line
@@ -253,6 +253,11 @@ cifs_alloc_inode(struct super_block *sb) 
	cifs_set_oplock_level(cifs_inode, 0);

	cifs_inode->delete_pending = false;

	cifs_inode->invalid_mapping = false;

	clear_bit(CIFS_INODE_PENDING_OPLOCK_BREAK, &cifs_inode->flags);

	clear_bit(CIFS_INODE_PENDING_WRITERS, &cifs_inode->flags);

	clear_bit(CIFS_INODE_DOWNGRADE_OPLOCK_TO_L2, &cifs_inode->flags);

	spin_lock_init(&cifs_inode->writers_lock);

	cifs_inode->writers = 0;

	cifs_inode->vfs_inode.i_blkbits = 14;  /* 2**14 = CIFS_MAX_MSGSIZE */

	cifs_inode->server_eof = 0;

	cifs_inode->uniqueid = 0;
@@ -732,19 +737,26 @@ static ssize_t cifs_file_aio_write(struct kiocb *iocb, const struct iovec *iov, 
				   unsigned long nr_segs, loff_t pos)

{

	struct inode *inode = file_inode(iocb->ki_filp);

	struct cifsInodeInfo *cinode = CIFS_I(inode);

	ssize_t written;

	int rc;



	written = cifs_get_writer(cinode);

	if (written)

		return written;



	written = generic_file_aio_write(iocb, iov, nr_segs, pos);



	if (CIFS_CACHE_WRITE(CIFS_I(inode)))

		return written;

		goto out;



	rc = filemap_fdatawrite(inode->i_mapping);

	if (rc)

		cifs_dbg(FYI, "cifs_file_aio_write: %d rc on %p inode\n",

			 rc, inode);



out:

	cifs_put_writer(cinode);

	return written;

}

fs/cifs/cifsglob.h

+8 −0
Original line number Diff line number Diff line
@@ -228,6 +228,8 @@ struct smb_version_operations { 
	/* verify the message */

	int (*check_message)(char *, unsigned int);

	bool (*is_oplock_break)(char *, struct TCP_Server_Info *);

	void (*downgrade_oplock)(struct TCP_Server_Info *,

					struct cifsInodeInfo *, bool);

	/* process transaction2 response */

	bool (*check_trans2)(struct mid_q_entry *, struct TCP_Server_Info *,

			     char *, int);
@@ -1113,6 +1115,12 @@ struct cifsInodeInfo { 
	unsigned int epoch;		/* used to track lease state changes */

	bool delete_pending;		/* DELETE_ON_CLOSE is set */

	bool invalid_mapping;		/* pagecache is invalid */

	unsigned long flags;

#define CIFS_INODE_PENDING_OPLOCK_BREAK   (0) /* oplock break in progress */

#define CIFS_INODE_PENDING_WRITERS	  (1) /* Writes in progress */

#define CIFS_INODE_DOWNGRADE_OPLOCK_TO_L2 (2) /* Downgrade oplock to L2 */

	spinlock_t writers_lock;

	unsigned int writers;		/* Number of writers on this inode */

	unsigned long time;		/* jiffies of last update of inode */

	u64  server_eof;		/* current file size on server -- protected by i_lock */

	u64  uniqueid;			/* server inode number */

fs/cifs/cifsproto.h

+3 −0
Original line number Diff line number Diff line
@@ -127,6 +127,9 @@ extern u64 cifs_UnixTimeToNT(struct timespec); 
extern struct timespec cnvrtDosUnixTm(__le16 le_date, __le16 le_time,

				      int offset);

extern void cifs_set_oplock_level(struct cifsInodeInfo *cinode, __u32 oplock);

extern int cifs_get_writer(struct cifsInodeInfo *cinode);

extern void cifs_put_writer(struct cifsInodeInfo *cinode);

extern void cifs_done_oplock_break(struct cifsInodeInfo *cinode);

extern int cifs_unlock_range(struct cifsFileInfo *cfile,

			     struct file_lock *flock, const unsigned int xid);

extern int cifs_push_mandatory_locks(struct cifsFileInfo *cfile);

fs/cifs/cifssmb.c

+3 −0
Original line number Diff line number Diff line
@@ -6197,6 +6197,9 @@ QAllEAsRetry: 
	cifs_dbg(FYI, "ea length %d\n", list_len);

	if (list_len <= 8) {

		cifs_dbg(FYI, "empty EA list returned from server\n");

		/* didn't find the named attribute */

		if (ea_name)

			rc = -ENODATA;

		goto QAllEAsOut;

	}

fs/cifs/file.c

+30 −5
Original line number Diff line number Diff line
@@ -2599,7 +2599,7 @@ cifs_writev(struct kiocb *iocb, const struct iovec *iov, 
			ssize_t err;



			err = generic_write_sync(file, iocb->ki_pos - rc, rc);

			if (rc < 0)

			if (err < 0)

				rc = err;

		}

	} else {
@@ -2621,12 +2621,20 @@ cifs_strict_writev(struct kiocb *iocb, const struct iovec *iov, 
	struct cifs_tcon *tcon = tlink_tcon(cfile->tlink);

	ssize_t written;



	written = cifs_get_writer(cinode);

	if (written)

		return written;



	if (CIFS_CACHE_WRITE(cinode)) {

		if (cap_unix(tcon->ses) &&

		(CIFS_UNIX_FCNTL_CAP & le64_to_cpu(tcon->fsUnixInfo.Capability))

		    && ((cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NOPOSIXBRL) == 0))

			return generic_file_aio_write(iocb, iov, nr_segs, pos);

		return cifs_writev(iocb, iov, nr_segs, pos);

		  && ((cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NOPOSIXBRL) == 0)) {

			written = generic_file_aio_write(

					iocb, iov, nr_segs, pos);

			goto out;

		}

		written = cifs_writev(iocb, iov, nr_segs, pos);

		goto out;

	}

	/*

	 * For non-oplocked files in strict cache mode we need to write the data
@@ -2646,6 +2654,8 @@ cifs_strict_writev(struct kiocb *iocb, const struct iovec *iov, 
			 inode);

		cinode->oplock = 0;

	}

out:

	cifs_put_writer(cinode);

	return written;

}
@@ -2872,7 +2882,7 @@ ssize_t cifs_user_readv(struct kiocb *iocb, const struct iovec *iov, 
					    cifs_uncached_readv_complete);

		if (!rdata) {

			rc = -ENOMEM;

			goto error;

			break;

		}



		rc = cifs_read_allocate_pages(rdata, npages);
@@ -3621,6 +3631,13 @@ static int cifs_launder_page(struct page *page) 
	return rc;

}



static int

cifs_pending_writers_wait(void *unused)

{

	schedule();

	return 0;

}



void cifs_oplock_break(struct work_struct *work)

{

	struct cifsFileInfo *cfile = container_of(work, struct cifsFileInfo,
@@ -3628,8 +3645,15 @@ void cifs_oplock_break(struct work_struct *work) 
	struct inode *inode = cfile->dentry->d_inode;

	struct cifsInodeInfo *cinode = CIFS_I(inode);

	struct cifs_tcon *tcon = tlink_tcon(cfile->tlink);

	struct TCP_Server_Info *server = tcon->ses->server;

	int rc = 0;



	wait_on_bit(&cinode->flags, CIFS_INODE_PENDING_WRITERS,

			cifs_pending_writers_wait, TASK_UNINTERRUPTIBLE);



	server->ops->downgrade_oplock(server, cinode,

		test_bit(CIFS_INODE_DOWNGRADE_OPLOCK_TO_L2, &cinode->flags));



	if (!CIFS_CACHE_WRITE(cinode) && CIFS_CACHE_READ(cinode) &&

						cifs_has_mand_locks(cinode)) {

		cifs_dbg(FYI, "Reset oplock to None for inode=%p due to mand locks\n",
@@ -3666,6 +3690,7 @@ void cifs_oplock_break(struct work_struct *work) 
							     cinode);

		cifs_dbg(FYI, "Oplock release rc = %d\n", rc);

	}

	cifs_done_oplock_break(cinode);

}



/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE