← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise

« back to all changes in this revision

Viewing changes to fs/ncpfs/dir.c

  • Committer: Bazaar Package Importer
  • Author(s): Paolo Pisati
  • Date: 2011-06-29 15:23:51 UTC
  • mfrom: (26.1.1 natty-proposed)
  • Revision ID: james.westby@ubuntu.com-20110629152351-xs96tm303d95rpbk
Tags: 3.0.0-1200.2
* Rebased against 3.0.0-6.7
* BSP from TI based on 3.0.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
fs/ncpfs/dir.c
1033
1033
        DPRINTK("ncp_rmdir: removing %s/%s\n",
1034
1034
                dentry->d_parent->d_name.name, dentry->d_name.name);
1035
1035
 
 
1036
        /*
 
1037
         * fail with EBUSY if there are still references to this
 
1038
         * directory.
 
1039
         */
 
1040
        dentry_unhash(dentry);
1036
1041
        error = -EBUSY;
1037
1042
        if (!d_unhashed(dentry))
1038
1043
                goto out;
1139
1144
                old_dentry->d_parent->d_name.name, old_dentry->d_name.name,
1140
1145
                new_dentry->d_parent->d_name.name, new_dentry->d_name.name);
1141
1146
 
 
1147
        if (new_dentry->d_inode && S_ISDIR(new_dentry->d_inode->i_mode)) {
 
1148
                /*
 
1149
                 * fail with EBUSY if there are still references to this
 
1150
                 * directory.
 
1151
                 */
 
1152
                dentry_unhash(new_dentry);
 
1153
                error = -EBUSY;
 
1154
                if (!d_unhashed(new_dentry))
 
1155
                        goto out;
 
1156
        }
 
1157
 
1142
1158
        ncp_age_dentry(server, old_dentry);
1143
1159
        ncp_age_dentry(server, new_dentry);
1144
1160