From patchwork Tue Oct 23 13:24:51 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shirish Pargaonkar X-Patchwork-Id: 1630391 Return-Path: X-Original-To: patchwork-cifs-client@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 874D63FD85 for ; Tue, 23 Oct 2012 13:15:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932976Ab2JWNO7 (ORCPT ); Tue, 23 Oct 2012 09:14:59 -0400 Received: from mail-oa0-f46.google.com ([209.85.219.46]:38201 "EHLO mail-oa0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932625Ab2JWNO7 (ORCPT ); Tue, 23 Oct 2012 09:14:59 -0400 Received: by mail-oa0-f46.google.com with SMTP id h16so3509060oag.19 for ; Tue, 23 Oct 2012 06:14:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer; bh=O6Da+55zUcrd+alNaOQyh0i9dL6fmJdxxChbTKTnhmo=; b=dRB5unE5wVppHCEsnl5qMBaTWVoST2pJztssk+vaoC6kbX9S1aHHx8F+dyoIbB+/LO +yf7FvcWYpzx6DKw528QXpvl/dcEmJMFBhhD5GAArtO27040DVVgcdsCejwhbkEL1eNC kvCbj46j24udwkYyEwdVc8xfYwU+yYAOSPpQe6MFE5yfpmKTca4QT8TAluCVVx+gyWOV Tb2jJscLY0rLS4pPw6sH8rHcYGt05e4j115bZ5Tc81HW4ZBvVZS0BjpL6d8DgcZcYrFq 3rQfRMX7Svdaa6oXH0YGT8YHOldJVuSBrV6q2oCg+33ZA6l/w6MOc/qyAAYCbwjB5cp+ x+Ww== Received: by 10.182.113.5 with SMTP id iu5mr9928624obb.36.1350998098387; Tue, 23 Oct 2012 06:14:58 -0700 (PDT) Received: from localhost ([32.97.110.50]) by mx.google.com with ESMTPS id c9sm9853796oeh.9.2012.10.23.06.14.57 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 23 Oct 2012 06:14:57 -0700 (PDT) From: shirishpargaonkar@gmail.com To: smfrench@gmail.com Cc: linux-cifs@vger.kernel.org, viro@zeniv.linux.org.uk, linux-fsdevel@vger.kernel.org, Shirish Pargaonkar Subject: [PATCH v6 1/2] cifs: Alternate Data Streams: Add support Date: Tue, 23 Oct 2012 08:24:51 -0500 Message-Id: <1350998691-22348-1-git-send-email-shirishpargaonkar@gmail.com> X-Mailer: git-send-email 1.6.0.2 Sender: linux-cifs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-cifs@vger.kernel.org From: Shirish Pargaonkar Add support of Alternate Data Streams (ads). The generic access flags that cifs client currently employs are sufficient for alternate data streams as well (MS-CIFS 2.2.4.64.1). The stream file and stream type are specified using : after the file name, so that is used to differentiate between a regular file and its alternate data streams and stream types. Since they all have the same file id, each path name, file name:stream name:stream type, has a separate inode with that same file id but a distinct private data (path name) in that inode to distinguish them. This scheme applies only to non-posix compliant servers such as Windows. One operation that does not work is Rename (0x7). Signed-off-by: Shirish Pargaonkar --- fs/cifs/cifsfs.c | 1 + fs/cifs/cifsglob.h | 2 ++ fs/cifs/inode.c | 31 ++++++++++++++++++++++++++++++- 3 files changed, 33 insertions(+), 1 deletions(-) diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c index a41044a..1a02c81 100644 --- a/fs/cifs/cifsfs.c +++ b/fs/cifs/cifsfs.c @@ -264,6 +264,7 @@ cifs_evict_inode(struct inode *inode) { truncate_inode_pages(&inode->i_data, 0); clear_inode(inode); + kfree(inode->i_private); cifs_fscache_release_inode_cookie(inode); } diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h index f5af252..26d65c7 100644 --- a/fs/cifs/cifsglob.h +++ b/fs/cifs/cifsglob.h @@ -1251,6 +1251,7 @@ struct dfs_info3_param { #define CIFS_FATTR_DELETE_PENDING 0x2 #define CIFS_FATTR_NEED_REVAL 0x4 #define CIFS_FATTR_INO_COLLISION 0x8 +#define CIFS_FATTR_ALTDATASTR 0x10 struct cifs_fattr { u32 cf_flags; @@ -1268,6 +1269,7 @@ struct cifs_fattr { struct timespec cf_atime; struct timespec cf_mtime; struct timespec cf_ctime; + char *cf_private; }; static inline void free_dfs_info_param(struct dfs_info3_param *param) diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c index afdff79..b7c6dcf 100644 --- a/fs/cifs/inode.c +++ b/fs/cifs/inode.c @@ -615,10 +615,12 @@ cifs_get_inode_info(struct inode **inode, const char *full_path, struct tcon_link *tlink; struct cifs_sb_info *cifs_sb = CIFS_SB(sb); char *buf = NULL; + char *altstr = NULL; bool adjust_tz = false; struct cifs_fattr fattr; struct cifs_search_info *srchinf = NULL; + fattr.cf_private = NULL; tlink = cifs_sb_tlink(cifs_sb); if (IS_ERR(tlink)) return PTR_ERR(tlink); @@ -746,9 +748,26 @@ cifs_get_inode_info(struct inode **inode, const char *full_path, } if (!*inode) { + altstr = strchr(full_path, ':'); + if (altstr) { + fattr.cf_private = kstrdup(altstr, GFP_KERNEL); + if (!fattr.cf_private) { + rc = -ENOMEM; + goto cgii_exit; + } + fattr.cf_flags |= CIFS_FATTR_ALTDATASTR; + } + *inode = cifs_iget(sb, &fattr); - if (!*inode) + if (*inode) { + if (altstr && !((*inode)->i_private)) + (*inode)->i_private = fattr.cf_private; + else + kfree(fattr.cf_private); + } else { rc = -ENOMEM; + kfree(fattr.cf_private); + } } else { cifs_fattr_to_inode(*inode, &fattr); } @@ -784,6 +803,16 @@ cifs_find_inode(struct inode *inode, void *opaque) if (S_ISDIR(inode->i_mode) && !hlist_empty(&inode->i_dentry)) fattr->cf_flags |= CIFS_FATTR_INO_COLLISION; + /* looking for an inode of a alternate data stream (full pathname) */ + if (fattr->cf_flags & CIFS_FATTR_ALTDATASTR) { + if (!(inode->i_private)) { + return 0; + } else { + if (strcmp(inode->i_private, fattr->cf_private)) + return 0; + } + } + return 1; }