Merge branch 'upstream' into bugfix-video

Update bugfix-video branch to 2.5-rc1
so I don't have to again resolve the
conflict in these patches vs. upstream.

Conflicts:
	drivers/gpu/drm/gma500/psb_drv.c

	text conflict: add comment vs delete neighboring line

	keep just this:
	/* igd_opregion_init(&dev_priv->opregion_dev); */
	/* acpi_video_register(); */

Signed-off-by: Len Brown <len.brown@intel.com>

1 files changed, 4 insertions, 11 deletions

diff --git a/fs/btrfs/export.c b/fs/btrfs/export.c
index e887ee62b6d4..614f34a899c2 100644
--- a/fs/btrfs/export.c
+++ b/fs/btrfs/export.c
@@ -13,15 +13,14 @@
                                              parent_root_objectid) / 4)
 #define BTRFS_FID_SIZE_CONNECTABLE_ROOT (sizeof(struct btrfs_fid) / 4)
 
-static int btrfs_encode_fh(struct dentry *dentry, u32 *fh, int *max_len,
-                           int connectable)
+static int btrfs_encode_fh(struct inode *inode, u32 *fh, int *max_len,
+                           struct inode *parent)
 {
         struct btrfs_fid *fid = (struct btrfs_fid *)fh;
-        struct inode *inode = dentry->d_inode;
         int len = *max_len;
         int type;
 
-        if (connectable && (len < BTRFS_FID_SIZE_CONNECTABLE)) {
+        if (parent && (len < BTRFS_FID_SIZE_CONNECTABLE)) {
                 *max_len = BTRFS_FID_SIZE_CONNECTABLE;
                 return 255;
         } else if (len < BTRFS_FID_SIZE_NON_CONNECTABLE) {
@@ -36,19 +35,13 @@ static int btrfs_encode_fh(struct dentry *dentry, u32 *fh, int *max_len,
         fid->root_objectid = BTRFS_I(inode)->root->objectid;
         fid->gen = inode->i_generation;
 
-        if (connectable && !S_ISDIR(inode->i_mode)) {
-                struct inode *parent;
+        if (parent) {
                 u64 parent_root_id;
 
-                spin_lock(&dentry->d_lock);
-
-                parent = dentry->d_parent->d_inode;
                 fid->parent_objectid = BTRFS_I(parent)->location.objectid;
                 fid->parent_gen = parent->i_generation;
                 parent_root_id = BTRFS_I(parent)->root->objectid;
 
-                spin_unlock(&dentry->d_lock);
-
                 if (parent_root_id != fid->root_objectid) {
                         fid->parent_root_objectid = parent_root_id;
                         len = BTRFS_FID_SIZE_CONNECTABLE_ROOT;