From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 26 Jul 2011 20:38:50 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph... 
X-Git-Tag: v3.1-rc1~220
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ba5b56cb3e3d2cab73d4fee9a022bb69462a8cd9;p=profile%2Fivi%2Fkernel-x86-ivi.git

Merge branch 'for-linus' of git://git./linux/kernel/git/sage/ceph-client

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client: (23 commits)
  ceph: document unlocked d_parent accesses
  ceph: explicitly reference rename old_dentry parent dir in request
  ceph: document locking for ceph_set_dentry_offset
  ceph: avoid d_parent in ceph_dentry_hash; fix ceph_encode_fh() hashing bug
  ceph: protect d_parent access in ceph_d_revalidate
  ceph: protect access to d_parent
  ceph: handle racing calls to ceph_init_dentry
  ceph: set dir complete frag after adding capability
  rbd: set blk_queue request sizes to object size
  ceph: set up readahead size when rsize is not passed
  rbd: cancel watch request when releasing the device
  ceph: ignore lease mask
  ceph: fix ceph_lookup_open intent usage
  ceph: only link open operations to directory unsafe list if O_CREAT|O_TRUNC
  ceph: fix bad parent_inode calc in ceph_lookup_open
  ceph: avoid carrying Fw cap during write into page cache
  libceph: don't time out osd requests that haven't been received
  ceph: report f_bfree based on kb_avail rather than diffing.
  ceph: only queue capsnap if caps are dirty
  ceph: fix snap writeback when racing with writes
  ...
---

ba5b56cb3e3d2cab73d4fee9a022bb69462a8cd9
diff --cc fs/ceph/file.c
index 0d0eae0,45fbd69..ce549d3
--- a/fs/ceph/file.c
+++ b/fs/ceph/file.c
@@@ -222,11 -225,11 +225,11 @@@ struct dentry *ceph_lookup_open(struct 
  {
  	struct ceph_fs_client *fsc = ceph_sb_to_client(dir->i_sb);
  	struct ceph_mds_client *mdsc = fsc->mdsc;
- 	struct file *file = nd->intent.open.file;
- 	struct inode *parent_inode = get_dentry_parent_inode(file->f_dentry);
+ 	struct file *file;
  	struct ceph_mds_request *req;
+ 	struct dentry *ret;
  	int err;
 -	int flags = nd->intent.open.flags - 1;  /* silly vfs! */
 +	int flags = nd->intent.open.flags;
  
  	dout("ceph_lookup_open dentry %p '%.*s' flags %d mode 0%o\n",
  	     dentry, dentry->d_name.len, dentry->d_name.name, flags, mode);