diff options
| author | Mystery Man <unknown@mandriva.org> | 2004-05-11 12:41:07 +0000 |
|---|---|---|
| committer | Mystery Man <unknown@mandriva.org> | 2004-05-11 12:41:07 +0000 |
| commit | f0b2cf434b3a176276e79046eafc71a26d94ca3d (patch) | |
| tree | a2f73175aefefa9f630d80119507e1c95868367e /move/tools | |
| parent | 3e4ad5e1b687f262a1d7cc39a0b905a595ac7f95 (diff) | |
| download | drakx-backup-do-not-use-f0b2cf434b3a176276e79046eafc71a26d94ca3d.tar drakx-backup-do-not-use-f0b2cf434b3a176276e79046eafc71a26d94ca3d.tar.gz drakx-backup-do-not-use-f0b2cf434b3a176276e79046eafc71a26d94ca3d.tar.bz2 drakx-backup-do-not-use-f0b2cf434b3a176276e79046eafc71a26d94ca3d.tar.xz drakx-backup-do-not-use-f0b2cf434b3a176276e79046eafc71a26d94ca3d.zip | |
This commit was manufactured by cvs2svn to create branch
'MDK-10-update'.
Diffstat (limited to 'move/tools')
| -rw-r--r-- | move/tools/kernel-nfsd.patch | 16 | ||||
| -rwxr-xr-x | move/tools/nfs-accesses | 7 |
2 files changed, 8 insertions, 15 deletions
diff --git a/move/tools/kernel-nfsd.patch b/move/tools/kernel-nfsd.patch index a169edb14..8f56eb697 100644 --- a/move/tools/kernel-nfsd.patch +++ b/move/tools/kernel-nfsd.patch @@ -1,6 +1,6 @@ ---- linux-2.6.3/fs/nfsd/vfs.c.pix 2004-02-18 04:57:29.000000000 +0100 -+++ linux-2.6.3/fs/nfsd/vfs.c 2004-04-05 15:56:35.423508058 +0200 -@@ -444,6 +444,41 @@ +--- linux-2.4.22/fs/nfsd/vfs.c.pix 2003-10-17 16:27:36.000000000 +0200 ++++ linux-2.4.22/fs/nfsd/vfs.c 2003-10-24 17:36:58.000000000 +0200 +@@ -418,6 +418,41 @@ @@ -42,16 +42,16 @@ /* * Open an existing file or directory. * The access argument indicates the type of open (read/write/lock) -@@ -502,6 +537,8 @@ - } else if (access & MAY_WRITE) - put_write_access(inode); - +@@ -489,6 +524,8 @@ + atomic_dec(&filp->f_count); + } + } + if (err == 0) printk_debug_file_access(rqstp, dentry); + out_nfserr: if (err) err = nfserrno(err); -@@ -1156,6 +1193,7 @@ +@@ -1101,6 +1138,7 @@ goto out_nfserr; *lenp = err; err = 0; diff --git a/move/tools/nfs-accesses b/move/tools/nfs-accesses index f27de0d37..fed4aa181 100755 --- a/move/tools/nfs-accesses +++ b/move/tools/nfs-accesses @@ -13,7 +13,6 @@ GetOptions('no-link' => \ (my $no_link), 'log-file=s' => \$log_file, 'first-file=s' => \ (my $first_file), 'from-time=s', => \ (my $from_time), - 'already-have=s', \ (my $already_have), ); my @skipped_dirs = ( @@ -31,10 +30,6 @@ if ($full_dirs) { my @l = chomp_(map { MDK::Common::File::cat_or_die($_) } split(' ', $full_dirs)); $full_dirs = '/tmp/live_tree(' . join('|', map { quotemeta } @l) . ')/'; } -if ($already_have) { - my @l = map { chomp_(MDK::Common::File::cat_or_die($_)) } split(' ', $already_have); - $already_have = '(' . join('|', map { quotemeta } @l) . ')'; -} open(my $F, "tac $log_file |"); @@ -53,8 +48,6 @@ while (<$F>) { last if $file =~ m!/tmp/live_tree/move/(devices|symlinks)!; last if $from_time && $time le $from_time; - $already_have && $file =~ /^$already_have$/ and next; - if ($file !~ /^$skipped_dirs/) { if (-l $file ? !$no_link : -d $file ? !$no_dir : 1) { my $s = $full_dirs && $file =~ /^$full_dirs/ ? "/tmp/live_tree$1" : $file; |