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

Commit 949b2112 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.linux-nfs.org/pub/linux/nfs-2.6 

* git://git.linux-nfs.org/pub/linux/nfs-2.6:
  SUNRPC: Dead code in net/sunrpc/auth_gss/auth_gss.c
  NFS: remove needless check in nfs_opendir()
  NFS: nfs_show_stats; for_each_possible_cpu(), not NR_CPUS
  NFS: make 2 functions static
  NFS,SUNRPC: Fix compiler warnings if CONFIG_PROC_FS & CONFIG_SYSCTL are unset
  NFS: fix PROC_FS=n compile error
  VFS: Fix another open intent Oops
  RPCSEC_GSS: fix leak in krb5 code caused by superfluous kmalloc
parents 0efd9323 a5f9145b

fs/lockd/svclock.c

+1 −1
Original line number Diff line number Diff line
@@ -650,7 +650,7 @@ static void nlmsvc_grant_callback(struct rpc_task *task, void *data) 
	svc_wake_up(block->b_daemon);

}



void nlmsvc_grant_release(void *data)

static void nlmsvc_grant_release(void *data)

{

	struct nlm_rqst		*call = data;

fs/nfs/dir.c

+2 −3
Original line number Diff line number Diff line
@@ -128,14 +128,13 @@ struct inode_operations nfs4_dir_inode_operations = { 
static int

nfs_opendir(struct inode *inode, struct file *filp)

{

	int res = 0;

	int res;



	dfprintk(VFS, "NFS: opendir(%s/%ld)\n",

			inode->i_sb->s_id, inode->i_ino);



	lock_kernel();

	/* Call generic open code in order to cache credentials */

	if (!res)

	res = nfs_open(inode, filp);

	unlock_kernel();

	return res;

fs/nfs/direct.c

+3 −5
Original line number Diff line number Diff line
@@ -112,10 +112,9 @@ static void nfs_direct_write_complete(struct nfs_direct_req *dreq, struct inode 
 */

ssize_t nfs_direct_IO(int rw, struct kiocb *iocb, const struct iovec *iov, loff_t pos, unsigned long nr_segs)

{

	struct dentry *dentry = iocb->ki_filp->f_dentry;



	dprintk("NFS: nfs_direct_IO (%s) off/no(%Ld/%lu) EINVAL\n",

			dentry->d_name.name, (long long) pos, nr_segs);

			iocb->ki_filp->f_dentry->d_name.name,

			(long long) pos, nr_segs);



	return -EINVAL;

}
@@ -468,7 +467,6 @@ static const struct rpc_call_ops nfs_commit_direct_ops = { 
static void nfs_direct_commit_schedule(struct nfs_direct_req *dreq)

{

	struct nfs_write_data *data = dreq->commit_data;

	struct rpc_task *task = &data->task;



	data->inode = dreq->inode;

	data->cred = dreq->ctx->cred;
@@ -489,7 +487,7 @@ static void nfs_direct_commit_schedule(struct nfs_direct_req *dreq) 
	/* Note: task.tk_ops->rpc_release will free dreq->commit_data */

	dreq->commit_data = NULL;



	dprintk("NFS: %5u initiated commit call\n", task->tk_pid);

	dprintk("NFS: %5u initiated commit call\n", data->task.tk_pid);



	lock_kernel();

	rpc_execute(&data->task);

fs/nfs/file.c

+2 −3
Original line number Diff line number Diff line
@@ -534,10 +534,9 @@ static int nfs_lock(struct file *filp, int cmd, struct file_lock *fl) 
 */

static int nfs_flock(struct file *filp, int cmd, struct file_lock *fl)

{

	struct inode * inode = filp->f_mapping->host;



	dprintk("NFS: nfs_flock(f=%s/%ld, t=%x, fl=%x)\n",

			inode->i_sb->s_id, inode->i_ino,

			filp->f_dentry->d_inode->i_sb->s_id,

			filp->f_dentry->d_inode->i_ino,

			fl->fl_type, fl->fl_flags);



	/*

fs/nfs/inode.c

+1 −4
Original line number Diff line number Diff line
@@ -700,12 +700,9 @@ static int nfs_show_stats(struct seq_file *m, struct vfsmount *mnt) 
	/*

	 * Display superblock I/O counters

	 */

	for (cpu = 0; cpu < NR_CPUS; cpu++) {

	for_each_possible_cpu(cpu) {

		struct nfs_iostats *stats;



		if (!cpu_possible(cpu))

			continue;



		preempt_disable();

		stats = per_cpu_ptr(nfss->io_stats, cpu);