From patchwork Mon Sep 15 23:39:21 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve French X-Patchwork-Id: 4913621 Return-Path: X-Original-To: patchwork-cifs-client@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 04F2BBEEA5 for ; Mon, 15 Sep 2014 23:39:47 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E04DF201B4 for ; Mon, 15 Sep 2014 23:39:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D73A42017D for ; Mon, 15 Sep 2014 23:39:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754971AbaIOXjo (ORCPT ); Mon, 15 Sep 2014 19:39:44 -0400 Received: from mail-qa0-f52.google.com ([209.85.216.52]:64059 "EHLO mail-qa0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754624AbaIOXjn (ORCPT ); Mon, 15 Sep 2014 19:39:43 -0400 Received: by mail-qa0-f52.google.com with SMTP id m5so4686051qaj.11 for ; Mon, 15 Sep 2014 16:39:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:from:date:message-id:subject:to:cc:content-type; bh=oqoxHYrHqgHPBOFr9o51NhyLFCkYla7Pmy5No58PB7I=; b=EslbKxOPdoEp0F+NpMtuRmSHzm3bH4cowXcp9a5w5NlqEVtuS7KQuc08oeevvnw/ii lOOAMIRdSVvtdY1K0JQo1FhfX8XIHsCA2FwXZrQtzzjtgLnYCad8rLkU9qHOcT5yRIlR 6+hVLydY4/4jdBL+ywwDPw4Ee6rg9roddS2lkqeakaG5unO1rr/EKbtniFk9CYtDpCZf KsHHf8Bq1wtgUkJLnr0YbSsVRdAUBm4xL0nqTfskCdAPaq35uxwnVkkuyPdWIs+1UUvd Dz0fCE1qkNEFcoQ5jLXcm4wDG4Fj1L/vyF3u04WCJSYUWAtEgQX+CD5srmJWqqp/gcmF RKzw== X-Received: by 10.140.104.68 with SMTP id z62mr31402074qge.81.1410824381436; Mon, 15 Sep 2014 16:39:41 -0700 (PDT) MIME-Version: 1.0 Received: by 10.140.32.116 with HTTP; Mon, 15 Sep 2014 16:39:21 -0700 (PDT) From: Steve French Date: Mon, 15 Sep 2014 18:39:21 -0500 Message-ID: Subject: [PATCH 2/2] [SMB3] Add mfsymlinks support for SMB2.1/SMB3. Part 2 query symlink To: "linux-cifs@vger.kernel.org" Cc: samba-technical , linux-fsdevel Sender: linux-cifs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-cifs@vger.kernel.org X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Adds support on SMB2.1 and SMB3 mounts for emulation of symlinks via the "Minshall/French" symlink format already used for cifs mounts when mfsymlinks mount option is used (and also used by Apple). http://wiki.samba.org/index.php/UNIX_Extensions#Minshall.2BFrench_symlinks This second patch adds support to query them (recognize them as symlinks and read them). Signed-off-by: Steve French CC: Stefan Metzmacher --- fs/cifs/link.c | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++++ fs/cifs/smb2ops.c | 2 ++ fs/cifs/smb2proto.h | 4 ++++ 3 files changed, 71 insertions(+) __u32 *oplock, FILE_ALL_INFO *buf); diff --git a/fs/cifs/link.c b/fs/cifs/link.c index 11657f6..cf1113e 100644 --- a/fs/cifs/link.c +++ b/fs/cifs/link.c @@ -399,6 +399,71 @@ cifs_create_mf_symlink(unsigned int xid, struct cifs_tcon *tcon, return rc; } +/* + * SMB 2.1/SMB3 Protocol specific functions + */ + +int +smb3_query_mf_symlink(unsigned int xid, struct cifs_tcon *tcon, + struct cifs_sb_info *cifs_sb, const unsigned char *path, + char *pbuf, unsigned int *pbytes_read) +{ + int rc; + struct cifs_fid fid; + struct cifs_open_parms oparms; + struct cifs_io_parms io_parms; + int buf_type = CIFS_NO_BUFFER; + __le16 *utf16_path; + __u8 oplock = SMB2_OPLOCK_LEVEL_II; + struct smb2_file_all_info *pfile_info = NULL; + + oparms.tcon = tcon; + oparms.cifs_sb = cifs_sb; + oparms.desired_access = GENERIC_READ; + oparms.create_options = CREATE_NOT_DIR; + if (backup_cred(cifs_sb)) + oparms.create_options |= CREATE_OPEN_BACKUP_INTENT; + oparms.disposition = FILE_OPEN; + oparms.fid = &fid; + oparms.reconnect = false; + + utf16_path = cifs_convert_path_to_utf16(path, cifs_sb); + if (utf16_path == NULL) + return -ENOMEM; + + pfile_info = kzalloc(sizeof(struct smb2_file_all_info) + PATH_MAX * 2, + GFP_KERNEL); + + if (pfile_info == NULL) { + rc = -ENOMEM; + goto qmf_out; + } + + rc = SMB2_open(xid, &oparms, utf16_path, &oplock, pfile_info, NULL); + if (rc) + goto qmf_out; + + if (pfile_info->EndOfFile != cpu_to_le64(CIFS_MF_SYMLINK_FILE_SIZE)) { + /* it's not a symlink */ + rc = -ENOENT; /* Is there a better rc to return? */ + goto qmf_out; + } + + io_parms.netfid = fid.netfid; + io_parms.pid = current->tgid; + io_parms.tcon = tcon; + io_parms.offset = 0; + io_parms.length = CIFS_MF_SYMLINK_FILE_SIZE; + io_parms.persistent_fid = fid.persistent_fid; + io_parms.volatile_fid = fid.volatile_fid; + rc = SMB2_read(xid, &io_parms, pbytes_read, &pbuf, &buf_type); +qmf_out: + kfree(utf16_path); + kfree(pfile_info); + SMB2_close(xid, tcon, fid.persistent_fid, fid.volatile_fid); + return rc; +} + int smb3_create_mf_symlink(unsigned int xid, struct cifs_tcon *tcon, struct cifs_sb_info *cifs_sb, const unsigned char *path, diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c index 7d3fa29..489f48b 100644 --- a/fs/cifs/smb2ops.c +++ b/fs/cifs/smb2ops.c @@ -1452,6 +1452,7 @@ struct smb_version_operations smb21_operations = { .rename = smb2_rename_path, .create_hardlink = smb2_create_hardlink, .query_symlink = smb2_query_symlink, + .query_mf_symlink = smb3_query_mf_symlink, .create_mf_symlink = smb3_create_mf_symlink, .open = smb2_open_file, .set_fid = smb2_set_fid, @@ -1532,6 +1533,7 @@ struct smb_version_operations smb30_operations = { .rename = smb2_rename_path, .create_hardlink = smb2_create_hardlink, .query_symlink = smb2_query_symlink, + .query_mf_symlink = smb3_query_mf_symlink, .create_mf_symlink = smb3_create_mf_symlink, .open = smb2_open_file, .set_fid = smb2_set_fid, diff --git a/fs/cifs/smb2proto.h b/fs/cifs/smb2proto.h index e144ecf..79dc650 100644 --- a/fs/cifs/smb2proto.h +++ b/fs/cifs/smb2proto.h @@ -85,6 +85,10 @@ extern int smb2_create_hardlink(const unsigned int xid, struct cifs_tcon *tcon, extern int smb3_create_mf_symlink(unsigned int xid, struct cifs_tcon *tcon, struct cifs_sb_info *cifs_sb, const unsigned char *path, char *pbuf, unsigned int *pbytes_written); +extern int smb3_query_mf_symlink(unsigned int xid, struct cifs_tcon *tcon, + struct cifs_sb_info *cifs_sb, + const unsigned char *path, char *pbuf, + unsigned int *pbytes_read); extern int smb2_open_file(const unsigned int xid, struct cifs_open_parms *oparms,