From patchwork Tue Aug 3 15:05:55 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Metzmacher X-Patchwork-Id: 116794 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o73FHjOI015870 for ; Tue, 3 Aug 2010 15:18:21 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756917Ab0HCPRx (ORCPT ); Tue, 3 Aug 2010 11:17:53 -0400 Received: from mo-p05-ob.rzone.de ([81.169.146.181]:27717 "EHLO mo-p05-ob.rzone.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756911Ab0HCPRw (ORCPT ); Tue, 3 Aug 2010 11:17:52 -0400 X-RZG-AUTH: :IXQkeEW8Yfo/5haL0ckzWIsAYh739YBunhBBa3aCCCbZv/tD854XGrpZ X-RZG-CLASS-ID: mo05 Received: from localhost.localdomain (xdsl-87-79-184-42.netcologne.de [87.79.184.42]) by post.strato.de (jimi mo39) (RZmta 23.4) with (DHE-RSA-AES256-SHA encrypted) ESMTP id q0292dm73DmAJB ; Tue, 3 Aug 2010 17:06:21 +0200 (MEST) From: Stefan Metzmacher To: smfrench@gmail.com Cc: linux-cifs@vger.kernel.org, Stefan Metzmacher Subject: [PATCH 3/8] cifs: add CIFSCheckMFSymlink() as stub Date: Tue, 3 Aug 2010 17:05:55 +0200 Message-Id: <1280847960-16371-4-git-send-email-metze@samba.org> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1280847960-16371-1-git-send-email-metze@samba.org> References: <1280847960-16371-1-git-send-email-metze@samba.org> Sender: linux-cifs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-cifs@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Tue, 03 Aug 2010 15:18:21 +0000 (UTC) diff --git a/fs/cifs/cifsproto.h b/fs/cifs/cifsproto.h index 2eaebbd..e94e095 100644 --- a/fs/cifs/cifsproto.h +++ b/fs/cifs/cifsproto.h @@ -409,4 +409,7 @@ extern int CIFSSMBSetPosixACL(const int xid, struct cifsTconInfo *tcon, extern int CIFSGetExtAttr(const int xid, struct cifsTconInfo *tcon, const int netfid, __u64 *pExtAttrBits, __u64 *pMask); extern void cifs_autodisable_serverino(struct cifs_sb_info *cifs_sb); +extern int CIFSCheckMFSymlink(struct cifs_fattr *fattr, + const unsigned char *path, + struct cifs_sb_info *cifs_sb, int xid); #endif /* _CIFSPROTO_H */ diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c index a15b3a9..c4121de 100644 --- a/fs/cifs/inode.c +++ b/fs/cifs/inode.c @@ -661,6 +661,13 @@ int cifs_get_inode_info(struct inode **pinode, if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_UNX_EMUL) cifs_sfu_mode(&fattr, full_path, cifs_sb, xid); + /* query for SFU type info if supported and needed */ + if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MF_SYMLINKS) { + tmprc = CIFSCheckMFSymlink(&fattr, full_path, cifs_sb, xid); + if (tmprc) + cFYI(1, "CIFSCheckMFSymlink: %d", tmprc); + } + if (!*pinode) { *pinode = cifs_iget(sb, &fattr); if (!*pinode) diff --git a/fs/cifs/link.c b/fs/cifs/link.c index 2358a5f..985373c 100644 --- a/fs/cifs/link.c +++ b/fs/cifs/link.c @@ -48,6 +48,14 @@ CIFSQueryMFSymLink(const int xid, struct cifsTconInfo *tcon, } int +CIFSCheckMFSymlink(struct cifs_fattr *fattr, + const unsigned char *path, + struct cifs_sb_info *cifs_sb, int xid) +{ + return 0; +} + +int cifs_hardlink(struct dentry *old_file, struct inode *inode, struct dentry *direntry) {