head	1.1;
access;
symbols
	LKML-branch:1.1.0.2;
locks; strict;
comment	@# @;


1.1
date	2006.09.16.22.03.41;	author jsipek;	state dead;
branches
	1.1.2.1;
next	;

1.1.2.1
date	2006.09.16.22.03.41;	author jsipek;	state Exp;
branches;
next	1.1.2.2;

1.1.2.2
date	2006.09.23.07.01.39;	author jsipek;	state Exp;
branches;
next	1.1.2.3;

1.1.2.3
date	2006.10.05.17.30.46;	author jsipek;	state Exp;
branches;
next	1.1.2.4;

1.1.2.4
date	2006.10.24.06.14.16;	author jsipek;	state dead;
branches;
next	;


desc
@@


1.1
log
@file branchman was initially added on branch LKML-branch.
@
text
@@


1.1.2.1
log
@Quilt patch directory import & few small fixes
@
text
@a0 90
Unionfs: Branch management functionality

From: David Quigley <dquigley@@fsl.cs.sunysb.edu>

This patch contains the ioctls to increase the union generation and to query
which branch a file exists on.

Signed-off-by: David Quigley <dquigley@@fsl.cs.sunysb.edu>
Signed-off-by: Josef "Jeff" Sipek <jsipek@@cs.sunysb.edu>
Signed-off-by: Erez Zadok <ezk@@cs.sunysb.edu>

diff -r 7a61183ecaa3 fs/unionfs/branchman.c
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fs/unionfs/branchman.c	Sat Sep 16 17:50:09 2006 -0400
@@@@ -0,0 +1,75 @@@@
+/*
+ * Copyright (c) 2003-2006 Erez Zadok
+ * Copyright (c) 2003-2006 Charles P. Wright
+ * Copyright (c) 2005-2006 Josef 'Jeff' Sipek
+ * Copyright (c) 2005-2006 Junjiro Okajima
+ * Copyright (c) 2005      Arun M. Krishnakumar
+ * Copyright (c) 2004-2006 David P. Quigley
+ * Copyright (c) 2003-2004 Mohammad Nayyer Zubair
+ * Copyright (c) 2003      Puja Gupta
+ * Copyright (c) 2003      Harikesavan Krishnan
+ * Copyright (c) 2003-2006 Stony Brook University
+ * Copyright (c) 2003-2006 The Research Foundation of State University of New York
+ *
+ * For specific licensing information, see the COPYING file distributed with
+ * this package.
+ *
+ * This Copyright notice must be kept intact and distributed with all sources.
+ */
+
+#include "union.h"
+
+int unionfs_ioctl_incgen(struct file *file, unsigned int cmd, unsigned long arg)
+{
+	struct super_block *sb;
+	int gen;
+
+	sb = file->f_dentry->d_sb;
+
+	unionfs_write_lock(sb);
+
+	gen = atomic_inc_return(&stopd(sb)->usi_generation);
+
+	atomic_set(&dtopd(sb->s_root)->udi_generation, gen);
+	atomic_set(&itopd(sb->s_root->d_inode)->uii_generation, gen);
+
+	unionfs_write_unlock(sb);
+
+	return gen;
+}
+
+int unionfs_ioctl_queryfile(struct file *file, unsigned int cmd,
+			    unsigned long arg)
+{
+	int err = 0;
+	fd_set branchlist;
+
+	int bstart = 0, bend = 0, bindex = 0;
+	struct dentry *dentry, *hidden_dentry;
+
+	dentry = file->f_dentry;
+	lock_dentry(dentry);
+	if ((err = unionfs_partial_lookup(dentry)))
+		goto out;
+	bstart = dbstart(dentry);
+	bend = dbend(dentry);
+
+	FD_ZERO(&branchlist);
+
+	for (bindex = bstart; bindex <= bend; bindex++) {
+		hidden_dentry = dtohd_index(dentry, bindex);
+		if (!hidden_dentry)
+			continue;
+		if (hidden_dentry->d_inode)
+			FD_SET(bindex, &branchlist);
+	}
+
+	err = copy_to_user((void __user *)arg, &branchlist, sizeof(fd_set));
+	if (err)
+		err = -EFAULT;
+
+out:
+	unlock_dentry(dentry);
+	return err < 0 ? err : bend;
+}
+
@


1.1.2.2
log
@Make license comments clearer
@
text
@d12 1
a12 1
diff -r 4ea62bb77118 fs/unionfs/branchman.c
d14 2
a15 2
+++ b/fs/unionfs/branchman.c	Sat Sep 23 02:44:03 2006 -0400
@@@@ -0,0 +1,74 @@@@
d29 4
a32 3
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
@


1.1.2.3
log
@More intent passing - the intent is wrong, but that should be easy to fix
Moved lookup_one_len_nd to be the second patch in the series
Make the patches little bit uniform
@
text
@d3 1
a3 1
From: Josef "Jeff" Sipek <jsipek@@cs.sunysb.edu>
d8 1
a9 1
Signed-off-by: David Quigley <dquigley@@fsl.cs.sunysb.edu>
@


1.1.2.4
log
@Move unionfs specific bits into a subdir
@
text
@@


