From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Tue, 15 Jul 2008 22:34:16 +0000 (-0400)
Subject: Merge branch 'devel' into next
X-Git-Tag: v2.6.27-rc1~1052^2~1
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=e89e896d31b11a51a54ddcd3f72a76bd286dd86c;p=linux-2.6-omap-h63xx.git

Merge branch 'devel' into next

Conflicts:

	fs/nfs/file.c

Fix up the conflict with Jon Corbet's bkl-removal tree
---

e89e896d31b11a51a54ddcd3f72a76bd286dd86c
diff --cc fs/nfs/file.c
index 4e98a56a177,509dcb58959..43164fe8606
--- a/fs/nfs/file.c
+++ b/fs/nfs/file.c
@@@ -170,7 -180,11 +180,13 @@@ force_reval
  
  static loff_t nfs_file_llseek(struct file *filp, loff_t offset, int origin)
  {
 +	loff_t loff;
++
+ 	dprintk("NFS: llseek file(%s/%s, %lld, %d)\n",
+ 			filp->f_path.dentry->d_parent->d_name.name,
+ 			filp->f_path.dentry->d_name.name,
+ 			offset, origin);
+ 
  	/* origin == SEEK_END => we must revalidate the cached file length */
  	if (origin == SEEK_END) {
  		struct inode *inode = filp->f_mapping->host;