Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1751006AbbFYEye (ORCPT <rfc822;w@1wt.eu>);
	Thu, 25 Jun 2015 00:54:34 -0400
Received: from imap.thunk.org ([74.207.234.97]:53818 "EHLO imap.thunk.org"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1750800AbbFYEyd (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
	Thu, 25 Jun 2015 00:54:33 -0400
Date: Thu, 25 Jun 2015 00:54:30 -0400
From: "Theodore Ts'o" <tytso@mit.edu>
To: torvalds@linux-foundation.org, linux-kernel@vger.kernel.org,
        linux-ext4@vger.kernel.org
Subject: Re: [GIT PULL] ext4 changes for 4.2-rc1
Message-ID: <20150625045430.GG14324@thunk.org>
Mail-Followup-To: Theodore Ts'o <tytso@mit.edu>,
	torvalds@linux-foundation.org, linux-kernel@vger.kernel.org,
	linux-ext4@vger.kernel.org
References: <20150625034626.GA21682@thunk.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20150625034626.GA21682@thunk.org>
User-Agent: Mutt/1.5.23 (2014-03-12)
X-SA-Exim-Connect-IP: <locally generated>
X-SA-Exim-Mail-From: tytso@thunk.org
X-SA-Exim-Scanned: No (on imap.thunk.org); SAEximRunCond expanded to false
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
Content-Length: 1685
Lines: 60

Hi Linus,

Here's my suggested merge resolution to deal with Al Viro's symlink changes.

       	  	    	  	     	     - Ted

diff --cc fs/ext4/symlink.c
index ba5bd18,68e915a..0000000
--- a/fs/ext4/symlink.c
+++ b/fs/ext4/symlink.c
@@@ -35,19 -34,20 +34,17 @@@ static const char *ext4_follow_link(str
  	int res;
  	u32 plen, max_size = inode->i_sb->s_blocksize;
  
- 	ctx = ext4_get_fname_crypto_ctx(inode, inode->i_sb->s_blocksize);
- 	if (IS_ERR(ctx))
- 		return ERR_CAST(ctx);
 -	if (!ext4_encrypted_inode(inode))
 -		return page_follow_link_light(dentry, nd);
 -
+ 	res = ext4_get_encryption_info(inode);
+ 	if (res)
+ 		return ERR_PTR(res);
  
  	if (ext4_inode_is_fast_symlink(inode)) {
  		caddr = (char *) EXT4_I(inode)->i_data;
  		max_size = sizeof(EXT4_I(inode)->i_data);
  	} else {
  		cpage = read_mapping_page(inode->i_mapping, 0, NULL);
- 		if (IS_ERR(cpage)) {
- 			ext4_put_fname_crypto_ctx(&ctx);
+ 		if (IS_ERR(cpage))
 -			return cpage;
 +			return ERR_CAST(cpage);
- 		}
  		caddr = kmap(cpage);
  		caddr[size] = 0;
  	}
@@@ -77,14 -78,13 +75,12 @@@
  	/* Null-terminate the name */
  	if (res <= plen)
  		paddr[res] = '\0';
- 	ext4_put_fname_crypto_ctx(&ctx);
 -	nd_set_link(nd, paddr);
  	if (cpage) {
  		kunmap(cpage);
  		page_cache_release(cpage);
  	}
 -	return NULL;
 +	return *cookie = paddr;
  errout:
- 	ext4_put_fname_crypto_ctx(&ctx);
  	if (cpage) {
  		kunmap(cpage);
  		page_cache_release(cpage);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/