Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dbaf4c02 authored by Jeff Layton's avatar Jeff Layton Committed by Linus Torvalds
Browse files

smbfs: fix debug builds 



Fix some warnings with SMBFS_DEBUG_* builds.  This patch makes it so that
builds with -Werror don't fail.

Signed-off-by: default avatarJeff Layton <jlayton@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 60a0d233

fs/smbfs/file.c

+4 −3
Original line number Diff line number Diff line
@@ -234,7 +234,7 @@ smb_file_aio_read(struct kiocb *iocb, const struct iovec *iov, 


	VERBOSE("before read, size=%ld, flags=%x, atime=%ld\n",

		(long)dentry->d_inode->i_size,

		dentry->d_inode->i_flags, dentry->d_inode->i_atime);

		dentry->d_inode->i_flags, dentry->d_inode->i_atime.tv_sec);



	status = generic_file_aio_read(iocb, iov, nr_segs, pos);

out:
@@ -269,7 +269,7 @@ smb_file_splice_read(struct file *file, loff_t *ppos, 
	struct dentry *dentry = file->f_path.dentry;

	ssize_t status;



	VERBOSE("file %s/%s, pos=%Ld, count=%d\n",

	VERBOSE("file %s/%s, pos=%Ld, count=%lu\n",

		DENTRY_PATH(dentry), *ppos, count);



	status = smb_revalidate_inode(dentry);
@@ -363,7 +363,8 @@ smb_file_aio_write(struct kiocb *iocb, const struct iovec *iov, 
		result = generic_file_aio_write(iocb, iov, nr_segs, pos);

		VERBOSE("pos=%ld, size=%ld, mtime=%ld, atime=%ld\n",

			(long) file->f_pos, (long) dentry->d_inode->i_size,

			dentry->d_inode->i_mtime, dentry->d_inode->i_atime);

			dentry->d_inode->i_mtime.tv_sec,

			dentry->d_inode->i_atime.tv_sec);

	}

out:

	return result;

fs/smbfs/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -536,7 +536,7 @@ static int smb_fill_super(struct super_block *sb, void *raw_data, int silent) 


	/* Allocate the global temp buffer and some superblock helper structs */

	/* FIXME: move these to the smb_sb_info struct */

	VERBOSE("alloc chunk = %d\n", sizeof(struct smb_ops) +

	VERBOSE("alloc chunk = %lu\n", sizeof(struct smb_ops) +

		sizeof(struct smb_mount_data_kernel));

	mem = kmalloc(sizeof(struct smb_ops) +

		      sizeof(struct smb_mount_data_kernel), GFP_KERNEL);

fs/smbfs/proc.c

+1 −1
Original line number Diff line number Diff line
@@ -2593,7 +2593,7 @@ smb_proc_getattr_ff(struct smb_sb_info *server, struct dentry *dentry, 
	fattr->f_mtime.tv_sec = date_dos2unix(server, date, time);

	fattr->f_mtime.tv_nsec = 0;

	VERBOSE("name=%s, date=%x, time=%x, mtime=%ld\n",

		mask, date, time, fattr->f_mtime);

		mask, date, time, fattr->f_mtime.tv_sec);

	fattr->f_size = DVAL(req->rq_data, 12);

	/* ULONG allocation size */

	fattr->attr = WVAL(req->rq_data, 20);

fs/smbfs/smbiod.c

+1 −1
Original line number Diff line number Diff line
@@ -227,7 +227,7 @@ int smbiod_retry(struct smb_sb_info *server) 
		printk(KERN_ERR "smb_retry: signal failed [%d]\n", result);

		goto out;

	}

	VERBOSE("signalled pid %d\n", pid);

	VERBOSE("signalled pid %d\n", pid_nr(pid));



	/* FIXME: The retried requests should perhaps get a "time boost". */